testing wip - exposing chai.assert

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index 2c31ce0..bb8ad4a 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
+        scrollbarPosition: 0,\r
         setup: function() {\r
             var view = this;\r
 \r
@@ -56,8 +57,14 @@ return function(sandbox) {
                 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
@@ -93,7 +100,7 @@ return function(sandbox) {
                 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
@@ -117,7 +124,7 @@ return function(sandbox) {
                 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
@@ -144,7 +151,7 @@ return function(sandbox) {
                 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
@@ -164,13 +171,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
-            if(options.moveCarret) {\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
+            if(options.movecaret) {\r
+                this.movecaretToNode(nodeElement);\r
             }\r
             \r
             this.currentNode = wlxmlNode;\r
@@ -204,7 +206,7 @@ return function(sandbox) {
             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
@@ -212,6 +214,14 @@ return function(sandbox) {
         },\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
@@ -220,7 +230,9 @@ return function(sandbox) {
     /* 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
@@ -243,7 +255,7 @@ return function(sandbox) {
         },\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