Visual editor: selecting first node on first display

diff --git a/modules/rng.js b/modules/rng.js
index 4e0ca6e..6ea6f40 100644 (file)
--- a/modules/rng.js
+++ b/modules/rng.js
@@ -41,6 +41,10 @@ rng.modules.rng = function(sandbox) {
                     editor.setDirty(false);\r
                 }\r
             }\r
                     editor.setDirty(false);\r
                 }\r
             }\r

+        },\r
+        showed: function(slug) {\r
+            if(slug === 'visual')\r
+                sandbox.getModule('visualEditor').onShowed();\r

         }\r
     };\r
     \r
         }\r
     };\r
     \r


@@ -53,8 +57,9 @@ rng.modules.rng = function(sandbox) {
     \r
     eventHandlers.visualEditor = {\r
         ready: function() {\r
     \r
     eventHandlers.visualEditor = {\r
         ready: function() {\r

-            addTab('Visual', 'visual', sandbox.getModule('visualEditor').getView());\r

             sandbox.getModule('visualEditor').setDocument(sandbox.getModule('data').getDocument());\r
             sandbox.getModule('visualEditor').setDocument(sandbox.getModule('data').getDocument());\r

+            addTab('Visual', 'visual', sandbox.getModule('visualEditor').getView());\r
+            \r

         }\r
     };\r
     \r
         }\r
     };\r
     \r

diff --git a/modules/tabsManager.js b/modules/tabsManager.js
index 1f0ac18..4ede9a0 100644 (file)
--- a/modules/tabsManager.js
+++ b/modules/tabsManager.js
@@ -26,6 +26,7 @@ rng.modules.tabsManager = function(sandbox) {
             tabContent[prevSlug].detach();\r
         tabContent[slug].appendTo(view.find('#rng-tabsManager-content'));\r
         currentSlug = slug;\r
             tabContent[prevSlug].detach();\r
         tabContent[slug].appendTo(view.find('#rng-tabsManager-content'));\r
         currentSlug = slug;\r

+        sandbox.publish('showed', slug);\r

     }\r
        \r
     \r
     }\r
        \r
     \r

diff --git a/modules/visualEditor.js b/modules/visualEditor.js
index 98923a5..8d77302 100644 (file)
--- a/modules/visualEditor.js
+++ b/modules/visualEditor.js
@@ -91,6 +91,13 @@ rng.modules.visualEditor = function(sandbox) {
             node.addClass('rng-current');\r
             mediator.nodeSelected(node);\r
         },\r
             node.addClass('rng-current');\r
             mediator.nodeSelected(node);\r
         },\r

+        markFirstSelected: 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
+        },\r

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


@@ -135,7 +142,7 @@ rng.modules.visualEditor = function(sandbox) {
     }\r
     \r
     var isDirty = false;\r
     }\r
     \r
     var isDirty = false;\r

-    \r
+    var wasShownAlready = false;\r

     \r
     \r
     return {\r
     \r
     \r
     return {\r


@@ -159,6 +166,12 @@ rng.modules.visualEditor = function(sandbox) {
         },\r
         setDirty: function(dirty) {\r
             isDirty = dirty;\r
         },\r
         setDirty: function(dirty) {\r
             isDirty = dirty;\r

+        },\r
+        onShowed: function() {\r
+            if(!wasShownAlready) {\r
+                wasShownAlready = true;\r
+                view.markFirstSelected();\r
+            }\r

         }\r
     \r
     }\r
         }\r
     \r
     }\r