Fix: more precise selector for not catching unwanted events

[fnpeditor.git] / modules / visualEditor.js

diff --git a/modules/visualEditor.js b/modules/visualEditor.js
index 5833b71..9721d29 100644 (file)
--- a/modules/visualEditor.js
+++ b/modules/visualEditor.js
@@ -21,7 +21,7 @@ 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
                 var anchor = $(window.getSelection().anchorNode);\r
                 if(anchor[0].nodeType === Node.TEXT_NODE)\r
                     anchor = anchor.parent();\r


@@ -31,10 +31,11 @@ rng.modules.visualEditor = function(sandbox) {
             });\r
             \r
             \r
             });\r
             \r
             \r

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

             \r
             \r

-            this.metaTable.find('.rng-visualEditor-metaAddBtn').click(function() {\r
-                view._addMetaRow();\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
                 isDirty = true;\r
             });\r
             \r


@@ -42,15 +43,31 @@ rng.modules.visualEditor = function(sandbox) {
                 $(e.target).closest('tr').remove();\r
                 isDirty = true;\r
             });\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.metaTable.find('tr').not('.rng-visualEditor-addMetaRow').each(function() {\r
+            this.metaTable.find('tr').each(function() {\r

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

-                var inputs = $(this).find('td input');\r
-                var key = $(inputs[0]).val()\r
-                var value = $(inputs[1]).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
                 toret[key] = value;\r
             });\r
             console.log(toret);\r


@@ -58,7 +75,7 @@ rng.modules.visualEditor = function(sandbox) {
         },\r
         setMetaData: function(metadata) {\r
             var view = this;\r
         },\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
             _.each(_.keys(metadata), function(key) {    \r
                 view._addMetaRow(key, metadata[key]);\r
             });\r


@@ -74,8 +91,9 @@ rng.modules.visualEditor = function(sandbox) {
             node.addClass('rng-current');\r
         },\r
         _addMetaRow: function(key, value) {\r
             node.addClass('rng-current');\r
         },\r
         _addMetaRow: function(key, value) {\r

-            var addRow = this.metaTable.find('.rng-visualEditor-addMetaRow');\r
-            $(sandbox.getTemplate('metaItem')({key: key || '', value: value || ''})).insertBefore(addRow);\r
+            var newRow = $(sandbox.getTemplate('metaItem')({key: key || '', value: value || ''}));\r
+            newRow.appendTo(this.metaTable);\r
+            return newRow;\r

         }\r
     };\r
     view.setup();\r
         }\r
     };\r
     view.setup();\r