Visual editor: handling formatting of metadata tag in the xml source better

[fnpeditor.git] / modules / visualEditor.js

diff --git a/modules/visualEditor.js b/modules/visualEditor.js
index dc0b801..8a96cb9 100644 (file)
--- a/modules/visualEditor.js
+++ b/modules/visualEditor.js
@@ -3,6 +3,7 @@ rng.modules.visualEditor = function(sandbox) {
 \r
     var view = {\r
         node: $(sandbox.getTemplate('main')()),\r
+        currentNode: null,\r
         setup: function() {\r
             var view = this;\r
 
@@ -33,7 +34,7 @@ rng.modules.visualEditor = function(sandbox) {
             \r
             var metaTable = this.metaTable = this.node.find('#rng-visualEditor-meta table');\r
             \r
-            this.metaTable.find('.rng-visualEditor-metaAddBtn').click(function() {\r
+            this.node.find('.rng-visualEditor-metaAddBtn').click(function() {\r
                 var newRow = view._addMetaRow('', '');\r
                 $(newRow.find('td div')[0]).focus();\r
                 isDirty = true;\r
@@ -47,12 +48,12 @@ rng.modules.visualEditor = function(sandbox) {
             this.metaTable.on('keydown', '[contenteditable]', function(e) {\r
                 console.log(e.which);\r
                 if(e.which === 13) { \r
-                    if($('*:focus').hasClass('rng-visualEditor-metaItemKey')) {\r
+                    if($(document.activeElement).hasClass('rng-visualEditor-metaItemKey')) {\r
                         metaTable.find('.rng-visualEditor-metaItemValue').focus();\r
                     } else {\r
                         var input = $('<input>');\r
                         input.appendTo('body').focus()\r
-                        metaTable.find('.rng-visualEditor-metaAddBtn').focus();\r
+                        view.node.find('.rng-visualEditor-metaAddBtn').focus();\r
                         input.remove();\r
                     }\r
                     e.preventDefault();\r
@@ -63,7 +64,7 @@ rng.modules.visualEditor = function(sandbox) {
         },\r
         getMetaData: function() {\r
             var toret = {};\r
-            this.metaTable.find('tr').not('.rng-visualEditor-addMetaRow').each(function() {\r
+            this.metaTable.find('tr').each(function() {\r
                 var tr = $(this);\r
                 var inputs = $(this).find('td [contenteditable]');\r
                 var key = $(inputs[0]).text();\r
@@ -75,7 +76,7 @@ rng.modules.visualEditor = function(sandbox) {
         },\r
         setMetaData: function(metadata) {\r
             var view = this;\r
-            this.metaTable.find('tr').not('.rng-visualEditor-addMetaRow').remove();\r
+            this.metaTable.find('tr').remove();\r
             _.each(_.keys(metadata), function(key) {    \r
                 view._addMetaRow(key, metadata[key]);\r
             });\r
@@ -89,17 +90,71 @@ rng.modules.visualEditor = function(sandbox) {
         _markSelected: function(node) {\r
             this.node.find('.rng-current').removeClass('rng-current');\r
             node.addClass('rng-current');\r
+            this.currentNode = node;\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 addRow = this.metaTable.find('.rng-visualEditor-addMetaRow');\r
             var newRow = $(sandbox.getTemplate('metaItem')({key: key || '', value: value || ''}));\r
-            newRow.insertBefore(addRow);\r
+            newRow.appendTo(this.metaTable);\r
             return newRow;\r
         }\r
     };\r
+    \r
+    \r
+    var sideBarView = {\r
+        node: view.node.find('#rng-visualEditor-sidebar'),\r
+        setup: function() {\r
+            var view = this;\r
+            this.node.find('#rng-visualEditor-sidebarButtons a').click(function(e) {\r
+                e.preventDefault();\r
+                var target = $(e.currentTarget);\r
+                if(!target.attr('data-content-id'))\r
+                    return;\r
+                view.selectTab(target.attr('data-content-id'));\r
+            });\r
+            view.selectTab('rng-visualEditor-edit');\r
+            \r
+            view.node.on('change', '.rng-visualEditor-editPaneNodeForm select', function(e) {\r
+                var target = $(e.target);\r
+                var attr = target.attr('id').split('-')[2].split('editPane')[1].substr(0,3) === 'Tag' ? 'tag' : 'class';\r
+                mediator.getCurrentNode().attr('wlxml-'+attr, target.val());\r
+                isDirty = true;\r
+            });\r
+        },\r
+        selectTab: function(id) {\r
+           this.node.find('.rng-visualEditor-sidebarContentItem').hide();\r
+           this.node.find('#'+id).show();\r
+           this.node.find('#rng-visualEditor-sidebarButtons li').removeClass('active');\r
+           this.node.find('#rng-visualEditor-sidebarButtons li a[data-content-id=' + id + ']').parent().addClass('active');\r
+        \r
+        },\r
+        updateEditPane: function(node) {\r
+            var pane = this.node.find('#rng-visualEditor-edit');\r
+            pane.html( $(sandbox.getTemplate('editPane')({tag: node.attr('wlxml-tag'), klass: node.attr('wlxml-class')})));\r
+        }\r
+    }\r
+    \r
     view.setup();\r
+    sideBarView.setup();\r
+    \r
+    var mediator = {\r
+        getCurrentNode: function() {\r
+            return view.currentNode;\r
+        },\r
+        nodeSelected: function(node) {\r
+            sideBarView.updateEditPane(node);\r
+        }\r
+    }\r
     \r
     var isDirty = false;\r
+    var wasShownAlready = false;\r
     \r
     \r
     return {\r
@@ -123,6 +178,12 @@ rng.modules.visualEditor = function(sandbox) {
         },\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