Another set of missing semicolons

[fnpeditor.git] / modules / documentCanvas / documentCanvas.js

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index 7e7fdf0..37e8377 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -3,252 +3,56 @@
 define([\r
 'libs/underscore-min',\r
 './transformations', \r
 define([\r
 'libs/underscore-min',\r
 './transformations', \r

-'libs/text!./template.html'], function(_, transformations, template) {\r
-\r
+'./canvas',\r
+'./canvasManager',\r
+'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, template) {\r

 \r
 \r

+'use strict';\r

 \r
 return function(sandbox) {\r
 \r
 \r
 return function(sandbox) {\r
 \r

-    var view = {\r
-        node: $(_.template(template)()),\r
-        currentNode: null,\r
-        setup: function() {\r
-            var view = this;\r
-\r
-            this.node.find('#rng-module-documentCanvas-content').on('keyup', function() {\r
-                //isDirty = true;\r
-                sandbox.publish('contentChanged');\r
-            });\r
+    var canvas = Canvas.create();\r
+    var manager = new CanvasManager(canvas, sandbox);\r

 \r
 \r

-            this.node.on('mouseover', '[wlxml-tag]', function(e) { sandbox.publish('nodeHovered', $(e.target)); });\r
-            this.node.on('mouseout', '[wlxml-tag]', function(e) { sandbox.publish('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
-            });\r
-\r
-            this.node.on('keyup', '#rng-module-documentCanvas-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
-            this.node.on('keydown', '#rng-module-documentCanvas-contentWrapper', function(e) {\r
-                if(e.which === 13) { \r
-                    e.preventDefault();\r
-                    view.insertNewNode(null, null);\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-module-documentCanvas-contentWrapper')[0], config);\r
-            \r
-            this.gridToggled = false;\r
-        },\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
+    /* public api */\r
+    return {\r
+        start: function() { sandbox.publish('ready'); },\r
+        getView: function() { \r
+            return canvas.dom;\r

         },\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
-            sandbox.publish('contentChanged');\r
+        setDocument: function(xml) {\r
+            canvas.setHTML(transformations.fromXML.getHTMLTree(xml));\r
+            sandbox.publish('documentSet');\r

         },\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
-                sandbox.publish('contentChanged');\r
-            }\r
+        getDocument: function() {\r
+            return transformations.toXML.getXML(canvas.getContent());\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
+        modifyCurrentNode: function(attr, value) {\r
+            if(manager.currentNode) {\r
+                manager.getNodeElement(manager.currentNode).attr('wlxml-'+attr, value);\r

                 sandbox.publish('contentChanged');\r
             }\r
         },\r
                 sandbox.publish('contentChanged');\r
             }\r
         },\r

-        setBody: function(HTMLTree) {\r
-            this.node.find('#rng-module-documentCanvas-content').html(HTMLTree);\r
+        highlightNode: function(canvasNode) {\r
+            manager.highlightNode(canvasNode);\r

         },\r
         },\r

-        getBody: function() {\r
-            return this.node.find('#rng-module-documentCanvas-content').html();\r
-        }, \r
-        _markSelected: function(node) {\r
-            this.dimNode(node);\r
-            \r
-            this.node.find('.rng-current').removeClass('rng-current');\r
-            \r
-            node.addClass('rng-current');\r
-\r
-            this.currentNode = node;\r
-            sandbox.publish('nodeSelected', node);\r
-            \r
-        },\r
-        selectNode: function(node) {\r
-            view._markSelected(node);\r
-            var range = document.createRange();\r
-            range.selectNodeContents(node[0]);\r
-            range.collapse(false);\r
-\r
-            var selection = document.getSelection();\r
-            selection.removeAllRanges()\r
-            selection.addRange(range);\r
+        dimNode: function(canvasNode) {\r
+            manager.dimNode(canvasNode);\r

         },\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
-            }).first();\r
-            var node;\r
-            if(firstNodeWithText.length)\r
-                node = $(firstNodeWithText[0])\r
-            else {\r
-                node = this.node.find('[wlxml-class|="p"]')\r
-            }\r
-            this.selectNode(node);\r
+        selectNode: function(canvasNode) {\r
+            if(!canvasNode.isSame(manager.currentNode))\r
+                manager.selectNode(canvasNode, {movecaret: true});\r

         },\r
         toggleGrid: function(toggle) {\r
         },\r
         toggleGrid: function(toggle) {\r

-            this.node.find('[wlxml-tag]').toggleClass('rng-hover', toggle);\r
-            this.gridToggled = toggle;\r
-        }\r
-    };\r
-    \r
-    view.setup();\r
-\r
-    /* public api */\r
-    return {\r
-        start: function() { sandbox.publish('ready'); },\r
-        getView: function() { return view.node; },\r
-        setDocument: function(xml) {\r
-            var transformed = transformations.fromXML.getDocumentDescription(xml);\r
-            view.setBody(transformed.HTMLTree);\r
-            view.selectFirstNode();\r
-            //isDirty = false;\r
+            manager.toggleGrid(toggle);\r

         },\r
         },\r

-        modifyCurrentNode: function(attr, value) {\r
-            if(view.currentNode)\r
-                view.currentNode.attr('wlxml-'+attr, value);\r
-        },\r
-        highlightNode: function(id) {\r
-            view.highlightNodeById(id);\r
-        },\r
-        dimNode: function(id) {\r
-            view.dimNodeById(id);\r
+        insertNewNode: function(wlxmlTag, wlxmlClass) {\r
+            manager.insertNewNode(wlxmlTag, wlxmlClass);\r

         },\r
         },\r

-        selectNode: function(id) {\r
-            view.selectNodeById(id);\r
+        command: function(command, meta) {\r
+            manager.command(command, meta);\r

         }\r
         }\r

-        \r
-    }\r
+    };\r

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