editor: fix selecting text spanning multiple nodes in Chrome

[fnpeditor.git] / src / editor / modules / metadataEditor / metadataEditor.js

diff --git a/src/editor/modules/metadataEditor/metadataEditor.js b/src/editor/modules/metadataEditor/metadataEditor.js
index 48b10eb..ec64455 100644 (file)
--- a/src/editor/modules/metadataEditor/metadataEditor.js
+++ b/src/editor/modules/metadataEditor/metadataEditor.js
@@ -42,28 +42,24 @@ return function(sandbox) {
                 }
             });
             
                 }
             });
             

-            
-            var onKeyUp = function(e) {
+            this.metaTable.on('keyup', '[contenteditable]', _.throttle(function(e) {

                 if(e.which !== 13) {
                     var editable = $(e.target),
                 if(e.which !== 13) {
                     var editable = $(e.target),

-                        //myIndex = metaTable.find('.'+editable.attr('class')).index(editable),
-                        isKey = _.last(editable.attr('class').split('-')) === 'metaItemKey';
-                    //toSet[isKey ? 'key' : 'value'] = editable.text();
-                    //currentNode.setMetadataRow(myIndex, toSet);
-
-                    var row = editable.parents('tr').data('row'),
-                        toSet = editable.text();
-                    if(isKey) {
-                        row.setKey(toSet);
-                    } else {
-                        row.setValue(toSet);
-                    }
-
+                        toSet = editable.text(),
+                        row = editable.parents('tr').data('row'),
+                        isKey = _.last(editable.attr('class').split('-')) === 'metaItemKey',
+                        method = isKey ? 'setKey' : 'setValue';
+                    row[method](toSet);

                 }
                 }

-            };
-            this.metaTable.on('keyup', '[contenteditable]', _.throttle(onKeyUp, 500));
+            }, 500));
+        },
+        clear: function() {

         },
         setMetadata: function(node) {
         },
         setMetadata: function(node) {

+            if(!node) {
+                this.metaTable.html('');
+                return;
+            }

             var view = this,
                 metadata = node.getMetadata();
             this.metaTable.find('tr').remove();
             var view = this,
                 metadata = node.getMetadata();
             this.metaTable.find('tr').remove();


@@ -82,28 +78,30 @@ return function(sandbox) {
             return newRow;
         },
         updateMetadataRow: function(row) {
             return newRow;
         },
         updateMetadataRow: function(row) {

-            this.metaTable.find('tr').each(function() {
-                var tr = $(this),
-                    tds, keyTd, valueTd;
-                if(tr.data('row') === row) {
-                    tds = tr.find('td');
-                    keyTd = $(tds[0]);
+            this._getRowTr(row, function(tr) {
+                var tds = tr.find('td > div'),
+                    keyTd = $(tds[0]),

                     valueTd = $(tds[1]);
 
                     valueTd = $(tds[1]);
 

-                    if(keyTd.text() !== row.getKey()) {
-                        keyTd.text(row.getKey());
-                    }
-                    if(valueTd.text() !== row.getValue()) {
-                        valueTd.text(row.getValue());
-                    }
+                if(keyTd.text() !== row.getKey()) {
+                    keyTd.text(row.getKey());
+                }
+                if(valueTd.text() !== row.getValue()) {
+                    valueTd.text(row.getValue());

                 }
             });
         },
         removeMetadataRow: function(row) {
                 }
             });
         },
         removeMetadataRow: function(row) {

+            this._getRowTr(row, function(tr) {
+                tr.remove();
+            });
+        },
+        _getRowTr: function(row, callback) {

             this.metaTable.find('tr').each(function() {
                 var tr = $(this);
                 if(tr.data('row') === row) {
             this.metaTable.find('tr').each(function() {
                 var tr = $(this);
                 if(tr.data('row') === row) {

-                    tr.remove();
+                    callback(tr);
+                    return false;

                 }
             });
         }
                 }
             });
         }


@@ -126,6 +124,9 @@ return function(sandbox) {
                 if(event.type === 'metadataRemoved' && event.meta.node.sameNode(currentNode)) {
                     view.removeMetadataRow(event.meta.row);
                 }
                 if(event.type === 'metadataRemoved' && event.meta.node.sameNode(currentNode)) {
                     view.removeMetadataRow(event.meta.row);
                 }

+                if(event.type === 'nodeDetached' && event.meta.node.sameNode(currentNode)) {
+                    view.setMetadata(null);
+                }

             });
         },
         setNodeElement: function(node) {
             });
         },
         setNodeElement: function(node) {