X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/1eeb03096b5072b81f245d1b1716d1184e40f05d..04b969b68c922970339a783e865bb1f9c593946c:/src/editor/plugins/core/core.js

diff --git a/src/editor/plugins/core/core.js b/src/editor/plugins/core/core.js
index 3839a39..c2c5ffa 100644
--- a/src/editor/plugins/core/core.js
+++ b/src/editor/plugins/core/core.js
@@ -120,6 +120,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});
@@ -222,10 +234,12 @@ plugin.documentExtension.documentNode.transformations = {
                     return toMerge.is({tagName: 'div', 'klass': 'p'}) || (toMerge.is({tagName: 'div'}) && toMerge.getClass() === '');
                 },
                 run: function() {
-                    if(prev && (prev.is('p') || prev.is({tagName: 'header'}))) {
+                    if (!prev)
+                        return;
+                    if(prev.is('p') || prev.is({tagName: 'header'})) {
                         return merge(toMerge, prev);
                     }
-                    if(prev && prev.is('list')) {
+                    if(prev.is('list')) {
                         var items = prev.contents().filter(function(n) { return n.is('item');});
                         return merge(toMerge, items[items.length-1]);
                     }
@@ -282,7 +296,7 @@ plugin.documentExtension.documentNode.transformations = {
                     return toMerge.is({tagName: 'header'});
                 },
                 run: function() {
-                    if(prev && prev.is('p') || prev.is({tagName: 'header'})) {
+                    if(prev && (prev.is('p') || prev.is({tagName: 'header'}))) {
                         return merge(toMerge, prev);
                     }
                 }
@@ -315,6 +329,13 @@ plugin.documentExtension.documentNode.transformations = {
             }
         });
         return toret;
+    },
+    insertNewNode: function () {
+        var node = this;
+        var newElement = this.document.createDocumentNode({tagName: 'div', attrs: {class: 'p'}});
+        node.after(newElement);
+        newElement.append({text: ''});
+        return newElement;
     }
 };
 
@@ -479,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});
@@ -522,13 +543,21 @@ var createWrapTextAction = function(createParams) {
 
 
 var createLinkFromSelection = function(callback, params) {
-    var doc = params.fragment.document,
-        dialog = Dialog.create({
+    var fragment = params.fragment,
+        doc = fragment.document,
+        text = fragment.startNode.nativeNode.data.substring(fragment.startOffset, fragment.endOffset),
+        url;
+    if (text.indexOf('//') >= 0 && text.indexOf(' ') < 0) {
+        url = text;
+    } else if (text.substr(0, 4) === 'www.' && text.indexOF(' ') < 0) {
+        url = 'http://' + text;
+    }
+    var dialog = Dialog.create({
             title: gettext('Create link'),
             executeButtonText: gettext('Apply'),
             cancelButtonText: gettext('Cancel'),
             fields: [
-                {label: gettext('Link'), name: 'href', type: 'input',
+                {label: gettext('Link'), name: 'href', type: 'input', initialValue: url || '',
                 prePasteHandler: function(text) {
                                     return params.fragment.document.getLinkForUrl(text);
                                 }.bind(this)
@@ -603,7 +632,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 {