fnp / fnpeditor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
canvas api: fixing unwrapContents
[fnpeditor.git] / modules / documentCanvas / canvas / canvas.js
diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 8472688..51af41b 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -3,8 +3,9 @@ define([
 'libs/underscore-min',
 'libs/backbone-min',
 'modules/documentCanvas/canvas/documentElement',
 'libs/underscore-min',
 'libs/backbone-min',
 'modules/documentCanvas/canvas/documentElement',
+'modules/documentCanvas/canvas/keyboard',
 'modules/documentCanvas/canvas/utils'
 'modules/documentCanvas/canvas/utils'
-], function($, _, Backbone, documentElement, utils) {
+], function($, _, Backbone, documentElement, keyboard, utils) {
     
 'use strict';
 
     
 'use strict';
 
@@ -37,13 +38,14 @@ $.extend(Canvas.prototype, {
                         others[attr.name] = attr.value;
                 }
 
                         others[attr.name] = attr.value;
                 }
 
-                var element = documentElement.DocumentNodeElement.create({
+                var element = canvas.createNodeElement({
                     tag: currentTag.prop('tagName').toLowerCase(),
                     klass: currentTag.attr('class'),
                     meta: meta,
                     others: others,
                     tag: currentTag.prop('tagName').toLowerCase(),
                     klass: currentTag.attr('class'),
                     meta: meta,
                     others: others,
-                    rawChildren: currentTag.contents()
-                }, canvas);
+                    rawChildren: currentTag.contents(),
+                    prepopulateOnEmpty: true
+                });
 
                 ['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) {
                     element.data(attr, '');
 
                 ['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) {
                     element.data(attr, '');
@@ -71,7 +73,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';
 
                         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) {
                         return true; // continue
 
                     var addInfo = function(toAdd, where) {
@@ -140,171 +142,9 @@ $.extend(Canvas.prototype, {
             
             this.d = this.wrapper.children(0);
 
             
             this.d = this.wrapper.children(0);
 
-            var KEYS = {
-                ENTER: 13,
-                ARROW_LEFT: 37,
-                ARROW_UP: 38,
-                ARROW_RIGHT: 39,
-                ARROW_DOWN: 40,
-                BACKSPACE: 8,
-                DELETE: 46,
-                X: 88
-            }
-
-            this.wrapper.on('keyup', function(e) {
-                if(e.which >= 37 && e.which <= 40) {
-                    var element = canvas.getCursor().getPosition().element,
-                        caretTo = false;
-                    if(!element) {
-                        // Chrome hack
-                        var direction;
-                        if(e.which === KEYS.ARROW_LEFT  || e.which === KEYS.ARROW_UP) {
-                            direction = 'above';
-                            caretTo = 'end';
-                        } else {
-                            direction = 'below';
-                            caretTo = 'start';
-                        }
-                        element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]:visible', direction, window.getSelection().focusNode));
-                    }
-                    canvas.setCurrentElement(element, {caretTo: caretTo});
-                }
-            });
-         
-            this.wrapper.on('keydown', function(e) {
-                var cursor = canvas.getCursor(),
-                    position = canvas.getCursor().getPosition(),
-                    element = position.element;
-                if(e.which >= 37 && e.which <= 40) {
-
-                    if(element && (element instanceof documentElement.DocumentTextElement)) {
-                        if(element.isEmpty()) {
-                            var direction, caretTo;
-                            if(e.which === KEYS.ARROW_LEFT  || e.which === KEYS.ARROW_UP) {
-                                direction = 'above';
-                                caretTo = 'end';
-                            } else {
-                                direction = 'below';
-                                caretTo = 'start';
-                            }
-                            var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, window.getSelection().focusNode))
-                            canvas.setCurrentElement(element, {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) {
-                                e.preventDefault();
-                                canvas._moveCaretToTextElement(element, position.offset-2);
-                            }
-                            if(e.which === KEYS.ARROW_RIGHT && position.offset < txt.length - 1 && txt.charAt(position.offset+1) === utils.unicode.ZWS) {
-                                e.preventDefault();
-                                canvas._moveCaretToTextElement(element, position.offset+2);
-                            }
-                        }
-                    }
-
-
-                }
-
-                var selectsWholeTextElement = function() {
-                    if(cursor.isSelecting() && cursor.getSelectionStart().offsetAtBeginning && cursor.getSelectionEnd().offsetAtEnd)
-                        return true;
-                    return false;
-                }
-
-                if(e.which === KEYS.X && e.ctrlKey && selectsWholeTextElement()) {
-                    e.preventDefault();
-                }
-
-                if(e.which === KEYS.BACKSPACE || e.which === KEYS.DELETE) {
-                    if(cursor.isSelecting() && !cursor.isSelectingWithinElement()) {
-                        e.preventDefault();
-                        return;
-                    }
-                        
-                    var cursorAtOperationEdge = position.offsetAtBeginning;
-                    if(e.which === KEYS.DELETE) {
-                        cursorAtOperationEdge = position.offsetAtEnd;
-                    }
-
-                    if(element.getText().length === 1 || selectsWholeTextElement()) {
-                        e.preventDefault();
-                        element.setText('');
-                    }
-                    else if(element.isEmpty()) {
-
-                        var direction = 'above',
-                            caretTo = 'end';
-                            
-                        if(e.which === KEYS.DELETE) {
-                            direction = 'below';
-                            caretTo = 'start';
-                        }
-
-                        e.preventDefault();
-
-                        var parent = element.parent(),
-                            grandParent = parent ? parent.parent() : null,
-                            goto;
-                        if(parent.children().length === 1 && parent.children()[0].sameNode(element)) {
-                            if(grandParent && grandParent.children().length === 1) {
-                                goto = grandParent.append({text: ''});
-                            } else {
-                                goto = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom()[0]));
-                            }
-                            parent.detach();
-                        } else {
-                            goto = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom()[0]));
-                            element.detach();
-                        }
-                        canvas.setCurrentElement(goto, {caretTo: caretTo});
-                    }
-                    else if(cursorAtOperationEdge) {
-                        // todo
-                        e.preventDefault();
-                    }
-                }
-
-                if(e.which === KEYS.ENTER) {
-                    e.preventDefault();
-                    var cursor = canvas.getCursor(),
-                        position = cursor.getPosition(),
-                        element = position.element;
-
-                    if(!cursor.isSelecting()) {
-                        if(e.ctrlKey) {
-                            var added = element.after({tag: 'block'});
-                            added.append({text:''});
-                            canvas.setCurrentElement(added, {caretTo: 'start'});
-
-                        } else {
-
-                            if(!(element.parent().parent())) {
-                                return false; // top level element is unsplittable
-                            }
-
-                            var elements = position.element.split({offset: position.offset}),
-                                newEmpty,
-                                goto,
-                                gotoOptions;
-
-                            if(position.offsetAtBeginning)
-                                newEmpty = elements.first;
-                            else if(position.offsetAtEnd)
-                                newEmpty = elements.second;
-                            
-                            if(newEmpty) {
-                                goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this));
-                                gotoOptions = {};
-                            } else {
-                                goto = elements.second;
-                                gotoOptions = {caretTo: 'start'};
-                            }
-
-                            canvas.setCurrentElement(goto, gotoOptions);
-                        }
-                    }
-                }
-            });
+            this.wrapper.on('keyup keydown keypress', function(e) {
+                keyboard.handleKey(e, this);
+            }.bind(this));
 
             this.wrapper.on('click', '[document-node-element], [document-text-element]', function(e) {
                 e.stopPropagation();
 
             this.wrapper.on('click', '[document-node-element], [document-text-element]', function(e) {
                 e.stopPropagation();
@@ -314,8 +154,14 @@ $.extend(Canvas.prototype, {
             var observer = new MutationObserver(function(mutations) {
                 mutations.forEach(function(mutation) {
                     if(documentElement.DocumentTextElement.isContentContainer(mutation.target)) {
             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;
                         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');
                     }
                 });
                         canvas.publisher('contentChanged');
                     }
                 });
@@ -345,8 +191,7 @@ $.extend(Canvas.prototype, {
 
             this.eventBus.on('elementToggled', function(toggle, element) {
                 if(!toggle) {
 
             this.eventBus.on('elementToggled', function(toggle, element) {
                 if(!toggle) {
-                    element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]:visible', 'above', element.dom()[0]));
-                    canvas.setCurrentElement(element);
+                    canvas.setCurrentElement(element.getPreviousTextElement());
                 }
             })
 
                 }
             })
 
@@ -365,6 +210,10 @@ $.extend(Canvas.prototype, {
         return documentElement.DocumentNodeElement.fromHTMLElement(this.d.get(0), this); //{wlxmlTag: this.d.prop('tagName')};
     },
 
         return documentElement.DocumentNodeElement.fromHTMLElement(this.d.get(0), this); //{wlxmlTag: this.d.prop('tagName')};
     },
 
+    createNodeElement: function(params) {
+        return documentElement.DocumentNodeElement.create(params, this);
+    },
+
     wrapText: function(params) {
         params = _.extend({textNodeIdx: 0}, params);
         if(typeof params.textNodeIdx === 'number')
     wrapText: function(params) {
         params = _.extend({textNodeIdx: 0}, params);
         if(typeof params.textNodeIdx === 'number')
@@ -382,7 +231,7 @@ $.extend(Canvas.prototype, {
             suffixOutside = textNode2.getText().substr(params.offsetEnd)
         ;
         
             suffixOutside = textNode2.getText().substr(params.offsetEnd)
         ;
         
-        var wrapperElement = documentElement.DocumentNodeElement.create({tag: params._with.tag, klass: params._with.klass});
+        var wrapperElement = this.createNodeElement({tag: params._with.tag, klass: params._with.klass});
         textNode1.after(wrapperElement);
         textNode1.detach();
         
         textNode1.after(wrapperElement);
         textNode1.detach();
         
@@ -412,7 +261,7 @@ $.extend(Canvas.prototype, {
 
         var parent = params.element1.parent(),
             parentChildren = parent.children(),
 
         var parent = params.element1.parent(),
             parentChildren = parent.children(),
-            wrapper = documentElement.DocumentNodeElement.create({
+            wrapper = this.createNodeElement({
                 tag: params._with.tag,
                 klass: params._with.klass}),
             idx1 = parent.childIndex(params.element1),
                 tag: params._with.tag,
                 klass: params._with.klass}),
             idx1 = parent.childIndex(params.element1),
@@ -571,7 +420,8 @@ $.extend(Canvas.prototype.list, {
         if(!(params.element1.parent().sameNode(params.element2.parent())))
             return false;
             
         if(!(params.element1.parent().sameNode(params.element2.parent())))
             return false;
             
-        var parent = params.element1.parent();
+        var parent = params.element1.parent(),
+            canvas = params.element1.canvas;
         
         if(parent.childIndex(params.element1) > parent.childIndex(params.element2)) {
             var tmp = params.element1;
         
         if(parent.childIndex(params.element1) > parent.childIndex(params.element2)) {
             var tmp = params.element1;
@@ -582,7 +432,6 @@ $.extend(Canvas.prototype.list, {
         var elementsToWrap = [];
         
         var place = 'before';
         var elementsToWrap = [];
         
         var place = 'before';
-        var canvas = this;
         parent.children().some(function(element) {
             var _e = element;
             if(element.sameNode(params.element1))
         parent.children().some(function(element) {
             var _e = element;
             if(element.sameNode(params.element1))
@@ -600,8 +449,7 @@ $.extend(Canvas.prototype.list, {
                 return true;
         });
         
                 return true;
         });
         
-        var listElement = documentElement.DocumentNodeElement.create({tag: 'div', klass: 'list-items' + (params.type === 'enum' ? '-enum' : '')});
-        
+        var listElement = canvas.createNodeElement({tag: 'div', klass: 'list-items' + (params.type === 'enum' ? '-enum' : '')});
         var toret;
         if(parent.is('list')) {
             var item = listElement.wrapWithNodeElement({tag: 'div', klass: 'item'});
         var toret;
         if(parent.is('list')) {
             var item = listElement.wrapWithNodeElement({tag: 'div', klass: 'item'});
@@ -631,6 +479,7 @@ $.extend(Canvas.prototype.list, {
             succeedingItems = [],
             items = list.children(),
             listIsNested = list.parent().getWlxmlClass() === 'item',
             succeedingItems = [],
             items = list.children(),
             listIsNested = list.parent().getWlxmlClass() === 'item',
+            canvas = params.element1.canvas,
             i;
 
         if(idx1 > idx2) {
             i;
 
         if(idx1 > idx2) {
@@ -672,7 +521,7 @@ $.extend(Canvas.prototype.list, {
                     item.setWlxmlClass(null);
                 reference = item;
             });
                     item.setWlxmlClass(null);
                 reference = item;
             });
-            var secondList = documentElement.DocumentNodeElement.create({tag: 'div', klass:'list-items'}, this),
+            var secondList = canvas.createNodeElement({tag: 'div', klass:'list-items'}),
                 toAdd = secondList;
             
             if(listIsNested) {
                 toAdd = secondList;
             
             if(listIsNested) {
@@ -733,40 +582,23 @@ $.extend(Cursor.prototype, {
             anchorElement = this.canvas.getDocumentElement(selection.anchorNode),
             focusElement = this.canvas.getDocumentElement(selection.focusNode);
         
             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,
         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,
             };
         }
         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 +611,30 @@ $.extend(Cursor.prototype, {
             if(anchorFirst) {
                 if(which === 'start') {
                     element = anchorElement;
             if(anchorFirst) {
                 if(which === 'start') {
                     element = anchorElement;
-                    offset = getOffset('anchor')
+                    offset = selection.anchorOffset
                 }
                 else if(which === 'end') {
                     element = focusElement,
                 }
                 else if(which === 'end') {
                     element = focusElement,
-                    offset = getOffset('focus')
+                    offset = selection.focusOffset
                 }
             } else {
                 if(which === 'start') {
                     element = focusElement,
                 }
             } else {
                 if(which === 'start') {
                     element = focusElement,
-                    offset = getOffset('focus')
+                    offset = selection.focusOffset
                 }
                 else if(which === 'end') {
                     element = anchorElement;
                 }
                 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;
                 }
             }
         } 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;
             } else {
                 element = focusElement;
-                offset = getOffset('focus')
+                offset = selection.focusOffset
             }
         }
 
             }
         }