documentCanvas: fixing layout

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index e666f0d..1577be0 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -6,13 +6,15 @@ define([
 './wlxmlNode',\r
 'libs/text!./template.html'], function(_, transformations, wlxmlNode, template) {\r
 \r
 './wlxmlNode',\r
 'libs/text!./template.html'], function(_, transformations, wlxmlNode, template) {\r
 \r

-\r
+'use strict';\r

 \r
 return function(sandbox) {\r
 \r
     var view = {\r
         node: $(_.template(template)()),\r
         currentNode: null,\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
         setup: function() {\r
             var view = this;\r
 \r


@@ -32,7 +34,7 @@ return function(sandbox) {
             this.node.on('click', '[wlxml-tag]', function(e) {\r
                 e.stopPropagation();\r
                 console.log('clicked node type: '+e.target.nodeType);\r
             this.node.on('click', '[wlxml-tag]', function(e) {\r
                 e.stopPropagation();\r
                 console.log('clicked node type: '+e.target.nodeType);\r

-                view._markSelected($(e.target));\r
+                view.selectNode(new wlxmlNode.Node($(e.target)));\r

             });\r
 \r
             this.node.on('keyup', '#rng-module-documentCanvas-contentWrapper', function(e) {\r
             });\r
 \r
             this.node.on('keyup', '#rng-module-documentCanvas-contentWrapper', function(e) {\r


@@ -41,7 +43,7 @@ return function(sandbox) {
                     anchor = anchor.parent();\r
                 if(!anchor.is('[wlxml-tag]'))\r
                     return;\r
                     anchor = anchor.parent();\r
                 if(!anchor.is('[wlxml-tag]'))\r
                     return;\r

-                view._markSelected(anchor);\r
+                view.selectNode(new wlxmlNode.Node(anchor));\r

             });\r
             \r
             this.node.on('keydown', '#rng-module-documentCanvas-contentWrapper', function(e) {\r
             });\r
             \r
             this.node.on('keydown', '#rng-module-documentCanvas-contentWrapper', function(e) {\r


@@ -49,24 +51,30 @@ return function(sandbox) {
                     e.preventDefault();\r
                     view.insertNewNode(null, null);\r
                 }\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

-            \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
+                      \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
             this.gridToggled = false;\r
         },\r
         _createNode: function(wlxmlTag, wlxmlClass) {\r


@@ -76,20 +84,24 @@ return function(sandbox) {
             toret.attr('wlxml-tag', wlxmlTag);\r
             if(wlxmlClass)\r
                 toret.attr('wlxml-class', wlxmlClass);\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
             var anchorOffset = window.getSelection().anchorOffset;\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
+            var textLen;\r
+            if(anchor[0].nodeType === Node.TEXT_NODE) {\r
+                textLen = anchor.text().length;\r

                 anchor = anchor.parent();\r
                 anchor = anchor.parent();\r

+            }\r

             if(anchor.text() === '') {\r
                 var todel = anchor;\r
                 anchor = anchor.parent();\r
                 todel.remove();\r
             }\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(anchorOffset > 0 && anchorOffset < textLen) {\r

                 if(wlxmlTag === null && wlxmlClass === null) {\r
                     return this.splitWithNewNode(anchor);\r
                 }\r
                 if(wlxmlTag === null && wlxmlClass === null) {\r
                     return this.splitWithNewNode(anchor);\r
                 }\r


@@ -100,7 +112,7 @@ return function(sandbox) {
                 anchor.before(newNode)\r
             else\r
                 anchor.after(newNode);\r
                 anchor.before(newNode)\r
             else\r
                 anchor.after(newNode);\r

-            this.selectNode(newNode);\r
+            this.selectNode(new wlxmlNode.Node(newNode), {movecaret: true});\r

             //isDirty = true;\r
             sandbox.publish('contentChanged');\r
         },\r
             //isDirty = true;\r
             sandbox.publish('contentChanged');\r
         },\r


@@ -124,7 +136,7 @@ return function(sandbox) {
                 newNode.before(prefix);\r
                 newNode.after(suffix);\r
                 \r
                 newNode.before(prefix);\r
                 newNode.after(suffix);\r
                 \r

-                this.selectNode(newNode);\r
+                this.selectNode(new wlxmlNode.Node(newNode), {movecaret: true});\r

                 //isDirty = true;\r
                 sandbox.publish('contentChanged');\r
             }\r
                 //isDirty = true;\r
                 sandbox.publish('contentChanged');\r
             }\r


@@ -151,7 +163,7 @@ return function(sandbox) {
                 newNode.before(prefixNode);\r
                 newNode.after(suffixNode);\r
                 \r
                 newNode.before(prefixNode);\r
                 newNode.after(suffixNode);\r
                 \r

-                this.selectNode(newNode);\r
+                this.selectNode(new wlxmlNode.Node(newNode), {movecaret: true});\r

                 //isDirty = true;\r
                 sandbox.publish('contentChanged');\r
             }\r
                 //isDirty = true;\r
                 sandbox.publish('contentChanged');\r
             }\r


@@ -162,44 +174,38 @@ return function(sandbox) {
         getBody: function() {\r
             return this.node.find('#rng-module-documentCanvas-content').html();\r
         }, \r
         getBody: function() {\r
             return this.node.find('#rng-module-documentCanvas-content').html();\r
         }, \r

-        _markSelected: function(node) {\r
-            this.dimNode(node);\r
+        selectNode: function(wlxmlNode, options) {\r
+            options = options || {};\r
+            var nodeElement = this.getNodeElement(wlxmlNode)\r

             \r
             \r

-            this.node.find('.rng-module-documentCanvas-currentNode').removeClass('rng-module-documentCanvas-currentNode');\r
+            this.dimNode(wlxmlNode);\r

             \r
             \r

-            node.addClass('rng-module-documentCanvas-currentNode');\r
-\r
-            this.currentNode = node;\r
-            sandbox.publish('nodeSelected', new wlxmlNode.Node(node));\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
             \r

+            this.currentNode = wlxmlNode;\r
+            sandbox.publish('nodeSelected', wlxmlNode);\r

         },\r
         },\r

-        selectNode: function(node) {\r
-            node = this.getNodeElement(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
-        },\r
-        highlightNode: function(node) {\r
-            node = this.getNodeElement(node);\r
+        highlightNode: function(wlxmlNode) {\r
+            var nodeElement = this.getNodeElement(wlxmlNode);\r

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

-                node.addClass('rng-common-hoveredNode');\r
-                var label = node.attr('wlxml-tag');\r
-                if(node.attr('wlxml-class'))\r
-                    label += ' / ' + node.attr('wlxml-class');\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
                 var tag = $('<div>').addClass('rng-module-documentCanvas-hoveredNodeTag').text(label);\r

-                node.append(tag);\r
+                nodeElement.append(tag);\r

             }\r
         },\r
             }\r
         },\r

-        dimNode: function(node) {\r
-            node = this.getNodeElement(node);\r
+        dimNode: function(wlxmlNode) {\r
+            var nodeElement = this.getNodeElement(wlxmlNode);\r

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

-                node.removeClass('rng-common-hoveredNode');\r
-                node.find('.rng-module-documentCanvas-hoveredNodeTag').remove();\r
+                nodeElement.removeClass('rng-common-hoveredNode');\r
+                nodeElement.find('.rng-module-documentCanvas-hoveredNodeTag').remove();\r

             }\r
         },\r
         selectFirstNode: function() {\r
             }\r
         },\r
         selectFirstNode: function() {\r


@@ -212,7 +218,7 @@ return function(sandbox) {
             else {\r
                 node = this.node.find('[wlxml-class|="p"]')\r
             }\r
             else {\r
                 node = this.node.find('[wlxml-class|="p"]')\r
             }\r

-            this.selectNode(new wlxmlNode.Node(node));\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
         },\r
         toggleGrid: function(toggle) {\r
             this.node.find('[wlxml-tag]').toggleClass('rng-common-hoveredNode', toggle);\r


@@ -220,6 +226,14 @@ return function(sandbox) {
         },\r
         getNodeElement: function(wlxmlNode) {\r
             return this.node.find('#'+wlxmlNode.id);\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
     };\r
     \r


@@ -228,16 +242,22 @@ return function(sandbox) {
     /* public api */\r
     return {\r
         start: function() { sandbox.publish('ready'); },\r
     /* public api */\r
     return {\r
         start: function() { sandbox.publish('ready'); },\r

-        getView: function() { return view.node; },\r
+        getView: function() { \r
+            return view.node;\r
+        },\r

         setDocument: function(xml) {\r
             var transformed = transformations.fromXML.getDocumentDescription(xml);\r
             view.setBody(transformed.HTMLTree);\r
         setDocument: function(xml) {\r
             var transformed = transformations.fromXML.getDocumentDescription(xml);\r
             view.setBody(transformed.HTMLTree);\r

-            view.selectFirstNode();\r
-            //isDirty = false;\r
+            sandbox.publish('documentSet');\r
+        },\r
+        getDocument: function() {\r
+            return transformations.toXML.getXML(view.getBody());\r

         },\r
         modifyCurrentNode: function(attr, value) {\r
         },\r
         modifyCurrentNode: function(attr, value) {\r

-            if(view.currentNode)\r
-                view.currentNode.attr('wlxml-'+attr, value);\r
+            if(view.currentNode) {\r
+                view.getNodeElement(view.currentNode).attr('wlxml-'+attr, value);\r
+                sandbox.publish('contentChanged');\r
+            }\r

         },\r
         highlightNode: function(wlxmlNode) {\r
             view.highlightNode(wlxmlNode);\r
         },\r
         highlightNode: function(wlxmlNode) {\r
             view.highlightNode(wlxmlNode);\r


@@ -246,7 +266,8 @@ return function(sandbox) {
             view.dimNode(wlxmlNode);\r
         },\r
         selectNode: function(wlxmlNode) {\r
             view.dimNode(wlxmlNode);\r
         },\r
         selectNode: function(wlxmlNode) {\r

-            view.selectNode(wlxmlNode);\r
+            if(!wlxmlNode.is(view.currentNode))\r
+                view.selectNode(wlxmlNode, {movecaret: true});\r

         },\r
         toggleGrid: function(toggle) {\r
             view.toggleGrid(toggle);\r
         },\r
         toggleGrid: function(toggle) {\r
             view.toggleGrid(toggle);\r