Visual editor: refactoring

diff --git a/modules/visualEditor.js b/modules/visualEditor.js
index 06a5ab6..73622f9 100644 (file)
--- a/modules/visualEditor.js
+++ b/modules/visualEditor.js
@@ -93,12 +93,22 @@ rng.modules.visualEditor = function(sandbox) {
             this.currentNode = node;\r
             mediator.nodeSelected(node);\r
         },\r
             this.currentNode = node;\r
             mediator.nodeSelected(node);\r
         },\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
             if(firstNodeWithText.length)\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
             if(firstNodeWithText.length)\r

-                $(firstNodeWithText[0]).click().focus();\r
+                this.selectNode($(firstNodeWithText[0]));\r

         },\r
         _addMetaRow: function(key, value) {\r
             var newRow = $(sandbox.getTemplate('metaItem')({key: key || '', value: value || ''}));\r
         },\r
         _addMetaRow: function(key, value) {\r
             var newRow = $(sandbox.getTemplate('metaItem')({key: key || '', value: value || ''}));\r


@@ -173,15 +183,7 @@ rng.modules.visualEditor = function(sandbox) {
             return view.currentNode;\r
         },\r
         nodeCreated: function(node) {\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
+            view.selectNode(node);\r

             \r
         },\r
         nodeSelected: function(node) {\r
             \r
         },\r
         nodeSelected: function(node) {\r