Visual editor - tweaking saving document ui & behavior

[fnpeditor.git] / modules / visualEditor.js

diff --git a/modules/visualEditor.js b/modules/visualEditor.js
index 702c812..a607d86 100644 (file)
--- a/modules/visualEditor.js
+++ b/modules/visualEditor.js
@@ -15,8 +15,8 @@ rng.modules.visualEditor = function(sandbox) {
                 isDirty = true;\r
             });\r
 
                 isDirty = true;\r
             });\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('mouseover', '[wlxml-tag]', function(e) { mediator.nodeHovered($(e.target));});\r
+            this.node.on('mouseout', '[wlxml-tag]', function(e) { mediator.nodeBlured($(e.target));});\r

             this.node.on('click', '[wlxml-tag]', function(e) {\r
                 console.log('clicked node type: '+e.target.nodeType);\r
                 view._markSelected($(e.target));\r
             this.node.on('click', '[wlxml-tag]', function(e) {\r
                 console.log('clicked node type: '+e.target.nodeType);\r
                 view._markSelected($(e.target));\r


@@ -34,12 +34,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
-                    anchor.after(newNode);\r
-                    view.selectNode(newNode);\r
+                    view.insertNewNode(null, null);\r

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


@@ -72,7 +67,72 @@ rng.modules.visualEditor = function(sandbox) {
                 }\r
                 \r
             });\r
                 }\r
                 \r
             });\r

-
+            \r
+            \r
+            var observer = new MutationObserver(function(mutations) {\r
+              mutations.forEach(function(mutation) {\r
+                _.each(mutation.addedNodes, function(node) {\r
+                    node = $(node);\r
+                    node.parent().find('[wlxml-tag]').each(function() {\r
+                        tag = $(this);\r
+                        if(!tag.attr('id'))\r
+                            tag.attr('id', 'xxxxxxxx-xxxx-xxxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {var r = Math.random()*16|0,v=c=='x'?r:r&0x3|0x8;return v.toString(16);}));\r
+                    });\r
+                });\r
+              });    \r
+            });\r
+            var config = { attributes: true, childList: true, characterData: true, subtree: true };\r
+            observer.observe(this.node.find('#rng-visualEditor-contentWrapper')[0], config);\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
+            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
+            var newNode = this._createNode(wlxmlTag || anchor.attr('wlxml-tag'), wlxmlClass || anchor.attr('wlxml-class'));\r
+            anchor.after(newNode);\r
+            mediator.nodeCreated(newNode);\r
+            isDirty = true;\r
+        },\r
+        wrapSelectionWithNewNode: function(wlxmlTag, wlxmlClass) {\r
+            \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);\r
+                $(node).replaceWith(newNode);\r
+                newNode.before(prefix);\r
+                newNode.after(suffix);\r
+                mediator.nodeCreated(newNode);\r
+                isDirty = true;\r
+            }\r

         },\r
         getMetaData: function() {\r
             var toret = {};\r
         },\r
         getMetaData: function() {\r
             var toret = {};\r


@@ -100,8 +160,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


@@ -115,6 +179,37 @@ rng.modules.visualEditor = function(sandbox) {
             selection.removeAllRanges()\r
             selection.addRange(range);\r
         },\r
             selection.removeAllRanges()\r
             selection.addRange(range);\r
         },\r

