documentCanvas: fixing layout

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index d8c199b..1577be0 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -14,6 +14,7 @@ return function(sandbox) {
         node: $(_.template(template)()),\r
         currentNode: null,\r
         shownAlready: false,\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


@@ -50,6 +51,15 @@ 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
             this.node.onShow = function() {\r
             });\r
                       \r
             this.node.onShow = function() {\r


@@ -57,9 +67,13 @@ return function(sandbox) {
                     view.shownAlready = true;\r
                     view.selectFirstNode();\r
                 } else if(view.currentNode) {\r
                     view.shownAlready = true;\r
                     view.selectFirstNode();\r
                 } else if(view.currentNode) {\r

-                    view.moveCarretToNode(view.getNodeElement(view.currentNode));\r
+                    view.movecaretToNode(view.getNodeElement(view.currentNode));\r
+                    view.node.find('#rng-module-documentCanvas-contentWrapper').scrollTop(view.scrollbarPosition);\r

                 }\r
             };\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
                       \r
             this.gridToggled = false;\r
         },\r


@@ -77,14 +91,17 @@ return function(sandbox) {
             //TODO: Insert inline\r
             var anchor = $(window.getSelection().anchorNode);\r
             var anchorOffset = window.getSelection().anchorOffset;\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


@@ -95,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(new wlxmlNode.Node(newNode), {moveCarret: true});\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


@@ -119,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(new wlxmlNode.Node(newNode), {moveCarret: true});\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


@@ -146,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(new wlxmlNode.Node(newNode), {moveCarret: true});\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


@@ -166,8 +183,8 @@ return function(sandbox) {
             this.node.find('.rng-module-documentCanvas-currentNode').removeClass('rng-module-documentCanvas-currentNode');\r
             nodeElement.addClass('rng-module-documentCanvas-currentNode');\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.moveCarret) {\r
-                this.moveCarretToNode(nodeElement);\r
+            if(options.movecaret) {\r
+                this.movecaretToNode(nodeElement);\r

             }\r
             \r
             this.currentNode = wlxmlNode;\r
             }\r
             \r
             this.currentNode = wlxmlNode;\r


@@ -201,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), {moveCarret: true});\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


@@ -210,7 +227,7 @@ return function(sandbox) {
         getNodeElement: function(wlxmlNode) {\r
             return this.node.find('#'+wlxmlNode.id);\r
         },\r
         getNodeElement: function(wlxmlNode) {\r
             return this.node.find('#'+wlxmlNode.id);\r
         },\r

-        moveCarretToNode: function(nodeElement) {\r
+        movecaretToNode: function(nodeElement) {\r

             var range = document.createRange();\r
             range.selectNodeContents(nodeElement[0]);\r
             range.collapse(false);\r
             var range = document.createRange();\r
             range.selectNodeContents(nodeElement[0]);\r
             range.collapse(false);\r


@@ -225,7 +242,9 @@ 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


@@ -248,7 +267,7 @@ return function(sandbox) {
         },\r
         selectNode: function(wlxmlNode) {\r
             if(!wlxmlNode.is(view.currentNode))\r
         },\r
         selectNode: function(wlxmlNode) {\r
             if(!wlxmlNode.is(view.currentNode))\r

-                view.selectNode(wlxmlNode, {moveCarret: true});\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