X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/ebaba7ac4948ae4280dea0a623045ffb6d5a722f..39305f915559082f17b7a5b8fd7521ee05181fec:/modules/visualEditor.js?ds=inline

diff --git a/modules/visualEditor.js b/modules/visualEditor.js
index 5833b71..9721d29 100644
--- a/modules/visualEditor.js
+++ b/modules/visualEditor.js
@@ -21,7 +21,7 @@ rng.modules.visualEditor = function(sandbox) {
                 view._markSelected($(e.target));
             });
 
-            this.node.on('keyup', function(e) {
+            this.node.on('keyup', '#rng-visualEditor-contentWrapper', function(e) {
                 var anchor = $(window.getSelection().anchorNode);
                 if(anchor[0].nodeType === Node.TEXT_NODE)
                     anchor = anchor.parent();
@@ -31,10 +31,11 @@ rng.modules.visualEditor = function(sandbox) {
             });
             
             
-            this.metaTable = this.node.find('#rng-visualEditor-meta table');
+            var metaTable = this.metaTable = this.node.find('#rng-visualEditor-meta table');
             
-            this.metaTable.find('.rng-visualEditor-metaAddBtn').click(function() {
-                view._addMetaRow();
+            this.node.find('.rng-visualEditor-metaAddBtn').click(function() {
+                var newRow = view._addMetaRow('', '');
+                $(newRow.find('td div')[0]).focus();
                 isDirty = true;
             });
             
@@ -42,15 +43,31 @@ rng.modules.visualEditor = function(sandbox) {
                 $(e.target).closest('tr').remove();
                 isDirty = true;
             });
+            
+            this.metaTable.on('keydown', '[contenteditable]', function(e) {
+                console.log(e.which);
+                if(e.which === 13) { 
+                    if($(document.activeElement).hasClass('rng-visualEditor-metaItemKey')) {
+                        metaTable.find('.rng-visualEditor-metaItemValue').focus();
+                    } else {
+                        var input = $('<input>');
+                        input.appendTo('body').focus()
+                        view.node.find('.rng-visualEditor-metaAddBtn').focus();
+                        input.remove();
+                    }
+                    e.preventDefault();
+                }
+                
+            });
 
         },
         getMetaData: function() {
             var toret = {};
-            this.metaTable.find('tr').not('.rng-visualEditor-addMetaRow').each(function() {
+            this.metaTable.find('tr').each(function() {
                 var tr = $(this);
-                var inputs = $(this).find('td input');
-                var key = $(inputs[0]).val()
-                var value = $(inputs[1]).val()
+                var inputs = $(this).find('td [contenteditable]');
+                var key = $(inputs[0]).text();
+                var value = $(inputs[1]).text();
                 toret[key] = value;
             });
             console.log(toret);
@@ -58,7 +75,7 @@ rng.modules.visualEditor = function(sandbox) {
         },
         setMetaData: function(metadata) {
             var view = this;
-            this.metaTable.find('tr').not('.rng-visualEditor-addMetaRow').remove();
+            this.metaTable.find('tr').remove();
             _.each(_.keys(metadata), function(key) {    
                 view._addMetaRow(key, metadata[key]);
             });
@@ -74,8 +91,9 @@ rng.modules.visualEditor = function(sandbox) {
             node.addClass('rng-current');
         },
         _addMetaRow: function(key, value) {
-            var addRow = this.metaTable.find('.rng-visualEditor-addMetaRow');
-            $(sandbox.getTemplate('metaItem')({key: key || '', value: value || ''})).insertBefore(addRow);
+            var newRow = $(sandbox.getTemplate('metaItem')({key: key || '', value: value || ''}));
+            newRow.appendTo(this.metaTable);
+            return newRow;
         }
     };
     view.setup();