Visual editor: hitting enter moves to a new tag - copy of current one (Chrome, FF)

[fnpeditor.git] / modules / visualEditor.js

diff --git a/modules/visualEditor.js b/modules/visualEditor.js
index 9cec971..702c812 100644 (file)
--- a/modules/visualEditor.js
+++ b/modules/visualEditor.js
@@ -31,6 +31,18 @@ rng.modules.visualEditor = function(sandbox) {
                 view._markSelected(anchor);\r
             });\r
             \r
+            this.node.on('keydown', '#rng-visualEditor-contentWrapper', function(e) {\r
+                if(e.which === 13) { \r
+                    e.preventDefault();\r
+                    var anchor = $(window.getSelection().anchorNode);\r
+                    if(anchor[0].nodeType === Node.TEXT_NODE)\r
+                        anchor = anchor.parent();\r
+                    var newNode = anchor.clone().empty();\r
+                    anchor.after(newNode);\r
+                    view.selectNode(newNode);\r
+                }\r
+            });\r
+            \r
             \r
             var metaTable = this.metaTable = this.node.find('#rng-visualEditor-meta table');\r
             \r
@@ -93,12 +105,27 @@ rng.modules.visualEditor = function(sandbox) {
             this.currentNode = node;\r
             mediator.nodeSelected(node);\r
         },\r
-        markFirstSelected: function() {\r
+        selectNode: function(node) {\r
+            view._markSelected(node);\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
+        selectFirstNode: function() {\r
             var firstNodeWithText = this.node.find('[wlxml-tag]').filter(function() {\r
                 return $(this).clone().children().remove().end().text().trim() !== '';\r
             }).first();\r
+            var node;\r
             if(firstNodeWithText.length)\r
-                $(firstNodeWithText[0]).click().focus();\r
+                node = $(firstNodeWithText[0])\r
+            else {\r
+                node = this.node.find('[wlxml-class|="p"]')\r
+            }\r
+            this.selectNode(node);\r
         },\r
         _addMetaRow: function(key, value) {\r
             var newRow = $(sandbox.getTemplate('metaItem')({key: key || '', value: value || ''}));\r
@@ -143,7 +170,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 +199,10 @@ rng.modules.visualEditor = function(sandbox) {
         getCurrentNode: function() {\r
             return view.currentNode;\r
         },\r
+        nodeCreated: function(node) {\r
+            view.selectNode(node);\r
+            \r
+        },\r
         nodeSelected: function(node) {\r
             sideBarView.updateEditPane(node);\r
         }\r
@@ -202,7 +237,7 @@ rng.modules.visualEditor = function(sandbox) {
         onShowed: function() {\r
             if(!wasShownAlready) {\r
                 wasShownAlready = true;\r
-                view.markFirstSelected();\r
+                view.selectFirstNode();\r
             }\r
         }\r
     \r