Visual editor: styling

[fnpeditor.git] / modules / visualEditor.js

diff --git a/modules/visualEditor.js b/modules/visualEditor.js
index dc0b801..9721d29 100644 (file)
--- a/modules/visualEditor.js
+++ b/modules/visualEditor.js
@@ -33,7 +33,7 @@ rng.modules.visualEditor = function(sandbox) {
             \r
             var metaTable = this.metaTable = this.node.find('#rng-visualEditor-meta table');\r
             \r
             \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
                 var newRow = view._addMetaRow('', '');\r
                 $(newRow.find('td div')[0]).focus();\r
                 isDirty = true;\r


@@ -47,12 +47,12 @@ rng.modules.visualEditor = function(sandbox) {
             this.metaTable.on('keydown', '[contenteditable]', function(e) {\r
                 console.log(e.which);\r
                 if(e.which === 13) { \r
             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-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
                         input.remove();\r
                     }\r
                     e.preventDefault();\r


@@ -63,7 +63,7 @@ rng.modules.visualEditor = function(sandbox) {
         },\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 inputs = $(this).find('td [contenteditable]');\r
                 var key = $(inputs[0]).text();\r
                 var tr = $(this);\r
                 var inputs = $(this).find('td [contenteditable]');\r
                 var key = $(inputs[0]).text();\r


@@ -75,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


@@ -91,9 +91,8 @@ 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

             var newRow = $(sandbox.getTemplate('metaItem')({key: key || '', value: value || ''}));\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
             return newRow;\r
         }\r
     };\r