Changing Zero Width Space handling strategy

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

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 8472688..7428e10 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -42,7 +42,8 @@ $.extend(Canvas.prototype, {
                     klass: currentTag.attr('class'),
                     meta: meta,
                     others: others,
-                    rawChildren: currentTag.contents()
+                    rawChildren: currentTag.contents(),
+                    prepopulateOnEmpty: true
                 }, canvas);
 
                 ['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) {
@@ -71,7 +72,7 @@ $.extend(Canvas.prototype, {
                         hasSpanBefore = el.prev().length > 0  && getNode($(el.prev()[0])).attr('wlxml-tag') === 'span',
                         hasSpanAfter = el.next().length > 0 && getNode($(el.next()[0])).attr('wlxml-tag') === 'span';
 
-                    if(el.parent().hasClass('canvas-widget'))
+                    if(el.parent().hasClass('canvas-widget') || elParent.attr('document-text-element') !== undefined)
                         return true; // continue
 
                     var addInfo = function(toAdd, where) {
@@ -187,8 +188,8 @@ $.extend(Canvas.prototype, {
                                 direction = 'below';
                                 caretTo = 'start';
                             }
-                            var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, window.getSelection().focusNode))
-                            canvas.setCurrentElement(element, {caretTo: caretTo});
+                            var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom()[0]));
+                            canvas.setCurrentElement(el, {caretTo: caretTo});
                         } else {
                             var txt = element.dom().contents()[0].data;
                             if(e.which === KEYS.ARROW_LEFT && position.offset > 1 && txt.charAt(position.offset-2) === utils.unicode.ZWS) {
@@ -226,7 +227,11 @@ $.extend(Canvas.prototype, {
                         cursorAtOperationEdge = position.offsetAtEnd;
                     }
 
-                    if(element.getText().length === 1 || selectsWholeTextElement()) {
+                    var willDeleteWholeText = function() {
+                        return element.getText().length === 1 || selectsWholeTextElement();
+                    }
+
+                    if(willDeleteWholeText()) {
                         e.preventDefault();
                         element.setText('');
                     }
@@ -257,6 +262,7 @@ $.extend(Canvas.prototype, {
                             element.detach();
                         }
                         canvas.setCurrentElement(goto, {caretTo: caretTo});
+                        canvas.publisher('contentChanged');
                     }
                     else if(cursorAtOperationEdge) {
                         // todo
@@ -314,8 +320,14 @@ $.extend(Canvas.prototype, {
             var observer = new MutationObserver(function(mutations) {
                 mutations.forEach(function(mutation) {
                     if(documentElement.DocumentTextElement.isContentContainer(mutation.target)) {
+                        observer.disconnect();
                         if(mutation.target.data === '')
                             mutation.target.data = utils.unicode.ZWS;
+                        else if(mutation.oldValue === utils.unicode.ZWS) {
+                            mutation.target.data = mutation.target.data.replace(utils.unicode.ZWS, '');
+                            canvas._moveCaretToTextElement(canvas.getDocumentElement(mutation.target), 'end');
+                        }
+                        observer.observe(canvas.d[0], config);
                         canvas.publisher('contentChanged');
                     }
                 });
@@ -733,40 +745,23 @@ $.extend(Cursor.prototype, {
             anchorElement = this.canvas.getDocumentElement(selection.anchorNode),
             focusElement = this.canvas.getDocumentElement(selection.focusNode);
         
-        var getOffset = function(where) {
-            var toret, node;
-            if(where === 'anchor') {
-                node = selection.anchorNode;
-                toret = selection.anchorOffset;
-            } else {
-                node = selection.focusNode;
-                toret = selection.focusOffset;
-            }
-                        
-            if(toret === 1 && node.data.charAt(0) === utils.unicode.ZWS)
-                toret = 0;
-            else if((toret === node.data.length - 1) && (node.data.charAt(node.data.length - 1) === utils.unicode.ZWS))
-                toret++;
-            return toret;
-        }
-
         if((!anchorElement) || (anchorElement instanceof documentElement.DocumentNodeElement) || (!focusElement) || focusElement instanceof documentElement.DocumentNodeElement)
             return {};
 
         if(which === 'anchor') {
             return {
                 element: anchorElement,
-                offset: getOffset('anchor'),
-                offsetAtBeginning: getOffset('anchor') === 0,
-                offsetAtEnd: selection.anchorNode.data.length === getOffset('anchor')
+                offset: selection.anchorOffset,
+                offsetAtBeginning: selection.anchorOffset === 0,
+                offsetAtEnd: selection.anchorNode.data.length === selection.anchorOffset
             };
         }
         if(which === 'focus') {
             return {
                 element: focusElement,
-                offset: getOffset('focus'),
-                offsetAtBeginning: getOffset('focus') === 0,
-                offsetAtEnd: selection.focusNode.data.length === getOffset('focus')
+                offset: selection.focusOffset,
+                offsetAtBeginning: selection.focusOffset === 0,
+                offsetAtEnd: selection.focusNode.data.length === selection.focusOffset
             };
         }
         
@@ -779,30 +774,30 @@ $.extend(Cursor.prototype, {
             if(anchorFirst) {
                 if(which === 'start') {
                     element = anchorElement;
-                    offset = getOffset('anchor')
+                    offset = selection.anchorOffset
                 }
                 else if(which === 'end') {
                     element = focusElement,
-                    offset = getOffset('focus')
+                    offset = selection.focusOffset
                 }
             } else {
                 if(which === 'start') {
                     element = focusElement,
-                    offset = getOffset('focus')
+                    offset = selection.focusOffset
                 }
                 else if(which === 'end') {
                     element = anchorElement;
-                    offset = getOffset('anchor')
+                    offset = selection.anchorOffset
                 }
             }
         } else {
             // TODO: Handle order via https://developer.mozilla.org/en-US/docs/Web/API/Node.compareDocumentPosition
             if(which === 'start') {
                 element = anchorElement;
-                offset = getOffset('anchor')
+                offset = selection.anchorOffset
             } else {
                 element = focusElement;
-                offset = getOffset('focus')
+                offset = selection.focusOffset
             }
         }