canvas manager wip

diff --git a/modules/documentCanvas/canvas.js b/modules/documentCanvas/canvas.js
index dc64cac..a15bb2c 100644 (file)
--- a/modules/documentCanvas/canvas.js
+++ b/modules/documentCanvas/canvas.js
@@ -9,13 +9,14 @@ define([
 'use strict';\r
 \r
 var Canvas = function(xml) {\r
-    this.xml = xml;\r
     this.dom = $(template);\r
-    \r
-    this.content = this.dom.find('#rng-module-documentCanvas-content')\r
-    \r
-    \r
-    this.content.html(transformations.fromXML.getHTMLTree(xml));\r
+    this.content = this.dom.find('#rng-module-documentCanvas-content');\r
+    this.setXML(xml);\r
+}\r
+\r
+Canvas.prototype.setXML = function(xml) {\r
+    this.xml = xml;\r
+    this.content.html(transformations.fromXML.getHTMLTree(xml));  \r
 }\r
 \r
 Canvas.prototype.toXML = function() {\r

diff --git a/modules/documentCanvas/canvasManager.js b/modules/documentCanvas/canvasManager.js
new file mode 100644 (file)
index 0000000..fcf2659
--- /dev/null
+++ b/modules/documentCanvas/canvasManager.js
@@ -0,0 +1,144 @@
+define([\r
+'libs/jquery-1.9.1.min',\r
+'./wlxmlNode'\r
+], function($, wlxmlNode) {\r
+\r
+'use strict';\r
+\r
+var Manager = function(canvas, sandbox) {\r
+    this.canvas = canvas;\r
+    this.sandbox = sandbox;\r
+    this.shownAlready = false;\r
+    this.gridToggled = false;\r
+    this.scrollbarPosition = 0;\r
+    this.currentNode = null;\r
+    var manager = this;\r
+        \r
+    canvas.dom.find('#rng-module-documentCanvas-content').on('keyup', function() {\r
+        manager.sandbox.publish('contentChanged');\r
+    });\r
+\r
+    canvas.dom.on('mouseover', '[wlxml-tag]', function(e) {\r
+        e.stopPropagation();\r
+        manager.sandbox.publish('nodeHovered', new wlxmlNode.Node($(e.target)));\r
+    });\r
+    canvas.dom.on('mouseout', '[wlxml-tag]', function(e) {\r
+        e.stopPropagation();\r
+        manager.sandbox.publish('nodeBlured', new wlxmlNode.Node($(e.target)));\r
+    });\r
+    canvas.dom.on('click', '[wlxml-tag]', function(e) {\r
+        e.stopPropagation();\r
+        console.log('clicked node type: '+e.target.nodeType);\r
+        manager.selectNode(new wlxmlNode.Node($(e.target)));\r
+    });\r
+\r
+    canvas.dom.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
+        manager.selectNode(new wlxmlNode.Node(anchor));\r
+    });\r
+    \r
+    canvas.dom.on('keydown', '#rng-module-documentCanvas-contentWrapper', function(e) {\r
+        if(e.which === 13) { \r
+            e.preventDefault();\r
+            //view.insertNewNode(null, null);\r
+        }\r
+        if(e.which === 8) {\r
+            var anchor = window.getSelection().anchorNode;\r
+            var len = anchor.length;\r
+            console.log(len);\r
+            if(len === 1) {\r
+                e.preventDefault();\r
+                $(anchor).parent().text('');\r
+            }\r
+        }\r
+    });\r
+              \r
+    canvas.dom.onShow = function() {\r
+        if(!manager.shownAlready) {\r
+            manager.shownAlready = true;\r
+            manager.selectFirstNode();\r
+        } else if(manager.currentNode) {\r
+            manager.movecaretToNode(manager.getNodeElement(manager.currentNode));\r
+            canvas.dom.find('#rng-module-documentCanvas-contentWrapper').scrollTop(manager.scrollbarPosition);\r
+        }\r
+    };\r
+    canvas.dom.onHide = function() {\r
+       manager.scrollbarPosition = canvas.dom.find('#rng-module-documentCanvas-contentWrapper').scrollTop();\r
+    }\r
+};\r
+    \r
+Manager.prototype.selectNode = function(wlxmlNode, options) {\r
+        options = options || {};\r
+        var nodeElement = this.getNodeElement(wlxmlNode)\r
+        \r
+        this.dimNode(wlxmlNode);\r
+        \r
+        this.canvas.dom.find('.rng-module-documentCanvas-currentNode').removeClass('rng-module-documentCanvas-currentNode');\r
+        nodeElement.addClass('rng-module-documentCanvas-currentNode');\r
+         \r
+        if(options.movecaret) {\r
+            this.movecaretToNode(nodeElement);\r
+        }\r
+        \r
+        this.currentNode = wlxmlNode;\r
+        this.sandbox.publish('nodeSelected', wlxmlNode);\r
+};\r
+\r
+Manager.prototype.getNodeElement = function(wlxmlNode) {\r
+    return this.canvas.dom.find('#'+wlxmlNode.id);\r
+};\r
+\r
+Manager.prototype.highlightNode = function(wlxmlNode) {\r
+    var nodeElement = this.getNodeElement(wlxmlNode);\r
+    if(!this.gridToggled) {\r
+        nodeElement.addClass('rng-common-hoveredNode');\r
+        var label = nodeElement.attr('wlxml-tag');\r
+        if(nodeElement.attr('wlxml-class'))\r
+            label += ' / ' + nodeElement.attr('wlxml-class');\r
+        var tag = $('<div>').addClass('rng-module-documentCanvas-hoveredNodeTag').text(label);\r
+        nodeElement.append(tag);\r
+    }\r
+};\r
+\r
+Manager.prototype.dimNode = function(wlxmlNode) {\r
+    var nodeElement = this.getNodeElement(wlxmlNode);\r
+    if(!this.gridToggled) {\r
+        nodeElement.removeClass('rng-common-hoveredNode');\r
+        nodeElement.find('.rng-module-documentCanvas-hoveredNodeTag').remove();\r
+    }\r
+};\r
+\r
+Manager.prototype.selectFirstNode = function() {\r
+    var firstNodeWithText = this.canvas.dom.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.canvas.dom.find('[wlxml-class|="p"]')\r
+    }\r
+    this.selectNode(new wlxmlNode.Node(node), {movecaret: true});\r
+};\r
+\r
+Manager.prototype.movecaretToNode = function(nodeElement) {\r
+    var range = document.createRange();\r
+    range.selectNodeContents(nodeElement[0]);\r
+    range.collapse(false);\r
+    var selection = document.getSelection();\r
+    selection.removeAllRanges()\r
+    selection.addRange(range);\r
+};\r
+\r
+Manager.prototype.toggleGrid =  function(toggle) {\r
+    this.canvas.dom.find('[wlxml-tag]').toggleClass('rng-common-hoveredNode', toggle);\r
+    this.gridToggled = toggle;\r
+};\r
+\r
+return Manager;\r
+    \r
+});
\ No newline at end of file

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index 1577be0..6030703 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -4,89 +4,21 @@ define([
 'libs/underscore-min',\r
 './transformations', \r
 './wlxmlNode',\r
-'libs/text!./template.html'], function(_, transformations, wlxmlNode, template) {\r
+'./canvas',\r
+'./canvasManager',\r
+'libs/text!./template.html'], function(_, transformations, wlxmlNode, Canvas, CanvasManager, template) {\r
 \r
 'use strict';\r
 \r
 return function(sandbox) {\r
 \r
-    var view = {\r
-        node: $(_.template(template)()),\r
-        currentNode: null,\r
-        shownAlready: false,\r
-        scrollbarPosition: 0,\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 = new Canvas.Canvas();\r
+    \r
+    var manager = new CanvasManager(canvas, sandbox);\r
+    \r
 \r
-            this.node.on('mouseover', '[wlxml-tag]', function(e) {\r
-                e.stopPropagation();\r
-                sandbox.publish('nodeHovered', new wlxmlNode.Node($(e.target)));\r
-            });\r
-            this.node.on('mouseout', '[wlxml-tag]', function(e) {\r
-                e.stopPropagation();\r
-                sandbox.publish('nodeBlured', new wlxmlNode.Node($(e.target)));\r
-            });\r
-            this.node.on('click', '[wlxml-tag]', function(e) {\r
-                e.stopPropagation();\r
-                console.log('clicked node type: '+e.target.nodeType);\r
-                view.selectNode(new wlxmlNode.Node($(e.target)));\r
-            });\r
+    var view = {\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.selectNode(new wlxmlNode.Node(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
-                if(e.which === 8) {\r
-                    var anchor = window.getSelection().anchorNode;\r
-                    var len = anchor.length;\r
-                    console.log(len);\r
-                    if(len === 1) {\r
-                        e.preventDefault();\r
-                        $(anchor).parent().text('');\r
-                    }\r
-                }\r
-            });\r
-                      \r
-            this.node.onShow = function() {\r
-                if(!view.shownAlready) {\r
-                    view.shownAlready = true;\r
-                    view.selectFirstNode();\r
-                } else if(view.currentNode) {\r
-                    view.movecaretToNode(view.getNodeElement(view.currentNode));\r
-                    view.node.find('#rng-module-documentCanvas-contentWrapper').scrollTop(view.scrollbarPosition);\r
-                }\r
-            };\r
-            this.node.onHide = function() {\r
-                view.scrollbarPosition = view.node.find('#rng-module-documentCanvas-contentWrapper').scrollTop();\r
-            }\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
-            toret.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
-            return toret;\r
-        },\r
         insertNewNode: function(wlxmlTag, wlxmlClass) {\r
             //TODO: Insert inline\r
             var anchor = $(window.getSelection().anchorNode);\r
@@ -167,116 +99,48 @@ return function(sandbox) {
                 //isDirty = true;\r
                 sandbox.publish('contentChanged');\r
             }\r
-        },\r
-        setBody: function(HTMLTree) {\r
-            this.node.find('#rng-module-documentCanvas-content').html(HTMLTree);\r
-        },\r
-        getBody: function() {\r
-            return this.node.find('#rng-module-documentCanvas-content').html();\r
-        }, \r
-        selectNode: function(wlxmlNode, options) {\r
-            options = options || {};\r
-            var nodeElement = this.getNodeElement(wlxmlNode)\r
-            \r
-            this.dimNode(wlxmlNode);\r
-            \r
-            this.node.find('.rng-module-documentCanvas-currentNode').removeClass('rng-module-documentCanvas-currentNode');\r
-            nodeElement.addClass('rng-module-documentCanvas-currentNode');\r
-             \r
-            if(options.movecaret) {\r
-                this.movecaretToNode(nodeElement);\r
-            }\r
-            \r
-            this.currentNode = wlxmlNode;\r
-            sandbox.publish('nodeSelected', wlxmlNode);\r
-        },\r
-        highlightNode: function(wlxmlNode) {\r
-            var nodeElement = this.getNodeElement(wlxmlNode);\r
-            if(!this.gridToggled) {\r
-                nodeElement.addClass('rng-common-hoveredNode');\r
-                var label = nodeElement.attr('wlxml-tag');\r
-                if(nodeElement.attr('wlxml-class'))\r
-                    label += ' / ' + nodeElement.attr('wlxml-class');\r
-                var tag = $('<div>').addClass('rng-module-documentCanvas-hoveredNodeTag').text(label);\r
-                nodeElement.append(tag);\r
-            }\r
-        },\r
-        dimNode: function(wlxmlNode) {\r
-            var nodeElement = this.getNodeElement(wlxmlNode);\r
-            if(!this.gridToggled) {\r
-                nodeElement.removeClass('rng-common-hoveredNode');\r
-                nodeElement.find('.rng-module-documentCanvas-hoveredNodeTag').remove();\r
-            }\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(new wlxmlNode.Node(node), {movecaret: true});\r
-        },\r
-        toggleGrid: function(toggle) {\r
-            this.node.find('[wlxml-tag]').toggleClass('rng-common-hoveredNode', toggle);\r
-            this.gridToggled = toggle;\r
-        },\r
-        getNodeElement: function(wlxmlNode) {\r
-            return this.node.find('#'+wlxmlNode.id);\r
-        },\r
-        movecaretToNode: function(nodeElement) {\r
-            var range = document.createRange();\r
-            range.selectNodeContents(nodeElement[0]);\r
-            range.collapse(false);\r
-            var selection = document.getSelection();\r
-            selection.removeAllRanges()\r
-            selection.addRange(range);\r
         }\r
+\r
     };\r
     \r
-    view.setup();\r
 \r
     /* public api */\r
     return {\r
         start: function() { sandbox.publish('ready'); },\r
         getView: function() { \r
-            return view.node;\r
+            return canvas.dom;\r
         },\r
         setDocument: function(xml) {\r
-            var transformed = transformations.fromXML.getDocumentDescription(xml);\r
-            view.setBody(transformed.HTMLTree);\r
+            canvas.setXML(xml);\r
             sandbox.publish('documentSet');\r
         },\r
         getDocument: function() {\r
-            return transformations.toXML.getXML(view.getBody());\r
+            return canvas.toXML();\r
         },\r
         modifyCurrentNode: function(attr, value) {\r
-            if(view.currentNode) {\r
-                view.getNodeElement(view.currentNode).attr('wlxml-'+attr, value);\r
+            if(manager.currentNode) {\r
+                manager.getNodeElement(manager.currentNode).attr('wlxml-'+attr, value);\r
                 sandbox.publish('contentChanged');\r
             }\r
         },\r
         highlightNode: function(wlxmlNode) {\r
-            view.highlightNode(wlxmlNode);\r
+            manager.highlightNode(wlxmlNode);\r
         },\r
         dimNode: function(wlxmlNode) {\r
-            view.dimNode(wlxmlNode);\r
+            manager.dimNode(wlxmlNode);\r
         },\r
         selectNode: function(wlxmlNode) {\r
-            if(!wlxmlNode.is(view.currentNode))\r
-                view.selectNode(wlxmlNode, {movecaret: true});\r
+            if(!wlxmlNode.is(manager.currentNode))\r
+                manager.selectNode(wlxmlNode, {movecaret: true});\r
         },\r
         toggleGrid: function(toggle) {\r
-            view.toggleGrid(toggle);\r
+            manager.toggleGrid(toggle);\r
         },\r
         insertNewNode: function(wlxmlTag, wlxmlClass) {\r
-            view.insertNewNode(wlxmlTag, wlxmlClass);\r
+            manager.insertNewNode(wlxmlTag, wlxmlClass);\r
         },\r
         wrapSelectionWithNewNode: function(wlxmlTag, wlxmlClass) {\r
-            view.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);\r
+            manager.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);\r
         }\r
     }\r
     \r