Initial focus in dialogs

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index bd959fe..bb8ad4a 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -13,6 +13,8 @@ return function(sandbox) {
     var view = {\r
         node: $(_.template(template)()),\r
         currentNode: null,\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


@@ -50,6 +52,20 @@ return function(sandbox) {
                     view.insertNewNode(null, null);\r
                 }\r
             });\r
                     view.insertNewNode(null, null);\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
             this.gridToggled = false;\r
         },\r
         _createNode: function(wlxmlTag, wlxmlClass) {\r


@@ -84,7 +100,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


@@ -108,7 +124,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


@@ -135,7 +151,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


@@ -155,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
             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
             }\r
             \r
             this.currentNode = wlxmlNode;\r


@@ -195,7 +206,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


@@ -203,6 +214,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


@@ -211,11 +230,12 @@ 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

             sandbox.publish('documentSet');\r
         },\r
         getDocument: function() {\r
             sandbox.publish('documentSet');\r
         },\r
         getDocument: function() {\r


@@ -235,7 +255,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