X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/8f44492501cad481f4d4ddcd58f7e9b26e2a7721..15f4c3b:/src/editor/plugins/core/core.js diff --git a/src/editor/plugins/core/core.js b/src/editor/plugins/core/core.js index 7feb1a4..d2791d0 100644 --- a/src/editor/plugins/core/core.js +++ b/src/editor/plugins/core/core.js @@ -122,6 +122,18 @@ plugin.documentExtension.textNode.transformations = { parent.contents().some(function(n) { return move(n, newNode); }); + if(newNodes.second.contents()[0].getText().length === 0) { + var textNode = newNodes.second.contents()[0]; + newNodes.second.detach(); + newNodes.second = parent; + emptyText = newNodes.second.append(textNode); + } + } + + var newNodeText = newNodes.second.contents()[0].getText(); + if(newNodes.second.is({tagName: 'header'}) && newNodeText === '') { + newNodes.second = newNodes.second.setTag('div'); + newNodes.second.setClass('p'); } return _.extend(newNodes, {emptyText: emptyText}); @@ -488,7 +500,7 @@ var createWrapTextAction = function(createParams) { }); } - if(params.fragment instanceof params.fragment.TextRangeFragment && params.fragment.hasSiblingBoundries()) { + if(params.fragment instanceof params.fragment.TextRangeFragment && params.fragment.hasSiblingBoundaries()) { parent = params.fragment.startNode.parent(); if(parent && parent.is(createParams.klass) || parent.isInside(createParams.klass)) { return _.extend(state, {allowed: false}); @@ -542,7 +554,7 @@ var createLinkFromSelection = function(callback, params) { prePasteHandler: function(text) { return params.fragment.document.getLinkForUrl(text); }.bind(this), - description: 'attachment library' + description: '' + gettext('attachment library') + '' } ] }), @@ -616,7 +628,7 @@ var linkAction = { } if(params.fragment instanceof params.fragment.TextRangeFragment) { - if(!params.fragment.hasSiblingBoundries() || params.fragment.startNode.parent().is('link')) { + if(!params.fragment.hasSiblingBoundaries() || params.fragment.startNode.parent().is('link')) { return {allowed: false}; } return {