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 ce62c6a..9721d29 100644 (file)
--- a/modules/visualEditor.js
+++ b/modules/visualEditor.js
@@ -4,38 +4,80 @@ rng.modules.visualEditor = function(sandbox) {
     var view = {\r
         node: $(sandbox.getTemplate('main')()),\r
         setup: function() {\r
     var view = {\r
         node: $(sandbox.getTemplate('main')()),\r
         setup: function() {\r

-            var node = this.node;\r
-            node.find('#rng-visualEditor-content').on('keyup', function() {\r
+            var view = this;\r
+
+            this.node.find('#rng-visualEditor-content').on('keyup', function() {\r

                 isDirty = true;\r
             });\r
             \r
                 isDirty = true;\r
             });\r
             \r

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

                 isDirty = true;\r
             });\r
 
                 isDirty = true;\r
             });\r
 

-            this.node.on('mouseover', '.rng', function(e) { $(e.target).addClass('rng-hover')});\r
-            this.node.on('mouseout', '.rng', function(e) { $(e.target).removeClass('rng-hover')});\r
-            this.node.on('click', '.rng', function(e) {\r
-                node.find('.rng').removeClass('rng-current');\r
-                $(e.target).addClass('rng-current');\r
-            });
+            this.node.on('mouseover', '[wlxml-tag]', function(e) { $(e.target).addClass('rng-hover')});\r
+            this.node.on('mouseout', '[wlxml-tag]', function(e) { $(e.target).removeClass('rng-hover')});\r
+            this.node.on('click', '[wlxml-tag]', function(e) {\r
+                console.log('clicked node type: '+e.target.nodeType);\r
+                view._markSelected($(e.target));\r
+            });\r
+\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
+            });\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


@@ -43,7 +85,16 @@ rng.modules.visualEditor = function(sandbox) {
         },\r
         getBody: function() {\r
             return this.node.find('#rng-visualEditor-content').html();\r
         },\r
         getBody: function() {\r
             return this.node.find('#rng-visualEditor-content').html();\r

-        }   \r
+        }, \r
+        _markSelected: function(node) {\r
+            this.node.find('.rng-current').removeClass('rng-current');\r
+            node.addClass('rng-current');\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
     view.setup();\r
     \r
     };\r
     view.setup();\r
     \r