X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/913b71a6ab540b5d588dd93d9256cace73c5dcb3..9f3a5ef91227a4ebd1b5c397bb11c067d03f7758:/modules/visualEditor.js?ds=inline

diff --git a/modules/visualEditor.js b/modules/visualEditor.js
index 17e7f73..d5ff4b5 100644
--- a/modules/visualEditor.js
+++ b/modules/visualEditor.js
@@ -98,6 +98,7 @@ rng.modules.visualEditor = function(sandbox) {
         insertNewNode: function(wlxmlTag, wlxmlClass) {
             //TODO: Insert inline
             var anchor = $(window.getSelection().anchorNode);
+            var anchorOffset = window.getSelection().anchorOffset;
             if(anchor[0].nodeType === Node.TEXT_NODE)
                 anchor = anchor.parent();
             if(anchor.text() === '') {
@@ -105,13 +106,21 @@ rng.modules.visualEditor = function(sandbox) {
                 anchor = anchor.parent();
                 todel.remove();
             }
+            if(anchorOffset > 0 && anchorOffset < anchor.text().length) {
+                if(wlxmlTag === null && wlxmlClass === null) {
+                    return this.splitWithNewNode(anchor);
+                }
+                return this.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);
+            }
             var newNode = this._createNode(wlxmlTag || anchor.attr('wlxml-tag'), wlxmlClass || anchor.attr('wlxml-class'));
-            anchor.after(newNode);
+            if(anchorOffset === 0)
+                anchor.before(newNode)
+            else
+                anchor.after(newNode);
             mediator.nodeCreated(newNode);
             isDirty = true;
         },
         wrapSelectionWithNewNode: function(wlxmlTag, wlxmlClass) {
-            
             var selection = window.getSelection();
             if(selection.anchorNode === selection.focusNode && selection.anchorNode.nodeType === Node.TEXT_NODE) {
                 var startOffset = selection.anchorOffset;
@@ -126,7 +135,7 @@ rng.modules.visualEditor = function(sandbox) {
                 var suffix = node.data.substr(endOffset);
                 var core = node.data.substr(startOffset, endOffset - startOffset);
                 var newNode = this._createNode(wlxmlTag, wlxmlClass);
-                newNode.text(core);
+                newNode.text(core || 'test');
                 $(node).replaceWith(newNode);
                 newNode.before(prefix);
                 newNode.after(suffix);
@@ -134,6 +143,31 @@ rng.modules.visualEditor = function(sandbox) {
                 isDirty = true;
             }
         },
+        splitWithNewNode: function(node) {
+            var selection = window.getSelection();
+            if(selection.anchorNode === selection.focusNode && selection.anchorNode.nodeType === Node.TEXT_NODE) {
+                var startOffset = selection.anchorOffset;
+                var endOffset = selection.focusOffset;
+                if(startOffset > endOffset) {
+                    var tmp = startOffset;
+                    startOffset = endOffset;
+                    endOffset = tmp;
+                }
+                var anchor = selection.anchorNode;
+                var prefix = anchor.data.substr(0, startOffset);
+                var suffix = anchor.data.substr(endOffset);
+                var prefixNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));
+                var newNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));
+                var suffixNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));
+                prefixNode.text(prefix);
+                suffixNode.text(suffix);
+                node.replaceWith(newNode);
+                newNode.before(prefixNode);
+                newNode.after(suffixNode);
+                mediator.nodeCreated(newNode);
+                isDirty = true;
+            }
+        },
         getMetaData: function() {
             var toret = {};
             this.metaTable.find('tr').each(function() {
@@ -281,16 +315,18 @@ rng.modules.visualEditor = function(sandbox) {
         },
         updateEditPane: function(node) {
             var pane = this.node.find('#rng-visualEditor-edit');
+            var parentClass = node.parent().attr('wlxml-class');
             pane.html( $(sandbox.getTemplate('editPane')({tag: node.attr('wlxml-tag'), klass: node.attr('wlxml-class')})));
             
             var parent = node.parent('[wlxml-tag]').length ? {
-                repr: node.parent().attr('wlxml-tag') + ' / ' + (node.parent().attr('wlxml-class') || '[[no class]]'),
+                repr: node.parent().attr('wlxml-tag') + (parentClass ? ' / ' + parentClass : ''),
                 id: node.parent().attr('id')
             } : undefined;
             var children = [];
             node.children('[wlxml-tag]').each(function() {
                 var child = $(this);
-                children.push({repr: child.attr('wlxml-tag') + ' / ' + (child.attr('wlxml-class') || '[[no class]]'), id: child.attr('id')});
+                var childClass = child.attr('wlxml-class');
+                children.push({repr: child.attr('wlxml-tag') + (childClass ? ' / ' + childClass : ''), id: child.attr('id')});
             });
             var naviTemplate = sandbox.getTemplate('editPaneNavigation')({parent: parent, children: children});
             pane.find('.rng-visualEditor-editPaneSurrouding > div').html($(naviTemplate));
@@ -317,7 +353,7 @@ rng.modules.visualEditor = function(sandbox) {
                     mediator.toolbarButtonToggled(btn.attr('data-btn'), btn.hasClass('active'));
                 }
                 if(btn.attr('data-btn-type') === 'cmd') {
-                    mediator.toolbarButtonCmd(btn.attr('data-btn'));
+                    mediator.toolbarButtonCmd(btn.attr('data-btn'), btn.attr('data-meta'));
                 }
             });
         },
@@ -389,12 +425,19 @@ rng.modules.visualEditor = function(sandbox) {
             if(btn === 'tags')
                 view.toggleTags(toggle);
         },
-        toolbarButtonCmd: function(btn) {
+        toolbarButtonCmd: function(btn, meta) {
             if(btn === 'new-node') {
+                var wlxmlTag = toolbarView.getOption('newTag-tag');
+                var wlxmlClass = toolbarView.getOption('newTag-class');
+                if(meta) {
+                    var split = meta.split('/');
+                    wlxmlTag = split[0];
+                    wlxmlClass = split[1];
+                }
                 if(window.getSelection().isCollapsed)
-                    view.insertNewNode(toolbarView.getOption('newTag-tag'), toolbarView.getOption('newTag-class'));
+                    view.insertNewNode(wlxmlTag, wlxmlClass);
                 else {
-                    this.wrapWithNodeRequest(toolbarView.getOption('newTag-tag'), toolbarView.getOption('newTag-class'));
+                    this.wrapWithNodeRequest(wlxmlTag, wlxmlClass);
                 }