X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/95f83648504b6552ff3cbf956f55c6bf5f542a9b..4c81ad4075b0e8e67f984cce3494f9853179a9d6:/modules/documentCanvas/documentCanvas.js

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index 9d2e725..1577be0 100644
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -13,6 +13,8 @@ return function(sandbox) {
     var view = {
         node: $(_.template(template)()),
         currentNode: null,
+        shownAlready: false,
+        scrollbarPosition: 0,
         setup: function() {
             var view = this;
 
@@ -49,24 +51,30 @@ return function(sandbox) {
                     e.preventDefault();
                     view.insertNewNode(null, null);
                 }
+                if(e.which === 8) {
+                    var anchor = window.getSelection().anchorNode;
+                    var len = anchor.length;
+                    console.log(len);
+                    if(len === 1) {
+                        e.preventDefault();
+                        $(anchor).parent().text('');
+                    }
+                }
             });
-            
-            
-            var observer = new MutationObserver(function(mutations) {
-              mutations.forEach(function(mutation) {
-                _.each(mutation.addedNodes, function(node) {
-                    node = $(node);
-                    node.parent().find('[wlxml-tag]').each(function() {
-                        var tag = $(this);
-                        if(!tag.attr('id'))
-                            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);}));
-                    });
-                });
-              });    
-            });
-            var config = { attributes: true, childList: true, characterData: true, subtree: true };
-            observer.observe(this.node.find('#rng-module-documentCanvas-contentWrapper')[0], config);
-            
+                      
+            this.node.onShow = function() {
+                if(!view.shownAlready) {
+                    view.shownAlready = true;
+                    view.selectFirstNode();
+                } else if(view.currentNode) {
+                    view.movecaretToNode(view.getNodeElement(view.currentNode));
+                    view.node.find('#rng-module-documentCanvas-contentWrapper').scrollTop(view.scrollbarPosition);
+                }
+            };
+            this.node.onHide = function() {
+                view.scrollbarPosition = view.node.find('#rng-module-documentCanvas-contentWrapper').scrollTop();
+            }
+                      
             this.gridToggled = false;
         },
         _createNode: function(wlxmlTag, wlxmlClass) {
@@ -76,20 +84,24 @@ return function(sandbox) {
             toret.attr('wlxml-tag', wlxmlTag);
             if(wlxmlClass)
                 toret.attr('wlxml-class', wlxmlClass);
+            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);}));
             return toret;
         },
         insertNewNode: function(wlxmlTag, wlxmlClass) {
             //TODO: Insert inline
             var anchor = $(window.getSelection().anchorNode);
             var anchorOffset = window.getSelection().anchorOffset;
-            if(anchor[0].nodeType === Node.TEXT_NODE)
+            var textLen;
+            if(anchor[0].nodeType === Node.TEXT_NODE) {
+                textLen = anchor.text().length;
                 anchor = anchor.parent();
+            }
             if(anchor.text() === '') {
                 var todel = anchor;
                 anchor = anchor.parent();
                 todel.remove();
             }
-            if(anchorOffset > 0 && anchorOffset < anchor.text().length) {
+            if(anchorOffset > 0 && anchorOffset < textLen) {
                 if(wlxmlTag === null && wlxmlClass === null) {
                     return this.splitWithNewNode(anchor);
                 }
@@ -100,7 +112,7 @@ return function(sandbox) {
                 anchor.before(newNode)
             else
                 anchor.after(newNode);
-            this.selectNode(newNode);
+            this.selectNode(new wlxmlNode.Node(newNode), {movecaret: true});
             //isDirty = true;
             sandbox.publish('contentChanged');
         },
@@ -124,7 +136,7 @@ return function(sandbox) {
                 newNode.before(prefix);
                 newNode.after(suffix);
                 
-                this.selectNode(newNode);
+                this.selectNode(new wlxmlNode.Node(newNode), {movecaret: true});
                 //isDirty = true;
                 sandbox.publish('contentChanged');
             }
@@ -151,7 +163,7 @@ return function(sandbox) {
                 newNode.before(prefixNode);
                 newNode.after(suffixNode);
                 
-                this.selectNode(newNode);
+                this.selectNode(new wlxmlNode.Node(newNode), {movecaret: true});
                 //isDirty = true;
                 sandbox.publish('contentChanged');
             }
@@ -171,13 +183,8 @@ return function(sandbox) {
             this.node.find('.rng-module-documentCanvas-currentNode').removeClass('rng-module-documentCanvas-currentNode');
             nodeElement.addClass('rng-module-documentCanvas-currentNode');
              
-            if(options.moveCarret) {
-                var range = document.createRange();
-                range.selectNodeContents(nodeElement[0]);
-                range.collapse(false);
-                var selection = document.getSelection();
-                selection.removeAllRanges()
-                selection.addRange(range);
+            if(options.movecaret) {
+                this.movecaretToNode(nodeElement);
             }
             
             this.currentNode = wlxmlNode;
@@ -211,7 +218,7 @@ return function(sandbox) {
             else {
                 node = this.node.find('[wlxml-class|="p"]')
             }
-            this.selectNode(new wlxmlNode.Node(node));
+            this.selectNode(new wlxmlNode.Node(node), {movecaret: true});
         },
         toggleGrid: function(toggle) {
             this.node.find('[wlxml-tag]').toggleClass('rng-common-hoveredNode', toggle);
@@ -219,6 +226,14 @@ return function(sandbox) {
         },
         getNodeElement: function(wlxmlNode) {
             return this.node.find('#'+wlxmlNode.id);
+        },
+        movecaretToNode: function(nodeElement) {
+            var range = document.createRange();
+            range.selectNodeContents(nodeElement[0]);
+            range.collapse(false);
+            var selection = document.getSelection();
+            selection.removeAllRanges()
+            selection.addRange(range);
         }
     };
     
@@ -227,11 +242,12 @@ return function(sandbox) {
     /* public api */
     return {
         start: function() { sandbox.publish('ready'); },
-        getView: function() { return view.node; },
+        getView: function() { 
+            return view.node;
+        },
         setDocument: function(xml) {
             var transformed = transformations.fromXML.getDocumentDescription(xml);
             view.setBody(transformed.HTMLTree);
-            view.selectFirstNode();
             sandbox.publish('documentSet');
         },
         getDocument: function() {
@@ -251,7 +267,7 @@ return function(sandbox) {
         },
         selectNode: function(wlxmlNode) {
             if(!wlxmlNode.is(view.currentNode))
-                view.selectNode(wlxmlNode, {moveCarret: true});
+                view.selectNode(wlxmlNode, {movecaret: true});
         },
         toggleGrid: function(toggle) {
             view.toggleGrid(toggle);