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 132c70f..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
 \r
     var view = {\r
         node: $(sandbox.getTemplate('main')()),\r

+        currentNode: null,\r

         setup: function() {\r
             var view = this;\r
 
         setup: function() {\r
             var view = this;\r
 


@@ -21,31 +22,63 @@ rng.modules.visualEditor = function(sandbox) {
                 view._markSelected($(e.target));\r
             });\r
 \r
                 view._markSelected($(e.target));\r
             });\r
 \r

-            this.node.on('keyup', function(e) {\r
+            this.node.on('keyup', '#rng-visualEditor-contentWrapper', function(e) {\r

                 var anchor = $(window.getSelection().anchorNode);\r
                 if(anchor[0].nodeType === Node.TEXT_NODE)\r
                     anchor = anchor.parent();\r
                 if(!anchor.is('[wlxml-tag]'))\r
                     return;\r
                 view._markSelected(anchor);\r
                 var anchor = $(window.getSelection().anchorNode);\r
                 if(anchor[0].nodeType === Node.TEXT_NODE)\r
                     anchor = anchor.parent();\r
                 if(!anchor.is('[wlxml-tag]'))\r
                     return;\r
                 view._markSelected(anchor);\r

-            });
+            });\r
+            \r
+            \r
+            var metaTable = this.metaTable = this.node.find('#rng-visualEditor-meta table');\r
+            \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
+            });\r
+            \r
+            this.metaTable.on('click', '.rng-visualEditor-metaRemoveBtn', function(e) {\r
+                $(e.target).closest('tr').remove();\r
+                isDirty = true;\r
+            });\r
+            \r
+            this.metaTable.on('keydown', '[contenteditable]', function(e) {\r
+                console.log(e.which);\r
+                if(e.which === 13) { \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
+                        view.node.find('.rng-visualEditor-metaAddBtn').focus();\r
+                        input.remove();\r
+                    }\r
+                    e.preventDefault();\r
+                }\r
+                \r
+            });\r
+

         },\r
         getMetaData: function() {\r
             var toret = {};\r
         },\r
         getMetaData: function() {\r
             var toret = {};\r

-            this.node.find('#rng-visualEditor-meta table tr').each(function() {\r
+            this.metaTable.find('tr').each(function() {\r

                 var tr = $(this);\r
                 var tr = $(this);\r

-                var key = $(tr.find('td')[0]).html();\r
-                var value = $(tr.find('td input')[0]).val();\r
+                var inputs = $(this).find('td [contenteditable]');\r
+                var key = $(inputs[0]).text();\r
+                var value = $(inputs[1]).text();\r

                 toret[key] = value;\r
             });\r
             console.log(toret);\r
             return toret;\r
         },\r
         setMetaData: function(metadata) {\r
                 toret[key] = value;\r
             });\r
             console.log(toret);\r
             return toret;\r
         },\r
         setMetaData: function(metadata) {\r

-            var table = this.node.find('#rng-visualEditor-meta table');\r
-            table.empty();\r
+            var view = this;\r
+            this.metaTable.find('tr').remove();\r

             _.each(_.keys(metadata), function(key) {    \r
             _.each(_.keys(metadata), function(key) {    \r

-                $(sandbox.getTemplate('metaItem')({key: key, value: metadata[key]})).appendTo(table);\r
+                view._addMetaRow(key, metadata[key]);\r

             });\r
         },\r
         setBody: function(HTMLTree) {\r
             });\r
         },\r
         setBody: function(HTMLTree) {\r


@@ -57,11 +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
         _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 newRow = $(sandbox.getTemplate('metaItem')({key: key || '', value: value || ''}));\r
+            newRow.appendTo(this.metaTable);\r
+            return newRow;\r

         }\r
     };\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
     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
     \r
     var isDirty = false;\r

+    var wasShownAlready = false;\r

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


@@ -85,6 +178,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