Visual editor: preserving all attributes from wlxml nodes

[fnpeditor.git] / modules / visualEditor.js

diff --git a/modules/visualEditor.js b/modules/visualEditor.js
index 70fc435..bb4ad31 100644 (file)
--- a/modules/visualEditor.js
+++ b/modules/visualEditor.js
@@ -131,7 +131,7 @@ rng.modules.visualEditor = function(sandbox) {
             view.node.on('change', '.rng-visualEditor-editPaneSelectionForm select', function(e) {\r
                 var target = $(e.target);\r
                 var selection = window.getSelection();\r
-                if(selection.anchorNode.isSameNode(selection.focusNode) && selection.anchorNode.nodeType === Node.TEXT_NODE) {                   \r
+                if(selection.anchorNode === selection.focusNode && selection.anchorNode.nodeType === Node.TEXT_NODE) {\r
                     var startOffset = selection.anchorOffset;\r
                     var endOffset = selection.focusOffset;\r
                     if(startOffset > endOffset) {\r
@@ -143,7 +143,11 @@ rng.modules.visualEditor = function(sandbox) {
                     var prefix = node.data.substr(0, startOffset);\r
                     var suffix = node.data.substr(endOffset);\r
                     var core = node.data.substr(startOffset, endOffset - startOffset);\r
-                    $(node).replaceWith(prefix + '<span wlxml-tag="' + target.val() + '">' + core + '</span>' + suffix);                   \r
+                    var newNode = $('<span wlxml-tag="' + target.val() + '">' + core + '</span>');\r
+                    $(node).replaceWith(newNode);\r
+                    newNode.before(prefix);\r
+                    newNode.after(suffix);\r
+                    mediator.nodeCreated(newNode);\r
                     isDirty = true;\r
                 }\r
             });\r
@@ -168,6 +172,18 @@ rng.modules.visualEditor = function(sandbox) {
         getCurrentNode: function() {\r
             return view.currentNode;\r
         },\r
+        nodeCreated: function(node) {\r
+            view._markSelected(node);\r
+\r
+            var range = document.createRange();\r
+            range.selectNodeContents(node[0]);\r
+            range.collapse(false);\r
+\r
+            var selection = document.getSelection();\r
+            selection.removeAllRanges()\r
+            selection.addRange(range);\r
+            \r
+        },\r
         nodeSelected: function(node) {\r
             sideBarView.updateEditPane(node);\r
         }\r