documentCanvas - removing yellow "glow" around contenteditable element in Chrome

[fnpeditor.git] / modules / visualEditor.js

diff --git a/modules/visualEditor.js b/modules/visualEditor.js
index 82ee13e..65de452 100644 (file)
--- a/modules/visualEditor.js
+++ b/modules/visualEditor.js
@@ -1,5 +1,6 @@
-rng.modules.visualEditor = function(sandbox) {\r
-    var transformations = rng.modules.visualEditor.transformations;\r
+define(['./visualEditor.transformations'], function(transformations) {\r
+\r
+return function(sandbox) {\r

 \r
     var view = {\r
         node: $(sandbox.getTemplate('main')()),\r
 \r
     var view = {\r
         node: $(sandbox.getTemplate('main')()),\r


@@ -34,13 +35,7 @@ rng.modules.visualEditor = function(sandbox) {
             this.node.on('keydown', '#rng-visualEditor-contentWrapper', function(e) {\r
                 if(e.which === 13) { \r
                     e.preventDefault();\r
             this.node.on('keydown', '#rng-visualEditor-contentWrapper', function(e) {\r
                 if(e.which === 13) { \r
                     e.preventDefault();\r

-                    var anchor = $(window.getSelection().anchorNode);\r
-                    if(anchor[0].nodeType === Node.TEXT_NODE)\r
-                        anchor = anchor.parent();\r
-                    var newNode = anchor.clone().empty();\r
-                    newNode.attr('id', '');\r
-                    anchor.after(newNode);\r
-                    view.selectNode(newNode);\r
+                    view.insertNewNode(null, null);\r

                 }\r
             });\r
             \r
                 }\r
             });\r
             \r


@@ -77,9 +72,6 @@ rng.modules.visualEditor = function(sandbox) {
             \r
             var observer = new MutationObserver(function(mutations) {\r
               mutations.forEach(function(mutation) {\r
             \r
             var observer = new MutationObserver(function(mutations) {\r
               mutations.forEach(function(mutation) {\r

-                if(mutation.addedNodes.length > 0) {\r
-                    console.log(mutation.addedNodes);\r
-                }\r

                 _.each(mutation.addedNodes, function(node) {\r
                     node = $(node);\r
                     node.parent().find('[wlxml-tag]').each(function() {\r
                 _.each(mutation.addedNodes, function(node) {\r
                     node = $(node);\r
                     node.parent().find('[wlxml-tag]').each(function() {\r


@@ -95,6 +87,88 @@ rng.modules.visualEditor = function(sandbox) {
             \r
             this.gridToggled = false;
         },\r
             \r
             this.gridToggled = false;
         },\r

+        _createNode: function(wlxmlTag, wlxmlClass) {\r
+            var toBlock = ['div', 'document', 'section', 'header'];\r
+            var htmlTag = _.contains(toBlock, wlxmlTag) ? 'div' : 'span';\r
+            var toret = $('<' + htmlTag + '>');\r
+            toret.attr('wlxml-tag', wlxmlTag);\r
+            if(wlxmlClass)\r
+                toret.attr('wlxml-class', wlxmlClass);\r
+            return toret;\r
+        },\r
+        insertNewNode: function(wlxmlTag, wlxmlClass) {\r
+            //TODO: Insert inline\r
+            var anchor = $(window.getSelection().anchorNode);\r
+            var anchorOffset = window.getSelection().anchorOffset;\r
+            if(anchor[0].nodeType === Node.TEXT_NODE)\r
+                anchor = anchor.parent();\r
+            if(anchor.text() === '') {\r
+                var todel = anchor;\r
+                anchor = anchor.parent();\r
+                todel.remove();\r
+            }\r
+            if(anchorOffset > 0 && anchorOffset < anchor.text().length) {\r
+                if(wlxmlTag === null && wlxmlClass === null) {\r
+                    return this.splitWithNewNode(anchor);\r
+                }\r
+                return this.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);\r
+            }\r
+            var newNode = this._createNode(wlxmlTag || anchor.attr('wlxml-tag'), wlxmlClass || anchor.attr('wlxml-class'));\r
+            if(anchorOffset === 0)\r
+                anchor.before(newNode)\r
+            else\r
+                anchor.after(newNode);\r
+            mediator.nodeCreated(newNode);\r
+            isDirty = true;\r
+        },\r
+        wrapSelectionWithNewNode: function(wlxmlTag, wlxmlClass) {\r
+            var selection = window.getSelection();\r
+            if(selection.anchorNode === selection.focusNode && selection.anchorNode.nodeType === Node.TEXT_NODE) {\r
+                var startOffset = selection.anchorOffset;\r
+                var endOffset = selection.focusOffset;\r
+                if(startOffset > endOffset) {\r
+                    var tmp = startOffset;\r
+                    startOffset = endOffset;\r
+                    endOffset = tmp;\r
+                }\r
+                var node = selection.anchorNode;\r
+                var prefix = node.data.substr(0, startOffset);\r
+                var suffix = node.data.substr(endOffset);\r
+                var core = node.data.substr(startOffset, endOffset - startOffset);\r
+                var newNode = this._createNode(wlxmlTag, wlxmlClass);\r
+                newNode.text(core || 'test');\r
+                $(node).replaceWith(newNode);\r
+                newNode.before(prefix);\r
+                newNode.after(suffix);\r
+                mediator.nodeCreated(newNode);\r
+                isDirty = true;\r
+            }\r
+        },\r
+        splitWithNewNode: function(node) {\r
+            var selection = window.getSelection();\r
+            if(selection.anchorNode === selection.focusNode && selection.anchorNode.nodeType === Node.TEXT_NODE) {\r
+                var startOffset = selection.anchorOffset;\r
+                var endOffset = selection.focusOffset;\r
+                if(startOffset > endOffset) {\r
+                    var tmp = startOffset;\r
+                    startOffset = endOffset;\r
+                    endOffset = tmp;\r
+                }\r
+                var anchor = selection.anchorNode;\r
+                var prefix = anchor.data.substr(0, startOffset);\r
+                var suffix = anchor.data.substr(endOffset);\r
+                var prefixNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));\r
+                var newNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));\r
+                var suffixNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));\r
+                prefixNode.text(prefix);\r
+                suffixNode.text(suffix);\r
+                node.replaceWith(newNode);\r
+                newNode.before(prefixNode);\r
+                newNode.after(suffixNode);\r
+                mediator.nodeCreated(newNode);\r
+                isDirty = true;\r
+            }\r
+        },\r

         getMetaData: function() {\r
             var toret = {};\r
             this.metaTable.find('tr').each(function() {\r
         getMetaData: function() {\r
             var toret = {};\r
             this.metaTable.find('tr').each(function() {\r


@@ -121,8 +195,12 @@ rng.modules.visualEditor = function(sandbox) {
             return this.node.find('#rng-visualEditor-content').html();\r
         }, \r
         _markSelected: function(node) {\r
             return this.node.find('#rng-visualEditor-content').html();\r
         }, \r
         _markSelected: function(node) {\r

+            this.dimNode(node);\r
+            \r

             this.node.find('.rng-current').removeClass('rng-current');\r
             this.node.find('.rng-current').removeClass('rng-current');\r

+            \r

             node.addClass('rng-current');\r
             node.addClass('rng-current');\r

+\r

             this.currentNode = node;\r
             mediator.nodeSelected(node);\r
         },\r
             this.currentNode = node;\r
             mediator.nodeSelected(node);\r
         },\r


@@ -142,12 +220,20 @@ rng.modules.visualEditor = function(sandbox) {
                 this.selectNode(node);\r
         },\r
         highlightNode: function(node) {\r
                 this.selectNode(node);\r
         },\r
         highlightNode: function(node) {\r

-            if(!this.gridToggled)\r
+            if(!this.gridToggled) {\r

                 node.addClass('rng-hover');\r
                 node.addClass('rng-hover');\r

+                var label = node.attr('wlxml-tag');\r
+                if(node.attr('wlxml-class'))\r
+                    label += ' / ' + node.attr('wlxml-class');\r
+                var tag = $('<div>').addClass('rng-visualEditor-nodeHoverTag').text(label);\r
+                node.append(tag);\r
+            }\r

         },\r
         dimNode: function(node) {\r
         },\r
         dimNode: function(node) {\r

-            if(!this.gridToggled)\r
+            if(!this.gridToggled) {\r

                 node.removeClass('rng-hover');\r
                 node.removeClass('rng-hover');\r

+                node.find('.rng-visualEditor-nodeHoverTag').remove();\r
+            }\r

         },\r
         highlightNodeById: function(id) {\r
             var node = this.node.find('#'+id);\r
         },\r
         highlightNodeById: function(id) {\r
             var node = this.node.find('#'+id);\r


@@ -192,6 +278,7 @@ rng.modules.visualEditor = function(sandbox) {
             var view = this;\r
             this.node.find('#rng-visualEditor-sidebarButtons a').click(function(e) {\r
                 e.preventDefault();\r
             var view = this;\r
             this.node.find('#rng-visualEditor-sidebarButtons a').click(function(e) {\r
                 e.preventDefault();\r

+                e.stopPropagation();\r

                 var target = $(e.currentTarget);\r
                 if(!target.attr('data-content-id'))\r
                     return;\r
                 var target = $(e.currentTarget);\r
                 if(!target.attr('data-content-id'))\r
                     return;\r


@@ -205,31 +292,7 @@ rng.modules.visualEditor = function(sandbox) {
                 mediator.getCurrentNode().attr('wlxml-'+attr, target.val());\r
                 isDirty = true;\r
             });\r
                 mediator.getCurrentNode().attr('wlxml-'+attr, target.val());\r
                 isDirty = true;\r
             });\r

-            \r
-            view.node.on('change', '.rng-visualEditor-editPaneSelectionForm select', function(e) {\r
-                var target = $(e.target);\r
-                var selection = window.getSelection();\r
-                if(selection.anchorNode === selection.focusNode && selection.anchorNode.nodeType === Node.TEXT_NODE) {\r
-                    var startOffset = selection.anchorOffset;\r
-                    var endOffset = selection.focusOffset;\r
-                    if(startOffset > endOffset) {\r
-                        var tmp = startOffset;\r
-                        startOffset = endOffset;\r
-                        endOffset = tmp;\r
-                    }\r
-                    var node = selection.anchorNode;\r
-                    var prefix = node.data.substr(0, startOffset);\r
-                    var suffix = node.data.substr(endOffset);\r
-                    var core = node.data.substr(startOffset, endOffset - startOffset);\r
-                    var newNode = $('<span wlxml-tag="' + target.val() + '">' + core + '</span>');\r
-                    $(node).replaceWith(newNode);\r
-                    newNode.before(prefix);\r
-                    newNode.after(suffix);\r
-                    mediator.nodeCreated(newNode);\r
-                    isDirty = true;\r
-                }\r
-            });\r
-            \r
+                       \r

             view.node.on('click', '.rng-visualEditor-editPaneSurrouding a', function(e) {\r
                 var target = $(e.target);\r
                 mediator.nodeDimmedById(target.attr('data-id'));\r
             view.node.on('click', '.rng-visualEditor-editPaneSurrouding a', function(e) {\r
                 var target = $(e.target);\r
                 mediator.nodeDimmedById(target.attr('data-id'));\r


@@ -254,16 +317,18 @@ rng.modules.visualEditor = function(sandbox) {
         },\r
         updateEditPane: function(node) {\r
             var pane = this.node.find('#rng-visualEditor-edit');\r
         },\r
         updateEditPane: function(node) {\r
             var pane = this.node.find('#rng-visualEditor-edit');\r

+            var parentClass = node.parent().attr('wlxml-class');\r

             pane.html( $(sandbox.getTemplate('editPane')({tag: node.attr('wlxml-tag'), klass: node.attr('wlxml-class')})));\r
             \r
             pane.html( $(sandbox.getTemplate('editPane')({tag: node.attr('wlxml-tag'), klass: node.attr('wlxml-class')})));\r
             \r

-            var parent = {\r
-                repr: node.parent().attr('wlxml-tag') + ' / ' + (node.parent().attr('wlxml-class') || '[[no class]]'),\r
+            var parent = node.parent('[wlxml-tag]').length ? {\r
+                repr: node.parent().attr('wlxml-tag') + (parentClass ? ' / ' + parentClass : ''),\r

                 id: node.parent().attr('id')\r
                 id: node.parent().attr('id')\r

-            }\r
+            } : undefined;\r

             var children = [];\r
             node.children('[wlxml-tag]').each(function() {\r
                 var child = $(this);\r
             var children = [];\r
             node.children('[wlxml-tag]').each(function() {\r
                 var child = $(this);\r

-                children.push({repr: child.attr('wlxml-tag') + ' / ' + (child.attr('wlxml-class') || '[[no class]]'), id: child.attr('id')});\r
+                var childClass = child.attr('wlxml-class');\r
+                children.push({repr: child.attr('wlxml-tag') + (childClass ? ' / ' + childClass : ''), id: child.attr('id')});\r

             });\r
             var naviTemplate = sandbox.getTemplate('editPaneNavigation')({parent: parent, children: children});\r
             pane.find('.rng-visualEditor-editPaneSurrouding > div').html($(naviTemplate));\r
             });\r
             var naviTemplate = sandbox.getTemplate('editPaneNavigation')({parent: parent, children: children});\r
             pane.find('.rng-visualEditor-editPaneSurrouding > div').html($(naviTemplate));\r


@@ -289,13 +354,52 @@ rng.modules.visualEditor = function(sandbox) {
                     btn.toggleClass('active')\r
                     mediator.toolbarButtonToggled(btn.attr('data-btn'), btn.hasClass('active'));\r
                 }\r
                     btn.toggleClass('active')\r
                     mediator.toolbarButtonToggled(btn.attr('data-btn'), btn.hasClass('active'));\r
                 }\r

+                if(btn.attr('data-btn-type') === 'cmd') {\r
+                    mediator.toolbarButtonCmd(btn.attr('data-btn'), btn.attr('data-meta'));\r
+                }\r

             });\r
             });\r

+        },\r
+        getOption: function(option) {\r
+            return this.node.find('.rng-visualEditor-toolbarOption[data-option=' + option +']').val();\r
+        }\r
+    }\r
+    \r
+    var statusBarView = {\r
+        node: view.node.find('#rng-visualEditor-statusbar'),\r
+        setup: function() {\r
+            var view = this;\r
+            view.node.on('mouseenter', 'a', function(e) {\r
+                var target = $(e.target);\r
+                mediator.nodeHighlightedById(target.attr('data-id')); \r
+            });\r
+            view.node.on('mouseleave', 'a', function(e) {\r
+                var target = $(e.target);\r
+                mediator.nodeDimmedById(target.attr('data-id')); \r
+            });\r
+            view.node.on('click', 'a', function(e) {\r
+                e.preventDefault();\r
+                mediator.nodeSelectedById($(e.target).attr('data-id'));\r
+            });\r
+        },\r
+        \r
+        showNode: function(node) {\r
+            this.node.empty();\r
+            this.node.html(sandbox.getTemplate('statusBarNodeDisplay')({node: node, parents: node.parents('[wlxml-tag]')}));\r
+            //node.parents('[wlxml-tag]')\r
+        },\r
+        \r
+        highlightNode: function(id) {\r
+            this.node.find('a[data-id="'+id+'"]').addClass('rng-hover');\r
+        },\r
+        dimNode: function(id) {\r
+            this.node.find('a[data-id="' +id+'"]').removeClass('rng-hover');\r

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

+    statusBarView.setup();\r

     \r
     var mediator = {\r
         getCurrentNode: function() {\r
     \r
     var mediator = {\r
         getCurrentNode: function() {\r


@@ -303,10 +407,10 @@ rng.modules.visualEditor = function(sandbox) {
         },\r
         nodeCreated: function(node) {\r
             view.selectNode(node);\r
         },\r
         nodeCreated: function(node) {\r
             view.selectNode(node);\r

-            \r

         },\r
         nodeSelected: function(node) {\r
             sideBarView.updateEditPane(node);\r
         },\r
         nodeSelected: function(node) {\r
             sideBarView.updateEditPane(node);\r

+            statusBarView.showNode(node);\r

         },\r
         nodeSelectedById: function(id) {\r
             view.selectNodeById(id);\r
         },\r
         nodeSelectedById: function(id) {\r
             view.selectNodeById(id);\r


@@ -323,13 +427,36 @@ rng.modules.visualEditor = function(sandbox) {
             if(btn === 'tags')\r
                 view.toggleTags(toggle);\r
         },\r
             if(btn === 'tags')\r
                 view.toggleTags(toggle);\r
         },\r

+        toolbarButtonCmd: function(btn, meta) {\r
+            if(btn === 'new-node') {\r
+                var wlxmlTag = toolbarView.getOption('newTag-tag');\r
+                var wlxmlClass = toolbarView.getOption('newTag-class');\r
+                if(meta) {\r
+                    var split = meta.split('/');\r
+                    wlxmlTag = split[0];\r
+                    wlxmlClass = split[1];\r
+                }\r
+                if(window.getSelection().isCollapsed)\r
+                    view.insertNewNode(wlxmlTag, wlxmlClass);\r
+                else {\r
+                    this.wrapWithNodeRequest(wlxmlTag, wlxmlClass);\r
+                }\r
+                    \r
+                    \r
+            }\r
+        },\r

         nodeHovered: function(node) {\r
             view.highlightNode(node);\r
             sideBarView.highlightNode(node.attr('id'));\r
         nodeHovered: function(node) {\r
             view.highlightNode(node);\r
             sideBarView.highlightNode(node.attr('id'));\r

+            statusBarView.highlightNode(node.attr('id'));\r

         },\r
         nodeBlured: function(node) {\r
             view.dimNode(node);\r
             sideBarView.dimNode(node.attr('id'));\r
         },\r
         nodeBlured: function(node) {\r
             view.dimNode(node);\r
             sideBarView.dimNode(node.attr('id'));\r

+            statusBarView.dimNode(node.attr('id'));\r
+        },\r
+        wrapWithNodeRequest: function(wlxmlTag, wlxmlClass) {\r
+            view.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);\r

         }\r
         \r
     }\r
         }\r
         \r
     }\r


@@ -368,4 +495,6 @@ rng.modules.visualEditor = function(sandbox) {
         }\r
     \r
     }\r
         }\r
     \r
     }\r

-};
\ No newline at end of file
+};\r
+\r
+});
\ No newline at end of file