Reacting to wlxml class change in helper modules properly

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

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 76eddb1..a5d4825 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -23,9 +23,18 @@ $.extend(Canvas.prototype, {
                 var currentTag = $(this);
                 if(currentTag.attr('wlxml-tag'))
                     return;
+
+                var meta = {};
+                for(var i = 0; i < this.attributes.length; i++) {
+                    var attr = this.attributes[i];
+                    if(attr.name.substr(0, 5) === 'meta-')
+                        meta[attr.name.substr(5)] = attr.value;
+                }
+
                 var element = documentElement.DocumentNodeElement.createDOM({
                     tag: currentTag.prop('tagName').toLowerCase(),
-                    klass: currentTag.attr('class')
+                    klass: currentTag.attr('class'),
+                    meta: meta
                 });
 
                 element.append(currentTag.contents());
@@ -74,8 +83,19 @@ $.extend(Canvas.prototype, {
                     e.preventDefault();
                     var cursor = canvas.getCursor();
                     if(!cursor.isSelecting()) {
-                        var position = cursor.getPosition();
-                        position.element.split({offset: position.offset});
+                        var position = cursor.getPosition(),
+                            elements = position.element.split({offset: position.offset}),
+                            newEmpty,
+                            goto;
+
+                        if(position.offsetAtBeginning)
+                            newEmpty = elements.first;
+                        else if(position.offsetAtEnd)
+                            newEmpty = elements.second;
+                        if(newEmpty) {
+                            goto = newEmpty.append(documentElement.DocumentTextElement.create({text: '\u200B'}, this));
+                            canvas.setCurrentElement(goto);
+                        }
                     }
                 }
             });
@@ -179,14 +199,17 @@ $.extend(Canvas.prototype, {
 
     setCurrentElement: function(element, params) {
         params = _.extend({caretTo: 'end'}, params);
-        var findFirstDirectTextChild = function(e) {
+        var findFirstDirectTextChild = function(e, nodeToLand) {
+            var byBrowser = this.getCursor().getPosition().element;
+            if(byBrowser && byBrowser.parent().sameNode(nodeToLand))
+                return byBrowser;
             var children = e.children();
             for(var i = 0; i < children.length; i++) {
                 if(children[i] instanceof documentElement.DocumentTextElement)
                     return children[i];
             }
             return null;
-        };
+        }.bind(this);
         var _markAsCurrent = function(element) {
             if(element instanceof documentElement.DocumentTextElement) {
                 this.wrapper.find('.current-text-element').removeClass('current-text-element');
@@ -200,8 +223,8 @@ $.extend(Canvas.prototype, {
 
 
         var isTextElement = element instanceof documentElement.DocumentTextElement,
-            textElementToLand = isTextElement ? element : findFirstDirectTextChild(element),
             nodeElementToLand = isTextElement ? element.parent() : element,
+            textElementToLand = isTextElement ? element : findFirstDirectTextChild(element, nodeElementToLand),
             currentTextElement = this.getCurrentTextElement(),
             currentNodeElement = this.getCurrentNodeElement();
 
@@ -213,13 +236,14 @@ $.extend(Canvas.prototype, {
             if(params.caretTo || !textElementToLand.sameNode(this.getCursor().getPosition().element))
                 this._moveCaretToTextElement(textElementToLand, params.caretTo); // as method on element?
             if(!(textElementToLand.sameNode(currentTextElement)))
-                this.publisher('currentTextElementSet', element);
+                this.publisher('currentTextElementSet', textElementToLand);
+        } else {
+            document.getSelection().removeAllRanges();
         }
 
         if(!(currentNodeElement && currentNodeElement.sameNode(nodeElementToLand))) {
             _markAsCurrent(nodeElementToLand);
-            if(!textElementToLand)
-                document.getSelection().removeAllRanges();
+
             this.publisher('currentNodeElementSet', nodeElementToLand);
         }
     },
@@ -415,10 +439,15 @@ $.extend(Cursor.prototype, {
             anchorElement = this.canvas.getDocumentElement(selection.anchorNode),
             focusElement = this.canvas.getDocumentElement(selection.focusNode);
         
+        if(anchorElement instanceof documentElement.DocumentNodeElement || focusElement instanceof documentElement.DocumentNodeElement)
+            return {};
+
         if(which === 'anchor') {
             return {
                 element: anchorElement,
-                offset: selection.anchorOffset
+                offset: selection.anchorOffset,
+                offsetAtBeginning: selection.anchorOffset === 0,
+                offsetAtEnd: anchorElement && anchorElement.getText().length === selection.anchorOffset
             };
         }
         
@@ -460,7 +489,9 @@ $.extend(Cursor.prototype, {
 
         return {
             element: element,
-            offset: offset
+            offset: offset,
+            offsetAtBeginning: offset === 0,
+            offsetAtEnd: element.getText().length === offset
         }
     }
 })