+        selectNodeById: function(id) {\r
+            var node = this.node.find('#'+id);\r
+            if(node)\r
+                this.selectNode(node);\r
+        },\r
+        highlightNode: function(node) {\r
+            if(!this.gridToggled) {\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
+            if(!this.gridToggled) {\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
+            if(node)\r
+                this.highlightNode(node);\r
+        },\r
+        dimNodeById: function(id) {\r
+            var node = this.node.find('#'+id);\r
+            if(node)\r
+                this.dimNode(node);\r
+        },\r

         selectFirstNode: function() {\r
             var firstNodeWithText = this.node.find('[wlxml-tag]').filter(function() {\r
                 return $(this).clone().children().remove().end().text().trim() !== '';\r
         selectFirstNode: function() {\r
             var firstNodeWithText = this.node.find('[wlxml-tag]').filter(function() {\r
                 return $(this).clone().children().remove().end().text().trim() !== '';\r


@@ -131,6 +226,13 @@ rng.modules.visualEditor = function(sandbox) {
             var newRow = $(sandbox.getTemplate('metaItem')({key: key || '', value: value || ''}));\r
             newRow.appendTo(this.metaTable);\r
             return newRow;\r
             var newRow = $(sandbox.getTemplate('metaItem')({key: key || '', value: value || ''}));\r
             newRow.appendTo(this.metaTable);\r
             return newRow;\r

+        },\r
+        toggleGrid: function(toggle) {\r
+            this.node.find('[wlxml-tag]').toggleClass('rng-hover', toggle);\r
+            this.gridToggled = toggle;\r
+        },\r
+        toggleTags: function(toggle) {\r
+        \r

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


@@ -154,29 +256,20 @@ 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('click', '.rng-visualEditor-editPaneSurrouding a', function(e) {\r
+                var target = $(e.target);\r
+                mediator.nodeDimmedById(target.attr('data-id'));\r
+                mediator.nodeSelectedById(target.attr('data-id'));\r
+            });\r

             \r
             \r

-            view.node.on('change', '.rng-visualEditor-editPaneSelectionForm select', function(e) {\r
+            view.node.on('mouseenter', '.rng-visualEditor-editPaneSurrouding a', function(e) {\r

                 var target = $(e.target);\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
+                mediator.nodeHighlightedById(target.attr('data-id')); \r
+            });\r
+            view.node.on('mouseleave', '.rng-visualEditor-editPaneSurrouding a', function(e) {\r
+                var target = $(e.target);\r
+                mediator.nodeDimmedById(target.attr('data-id')); \r

             });\r
         },\r
         selectTab: function(id) {\r
             });\r
         },\r
         selectTab: function(id) {\r


@@ -189,11 +282,53 @@ rng.modules.visualEditor = function(sandbox) {
         updateEditPane: function(node) {\r
             var pane = this.node.find('#rng-visualEditor-edit');\r
             pane.html( $(sandbox.getTemplate('editPane')({tag: node.attr('wlxml-tag'), klass: node.attr('wlxml-class')})));\r
         updateEditPane: function(node) {\r
             var pane = this.node.find('#rng-visualEditor-edit');\r
             pane.html( $(sandbox.getTemplate('editPane')({tag: node.attr('wlxml-tag'), klass: node.attr('wlxml-class')})));\r

+            \r
+            var parent = node.parent('[wlxml-tag]').length ? {\r
+                repr: node.parent().attr('wlxml-tag') + ' / ' + (node.parent().attr('wlxml-class') || '[[no class]]'),\r
+                id: node.parent().attr('id')\r
+            } : undefined;\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
+            });\r
+            var naviTemplate = sandbox.getTemplate('editPaneNavigation')({parent: parent, children: children});\r
+            pane.find('.rng-visualEditor-editPaneSurrouding > div').html($(naviTemplate));\r
+        },\r
+        highlightNode: function(id) {\r
+            var pane = this.node.find('#rng-visualEditor-edit');\r
+            pane.find('a[data-id="'+id+'"]').addClass('rng-hover');\r
+        },\r
+        dimNode: function(id) {\r
+            var pane = this.node.find('#rng-visualEditor-edit');\r
+            pane.find('a[data-id="' +id+'"]').removeClass('rng-hover');\r
+        }\r
+    }\r
+    \r
+    var toolbarView = {\r
+        node: view.node.find('#rng-visualEditor-toolbar'),\r
+        setup: function() {\r
+            var view = this;\r
+            \r
+            view.node.find('button').click(function(e) {\r
+                var btn = $(e.currentTarget);\r
+                if(btn.attr('data-btn-type') === 'toggle') {\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'));\r
+                }\r
+            });\r
+        },\r
+        getOption: function(option) {\r
+            return this.node.find('.rng-visualEditor-toolbarOption[data-option=' + option +']').val();\r

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

+    toolbarView.setup();\r

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


@@ -201,11 +336,48 @@ 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

+        },\r
+        nodeSelectedById: function(id) {\r
+            view.selectNodeById(id);\r
+        },\r
+        nodeHighlightedById: function(id) {\r
+            view.highlightNodeById(id);\r
+        },\r
+        nodeDimmedById: function(id) {\r
+            view.dimNodeById(id);\r
+        },\r
+        toolbarButtonToggled: function(btn, toggle) {\r
+            if(btn === 'grid')\r
+                view.toggleGrid(toggle);\r
+            if(btn === 'tags')\r
+                view.toggleTags(toggle);\r
+        },\r
+        toolbarButtonCmd: function(btn) {\r
+            if(btn === 'new-node') {\r
+                if(window.getSelection().isCollapsed)\r
+                    view.insertNewNode(toolbarView.getOption('newTag-tag'), toolbarView.getOption('newTag-class'));\r
+                else {\r
+                    this.wrapWithNodeRequest(toolbarView.getOption('newTag-tag'), toolbarView.getOption('newTag-class'));\r
+                }\r
+                    \r
+                    \r
+            }\r
+        },\r
+        nodeHovered: function(node) {\r
+            view.highlightNode(node);\r
+            sideBarView.highlightNode(node.attr('id'));\r
+        },\r
+        nodeBlured: function(node) {\r
+            view.dimNode(node);\r
+            sideBarView.dimNode(node.attr('id'));\r
+        },\r
+        wrapWithNodeRequest: function(wlxmlTag, wlxmlClass) {\r
+            view.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);\r

         }\r
         }\r

+        \r

     }\r
     \r
     var isDirty = false;\r
     }\r
     \r
     var isDirty = false;\r