fnp / fnpeditor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
smartxml: attaching previous parent of a moved node to nodeMoved event
[fnpeditor.git] / src / editor / modules / documentCanvas / canvas / canvas.js
diff --git a/src/editor/modules/documentCanvas/canvas/canvas.js b/src/editor/modules/documentCanvas/canvas/canvas.js
index d8db2bc..f8e9927 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/canvas.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.js
@@ -4,200 +4,178 @@ define([
 'libs/backbone',
 'modules/documentCanvas/canvas/documentElement',
 'modules/documentCanvas/canvas/keyboard',
 'libs/backbone',
 'modules/documentCanvas/canvas/documentElement',
 'modules/documentCanvas/canvas/keyboard',
-'modules/documentCanvas/canvas/utils'
-], function($, _, Backbone, documentElement, keyboard, utils) {
+'modules/documentCanvas/canvas/utils',
+'modules/documentCanvas/canvas/wlxmlListener'
+], function($, _, Backbone, documentElement, keyboard, utils, wlxmlListener) {
     
 'use strict';
     
 'use strict';
+/* global document:false, window:false, Node:false */
+
+
+var TextHandler = function(canvas) {this.canvas = canvas; this.buffer = null;};
+$.extend(TextHandler.prototype, {
+    handle: function(node, text) {
+        this.setText(text, node);
+        // return;
+        // if(!this.node) {
+        //     this.node = node;
+        // }
+        // if(this.node.sameNode(node)) {
+        //     this._ping(text);
+        // } else {
+        //     this.flush();
+        //     this.node = node;
+        //     this._ping(text);
+        // }
+    },
+    _ping: _.throttle(function(text) {
+        this.buffer = text;
+        this.flush();
+    }, 1000),
+    flush: function() {
+        if(this.buffer !== null) {
+            this.setText(this.buffer, this.node);
+            this.buffer = null;
+        }
+    },
+    setText: function(text, node) {
+        //this.canvas.wlxmlDocument.transform('setText', {node:node, text: text});
+        node.setText(text);
+
+    }
 
 
-var Canvas = function(wlxml, publisher) {
+});
+
+
+var Canvas = function(wlxmlDocument, publisher) {
     this.eventBus = _.extend({}, Backbone.Events);
     this.eventBus = _.extend({}, Backbone.Events);
-    this.loadWlxml(wlxml);
+    this.wrapper = $('<div>').addClass('canvas-wrapper').attr('contenteditable', true);
+    this.wlxmlListener = wlxmlListener.create(this);
+    this.loadWlxmlDocument(wlxmlDocument);
+    this.setupEventHandling();
     this.publisher = publisher ? publisher : function() {};
     this.publisher = publisher ? publisher : function() {};
+    this.textHandler = new TextHandler(this);
 };
 
 $.extend(Canvas.prototype, {
 
 };
 
 $.extend(Canvas.prototype, {
 
-    loadWlxml: function(wlxml) {
-        var d = wlxml ? $($.trim(wlxml)) : null;
-        if(d) {
-            this.wrapper = $('<div>').addClass('canvas-wrapper').attr('contenteditable', true);
-            this.wrapper.append(d);
-            var canvas = this;
-
-            this.wrapper.find('*').replaceWith(function() {
-                var currentTag = $(this);
-                if(currentTag.attr('wlxml-tag'))
-                    return;
-
-                var meta = {}, others = {};
-                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;
-                    else if(attr.name !== 'class')
-                        others[attr.name] = attr.value;
-                }
+    loadWlxmlDocument: function(wlxmlDocument) {
+        if(!wlxmlDocument) {
+            return false;
+        }
 
 
-                var element = canvas.createNodeElement({
-                    tag: currentTag.prop('tagName').toLowerCase(),
-                    klass: currentTag.attr('class'),
-                    meta: meta,
-                    others: others,
-                    rawChildren: currentTag.contents(),
-                    prepopulateOnEmpty: true
-                });
-
-                ['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) {
-                    element.data(attr, '');
-                });
-                return element.dom();
-            });
+        this.wlxmlListener.listenTo(wlxmlDocument);
+        this.wlxmlDocument = wlxmlDocument;
+        this.reloadRoot();
+    },
 
 
-            var FIRST_CONTENT_INDEX = 0;
+    reloadRoot: function() {
+        var canvasDOM = this.generateCanvasDOM(this.wlxmlDocument.root);
+        //var canvasDOM = this.wlxmlDocument.root.getData('canvasElement') ? this.wlxmlDocument.root.getData('canvasElement').dom() : this.generateCanvasDOM(this.wlxmlDocument.root);
 
 
-            // @@ TODO - refactor!
-            var getNode = function(element) {
-                return element.children('[document-element-content]');
-            }
+        this.wrapper.empty();
+        this.wrapper.append(canvasDOM);
+        this.d = this.wrapper.children(0);
+    },
 
 
-            this.wrapper.find(':not(iframe)').addBack().contents()
-                .filter(function() {return this.nodeType === Node.TEXT_NODE})
-                .each(function() {
-
-                    // TODO: use DocumentElement API
-
-                    var el = $(this),
-                        text = {original: el.text(), trimmed: $.trim(el.text())},
-                        elParent = el.parent(),
-                        hasSpanParent = elParent.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') || elParent.attr('document-text-element') !== undefined)
-                        return true; // continue
-
-                    var addInfo = function(toAdd, where) {
-                        var parentContents = elParent.contents(),
-                            idx = parentContents.index(el[0]),
-                            prev = idx > FIRST_CONTENT_INDEX ? parentContents[idx-1] : null,
-                            next = idx < parentContents.length - 1 ? parentContents[idx+1] : null,
-                            target, key;
-
-                        if(where === 'above') {
-                            target = prev ? $(prev) : elParent.parent();
-                            key = prev ? 'orig-after' : 'orig-begin';
-                        } else if(where === 'below') {
-                            target = next ? $(next) : elParent.parent();
-                            key = next ? 'orig-before' : 'orig-end';
-                        } else { throw new Object;}
-
-                        target.data(key, toAdd);
-                    }
+    generateCanvasDOM: function(wlxmlNode) {
+        var element = documentElement.DocumentNodeElement.create(wlxmlNode, this);
+        return element.dom();
+    },
 
 
-                    text.transformed = text.trimmed;
-                    
-                    if(hasSpanParent || hasSpanBefore || hasSpanAfter) {
-                        var startSpace = /\s/g.test(text.original.substr(0,1)),
-                            endSpace = /\s/g.test(text.original.substr(-1)) && text.original.length > 1;
-                        text.transformed = (startSpace && (hasSpanParent || hasSpanBefore) ? ' ' : '')
-                                    + text.trimmed
-                                    + (endSpace && (hasSpanParent || hasSpanAfter) ? ' ' : '');
-                    } else {
-                        if(text.trimmed.length === 0 && text.original.length > 0 && elParent.contents().length === 1)
-                            text.transformed = ' ';
-                    }
+    setupEventHandling: function() {
+        var canvas = this;
+        this.wrapper.on('keyup keydown keypress', function(e) {
+            keyboard.handleKey(e, this);
+        }.bind(this));
 
 
-                    if(!text.transformed) {
-                        addInfo(text.original, 'below');
-                        el.remove();
-                        return true; // continue
-                    }
+        this.wrapper.on('click', '[document-node-element], [document-text-element]', function(e) {
+            e.stopPropagation();
+            canvas.setCurrentElement(canvas.getDocumentElement(e.currentTarget), {caretTo: false});
+        });
 
 
-                    if(text.transformed !== text.original) {
-                        if(!text.trimmed) {
-                            addInfo(text.original, 'below');
-                        } else {
-                            var startingMatch = text.original.match(/^\s+/g),
-                                endingMatch = text.original.match(/\s+$/g),
-                                startingWhiteSpace = startingMatch ? startingMatch[0] : null,
-                                endingWhiteSpace = endingMatch ? endingMatch[0] : null;
-
-                            if(endingWhiteSpace) {
-                                if(text.transformed[text.transformed.length - 1] === ' ' && endingWhiteSpace[0] === ' ')
-                                    endingWhiteSpace = endingWhiteSpace.substr(1);
-                                addInfo(endingWhiteSpace, 'below');
-                            }
-
-                            if(startingWhiteSpace) {
-                                if(text.transformed[0] === ' ' && startingWhiteSpace[startingWhiteSpace.length-1] === ' ')
-                                    startingWhiteSpace = startingWhiteSpace.substr(0, startingWhiteSpace.length -1);
-                                addInfo(startingWhiteSpace, 'above');
-                            }
-                        }
-                    }
+        this.wrapper.on('paste', function(e) {
+            e.preventDefault();
 
 
-                    var element = documentElement.DocumentTextElement.create({text: text.transformed});
-                    el.replaceWith(element.dom());
-                });
+            var clipboardData = e.originalEvent.clipboardData;
+            if(!clipboardData || !clipboardData.getData) {
+                return; // TODO: alert
+            }
+
+            var text = clipboardData.getData('text/plain').replace(/\r?\n|\r/g, ' '),
+                cursor = canvas.getCursor(),
+                element = cursor.getPosition().element,
+                lhs, rhs;
             
             
-            this.d = this.wrapper.children(0);
+            if(element && cursor.isWithinElement()) {
+                lhs = element.getText().substr(0, cursor.getSelectionStart().offset);
+                rhs = element.getText().substr(cursor.getSelectionEnd().offset);
+                element.setText(lhs+text+rhs);
+                canvas.setCurrentElement(element, {caretTo: lhs.length + text.length});
+            } else {
+                /* jshint noempty:false */
+                // TODO: alert
+            }
+        });
 
 
-            this.wrapper.on('keyup keydown keypress', function(e) {
-                keyboard.handleKey(e, this);
-            }.bind(this));
+        /* globals MutationObserver */
+        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.wrapper[0], config);
+                    canvas.publisher('contentChanged');
 
 
-            this.wrapper.on('click', '[document-node-element], [document-text-element]', function(e) {
-                e.stopPropagation();
-                canvas.setCurrentElement(canvas.getDocumentElement(e.currentTarget), {caretTo: false});
-            });
+                    var textElement = canvas.getDocumentElement(mutation.target),
+                        toSet = mutation.target.data !== utils.unicode.ZWS ? mutation.target.data : '';
 
 
-            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');
+                    //textElement.data('wlxmlNode').setText(toSet);
+                    //textElement.data('wlxmlNode').document.transform('setText', {node: textElement.data('wlxmlNode'), text: toSet});
+                    if(textElement.data('wlxmlNode').getText() !== toSet) {
+                        canvas.textHandler.handle(textElement.data('wlxmlNode'), toSet);
                     }
                     }
-                });
-            });
-            var config = { attributes: false, childList: false, characterData: true, subtree: true, characterDataOldValue: true};
-            observer.observe(this.d[0], config);
-
-
-            this.wrapper.on('mouseover', '[document-node-element], [document-text-element]', function(e) {
-                var el = canvas.getDocumentElement(e.currentTarget);
-                if(!el)
-                    return;
-                e.stopPropagation();
-                if(el instanceof documentElement.DocumentTextElement)
-                    el = el.parent();
-                el.toggleLabel(true);
-            });
-            this.wrapper.on('mouseout', '[document-node-element], [document-text-element]', function(e) {
-                var el = canvas.getDocumentElement(e.currentTarget);
-                if(!el)
-                    return;
-                e.stopPropagation();
-                if(el instanceof documentElement.DocumentTextElement)
-                    el = el.parent();
-                el.toggleLabel(false);
+                }
             });
             });
+        });
+        var config = { attributes: false, childList: false, characterData: true, subtree: true, characterDataOldValue: true};
+        observer.observe(this.wrapper[0], config);
 
 
-            this.eventBus.on('elementToggled', function(toggle, element) {
-                if(!toggle) {
-                    canvas.setCurrentElement(element.getPreviousTextElement());
-                }
-            })
 
 
-        } else {
-            this.d = null;
-        }
+        this.wrapper.on('mouseover', '[document-node-element], [document-text-element]', function(e) {
+            var el = canvas.getDocumentElement(e.currentTarget);
+            if(!el) {
+                return;
+            }
+            e.stopPropagation();
+            if(el instanceof documentElement.DocumentTextElement) {
+                el = el.parent();
+            }
+            el.toggleLabel(true);
+        });
+        this.wrapper.on('mouseout', '[document-node-element], [document-text-element]', function(e) {
+            var el = canvas.getDocumentElement(e.currentTarget);
+            if(!el) {
+                return;
+            }
+            e.stopPropagation();
+            if(el instanceof documentElement.DocumentTextElement) {
+                el = el.parent();
+            }
+            el.toggleLabel(false);
+        });
+
+        this.eventBus.on('elementToggled', function(toggle, element) {
+            if(!toggle) {
+                canvas.setCurrentElement(element.getPreviousTextElement());
+            }
+        });
     },
 
     view: function() {
     },
 
     view: function() {
@@ -205,109 +183,23 @@ $.extend(Canvas.prototype, {
     },
 
     doc: function() {
     },
 
     doc: function() {
-        if(this.d === null)
+        if(this.d === null) {
             return null;
             return null;
-        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')
-            params.textNodeIdx = [params.textNodeIdx];
-        
-        var childrenInside = params.inside.children(),
-            idx1 = Math.min.apply(Math, params.textNodeIdx),
-            idx2 = Math.max.apply(Math, params.textNodeIdx),
-            textNode1 = childrenInside[idx1],
-            textNode2 = childrenInside[idx2],
-            sameNode = textNode1.sameNode(textNode2),
-            prefixOutside = textNode1.getText().substr(0, params.offsetStart),
-            prefixInside = textNode1.getText().substr(params.offsetStart),
-            suffixInside = textNode2.getText().substr(0, params.offsetEnd),
-            suffixOutside = textNode2.getText().substr(params.offsetEnd)
-        ;
-        
-        var wrapperElement = this.createNodeElement({tag: params._with.tag, klass: params._with.klass});
-        textNode1.after(wrapperElement);
-        textNode1.detach();
-        
-        if(prefixOutside.length > 0)
-            wrapperElement.before({text:prefixOutside});
-        if(sameNode) {
-            var core = textNode1.getText().substr(params.offsetStart, params.offsetEnd - params.offsetStart);
-            wrapperElement.append({text: core});
-        } else {
-            textNode2.detach();
-            if(prefixInside.length > 0)
-                wrapperElement.append({text: prefixInside});
-            for(var i = idx1 + 1; i < idx2; i++) {
-                wrapperElement.append(childrenInside[i]);
-            }
-            if(suffixInside.length > 0)
-                wrapperElement.append({text: suffixInside});
         }
         }
-        if(suffixOutside.length > 0)
-            wrapperElement.after({text: suffixOutside});
-        return wrapperElement;
+        return documentElement.DocumentNodeElement.fromHTMLElement(this.d.get(0), this); //{wlxmlTag: this.d.prop('tagName')};
     },
 
     },
 
-    wrapElements: function(params) {
-        if(!(params.element1.parent().sameNode(params.element2.parent())))
-            return;
-
-        var parent = params.element1.parent(),
-            parentChildren = parent.children(),
-            wrapper = this.createNodeElement({
-                tag: params._with.tag,
-                klass: params._with.klass}),
-            idx1 = parent.childIndex(params.element1),
-            idx2 = parent.childIndex(params.element2);
-
-        if(idx1 > idx2) {
-            var tmp = idx1;
-            idx1 = idx2;
-            idx2 = tmp;
-        }
-
-        var insertingMethod, insertingTarget;
-        if(idx1 === 0) {
-            insertingMethod = 'prepend';
-            insertingTarget = parent;
-        } else {
-            insertingMethod = 'after';
-            insertingTarget = parentChildren[idx1-1];
-        }
-
-        for(var i = idx1; i <= idx2; i++) {
-            wrapper.append(parentChildren[i].detach());
-        }
-
-        insertingTarget[insertingMethod](wrapper);
-        return wrapper;
+    toggleElementHighlight: function(node, toggle) {
+        var element = utils.findCanvasElement(node);
+        element.toggleHighlight(toggle);
     },
 
     },
 
-    getSiblingParents: function(params) {
-        var parents1 = [params.element1].concat(params.element1.parents()).reverse(),
-            parents2 = [params.element2].concat(params.element2.parents()).reverse(),
-            noSiblingParents = null;
-
-        if(parents1.length === 0 || parents2.length === 0 || !(parents1[0].sameNode(parents2[0])))
-            return noSiblingParents;
-
-        var i;
-        for(i = 0; i < Math.min(parents1.length, parents2.length); i++) {
-            if(parents1[i].sameNode(parents2[i]))
-                continue;
-            break;
-        }
-        return {element1: parents1[i], element2: parents2[i]};
+    createNodeElement: function(params) {
+        return documentElement.DocumentNodeElement.create(params, this);
     },
 
     getDocumentElement: function(from) {
     },
 
     getDocumentElement: function(from) {
+        /* globals HTMLElement, Text */
         if(from instanceof HTMLElement || from instanceof Text) {
            return documentElement.DocumentElement.fromHTMLElement(from, this);
         }
         if(from instanceof HTMLElement || from instanceof Text) {
            return documentElement.DocumentElement.fromHTMLElement(from, this);
         }
@@ -316,8 +208,6 @@ $.extend(Canvas.prototype, {
         return new Cursor(this);
     },
 
         return new Cursor(this);
     },
 
-    list: {},
-
     
     getCurrentNodeElement: function() {
         return this.getDocumentElement(this.wrapper.find('.current-node-element').parent()[0]);
     
     getCurrentNodeElement: function() {
         return this.getDocumentElement(this.wrapper.find('.current-node-element').parent()[0]);
@@ -330,15 +220,21 @@ $.extend(Canvas.prototype, {
 
 
     setCurrentElement: function(element, params) {
 
 
     setCurrentElement: function(element, params) {
+        if(!(element instanceof documentElement.DocumentElement)) {
+            element = utils.findCanvasElement(element);
+        }
+
         params = _.extend({caretTo: 'end'}, params);
         var findFirstDirectTextChild = function(e, nodeToLand) {
             var byBrowser = this.getCursor().getPosition().element;
         params = _.extend({caretTo: 'end'}, params);
         var findFirstDirectTextChild = function(e, nodeToLand) {
             var byBrowser = this.getCursor().getPosition().element;
-            if(byBrowser && byBrowser.parent().sameNode(nodeToLand))
+            if(byBrowser && byBrowser.parent().sameNode(nodeToLand)) {
                 return byBrowser;
                 return byBrowser;
+            }
             var children = e.children();
             for(var i = 0; i < children.length; i++) {
             var children = e.children();
             for(var i = 0; i < children.length; i++) {
-                if(children[i] instanceof documentElement.DocumentTextElement)
+                if(children[i] instanceof documentElement.DocumentTextElement) {
                     return children[i];
                     return children[i];
+                }
             }
             return null;
         }.bind(this);
             }
             return null;
         }.bind(this);
@@ -347,7 +243,7 @@ $.extend(Canvas.prototype, {
                 this.wrapper.find('.current-text-element').removeClass('current-text-element');
                 element.dom().addClass('current-text-element');
             } else {
                 this.wrapper.find('.current-text-element').removeClass('current-text-element');
                 element.dom().addClass('current-text-element');
             } else {
-                this.wrapper.find('.current-node-element').removeClass('current-node-element')
+                this.wrapper.find('.current-node-element').removeClass('current-node-element');
                 element._container().addClass('current-node-element');
                 this.publisher('currentElementChanged', element);
             }
                 element._container().addClass('current-node-element');
                 this.publisher('currentElementChanged', element);
             }
@@ -360,15 +256,18 @@ $.extend(Canvas.prototype, {
             currentTextElement = this.getCurrentTextElement(),
             currentNodeElement = this.getCurrentNodeElement();
 
             currentTextElement = this.getCurrentTextElement(),
             currentNodeElement = this.getCurrentNodeElement();
 
-        if(currentTextElement && !(currentTextElement.sameNode(textElementToLand)))
+        if(currentTextElement && !(currentTextElement.sameNode(textElementToLand))) {
             this.wrapper.find('.current-text-element').removeClass('current-text-element');
             this.wrapper.find('.current-text-element').removeClass('current-text-element');
+        }
 
         if(textElementToLand) {
             _markAsCurrent(textElementToLand);
 
         if(textElementToLand) {
             _markAsCurrent(textElementToLand);
-            if(params.caretTo || !textElementToLand.sameNode(this.getCursor().getPosition().element))
+            if(params.caretTo || !textElementToLand.sameNode(this.getCursor().getPosition().element)) {
                 this._moveCaretToTextElement(textElementToLand, params.caretTo); // as method on element?
                 this._moveCaretToTextElement(textElementToLand, params.caretTo); // as method on element?
-            if(!(textElementToLand.sameNode(currentTextElement)))
-                this.publisher('currentTextElementSet', textElementToLand);
+            }
+            if(!(textElementToLand.sameNode(currentTextElement))) {
+                this.publisher('currentTextElementSet', textElementToLand.data('wlxmlNode'));
+            }
         } else {
             document.getSelection().removeAllRanges();
         }
         } else {
             document.getSelection().removeAllRanges();
         }
@@ -376,7 +275,7 @@ $.extend(Canvas.prototype, {
         if(!(currentNodeElement && currentNodeElement.sameNode(nodeElementToLand))) {
             _markAsCurrent(nodeElementToLand);
 
         if(!(currentNodeElement && currentNodeElement.sameNode(nodeElementToLand))) {
             _markAsCurrent(nodeElementToLand);
 
-            this.publisher('currentNodeElementSet', nodeElementToLand);
+            this.publisher('currentNodeElementSet', nodeElementToLand.data('wlxmlNode'));
         }
     },
 
         }
     },
 
@@ -391,8 +290,9 @@ $.extend(Canvas.prototype, {
         }
         
         var collapseArg = true;
         }
         
         var collapseArg = true;
-        if(where === 'end')
+        if(where === 'end') {
             collapseArg = false;
             collapseArg = false;
+        }
         range.collapse(collapseArg);
         
         var selection = document.getSelection();
         range.collapse(collapseArg);
         
         var selection = document.getSelection();
@@ -403,146 +303,9 @@ $.extend(Canvas.prototype, {
     },
 
     setCursorPosition: function(position) {
     },
 
     setCursorPosition: function(position) {
-        if(position.element)
+        if(position.element) {
             this._moveCaretToTextElement(position.element, position.offset);
             this._moveCaretToTextElement(position.element, position.offset);
-    },
-
-    toXML: function() {
-        var parent = $('<div>'),
-            parts = this.doc().toXML(0);
-        parent.append(parts);
-        return parent.html();
-    }
-});
-
-$.extend(Canvas.prototype.list, {
-    create: function(params) {
-        if(!(params.element1.parent().sameNode(params.element2.parent())))
-            return false;
-            
-        var parent = params.element1.parent(),
-            canvas = params.element1.canvas;
-        
-        if(parent.childIndex(params.element1) > parent.childIndex(params.element2)) {
-            var tmp = params.element1;
-            params.element1 = params.element2;
-            params.element2 = tmp;
         }
         }
-        
-        var elementsToWrap = [];
-        
-        var place = 'before';
-        parent.children().some(function(element) {
-            var _e = element;
-            if(element.sameNode(params.element1))
-                place = 'inside';
-            if(place === 'inside') {
-                if(element instanceof documentElement.DocumentTextElement) {
-                    element = element.wrapWithNodeElement({tag: 'div', klass: 'list.item'});
-                    if(element.children()[0].sameNode(params.element1))
-                        params.element1 = element;
-                }
-                element.setWlxmlClass('item');
-                elementsToWrap.push(element);
-            }
-            if(_e.sameNode(params.element2))
-                return true;
-        });
-        
-        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'});
-            item.exec('toggleBullet', false);
-            toret = listElement.parent();
-        } else {
-            toret = listElement;
-        }  
-        
-        params.element1.before(toret);
-        
-        elementsToWrap.forEach(function(element) {
-            element.detach();
-            listElement.append(element);
-        });
-    },
-    extractItems: function(params) {
-        params = _.extend({merge: true}, params);
-        var list = params.element1.parent();
-        if(!list.is('list') || !(list.sameNode(params.element2.parent())))
-            return false;
-
-        var idx1 = list.childIndex(params.element1),
-            idx2 = list.childIndex(params.element2),
-            precedingItems = [],
-            extractedItems = [],
-            succeedingItems = [],
-            items = list.children(),
-            listIsNested = list.parent().getWlxmlClass() === 'item',
-            canvas = params.element1.canvas,
-            i;
-
-        if(idx1 > idx2) {
-            var tmp = idx1; idx1 = idx2; idx2 = tmp;
-        }
-
-        items.forEach(function(item, idx) {
-            if(idx < idx1)
-                precedingItems.push(item);
-            else if(idx >= idx1 && idx <= idx2) {
-                extractedItems.push(item);
-            }
-            else {
-                succeedingItems.push(item);
-            }
-        });
-
-        var reference = listIsNested ? list.parent() : list;
-        if(succeedingItems.length === 0) {
-            var reference_orig = reference;
-            extractedItems.forEach(function(item) {
-                reference.after(item);
-                reference = item;
-                if(!listIsNested)
-                    item.setWlxmlClass(null);
-            });
-            if(precedingItems.length === 0)
-                reference_orig.detach();
-        } else if(precedingItems.length === 0) {
-            extractedItems.forEach(function(item) {
-                reference.before(item);
-                if(!listIsNested)
-                    item.setWlxmlClass(null);
-            });
-        } else {
-            extractedItems.forEach(function(item) {
-                reference.after(item);
-                if(!listIsNested)
-                    item.setWlxmlClass(null);
-                reference = item;
-            });
-            var secondList = canvas.createNodeElement({tag: 'div', klass:'list-items'}),
-                toAdd = secondList;
-            
-            if(listIsNested) {
-                toAdd = secondList.wrapWithNodeElement({tag: 'div', klass:'item'});
-            }
-            succeedingItems.forEach(function(item) {
-                secondList.append(item);
-            });
-
-            reference.after(toAdd);
-        }
-        if(!params.merge && listIsNested) {
-            return this.extractItems({element1: extractedItems[0], element2: extractedItems[extractedItems.length-1]});
-        }
-        return true;
-    },
-    areItemsOfTheSameList: function(params) {
-        var e1 = params.element1,
-            e2 = params.element2;
-        return e1.parent().sameNode(e2.parent())
-            && e1.parent().is('list');
     }
 });
 
     }
 });
 
@@ -559,6 +322,9 @@ $.extend(Cursor.prototype, {
     isSelectingWithinElement: function() {
         return this.isSelecting() && this.getSelectionStart().element.sameNode(this.getSelectionEnd().element);
     },
     isSelectingWithinElement: function() {
         return this.isSelecting() && this.getSelectionStart().element.sameNode(this.getSelectionEnd().element);
     },
+    isWithinElement: function() {
+        return !this.isSelecting() || this.isSelectingWithinElement();
+    },
     isSelectingSiblings: function() {
         return this.isSelecting() && this.getSelectionStart().element.parent().sameNode(this.getSelectionEnd().element.parent());
     },
     isSelectingSiblings: function() {
         return this.isSelecting() && this.getSelectionStart().element.parent().sameNode(this.getSelectionEnd().element.parent());
     },
@@ -578,79 +344,85 @@ $.extend(Cursor.prototype, {
         return this.getSelectionBoundry('focus');
     },
     getSelectionBoundry: function(which) {
         return this.getSelectionBoundry('focus');
     },
     getSelectionBoundry: function(which) {
+        /* globals window */
         var selection = window.getSelection(),
             anchorElement = this.canvas.getDocumentElement(selection.anchorNode),
             focusElement = this.canvas.getDocumentElement(selection.focusNode);
         
         var selection = window.getSelection(),
             anchorElement = this.canvas.getDocumentElement(selection.anchorNode),
             focusElement = this.canvas.getDocumentElement(selection.focusNode);
         
-        if((!anchorElement) || (anchorElement instanceof documentElement.DocumentNodeElement) || (!focusElement) || focusElement instanceof documentElement.DocumentNodeElement)
+        if((!anchorElement) || (anchorElement instanceof documentElement.DocumentNodeElement) || (!focusElement) || focusElement instanceof documentElement.DocumentNodeElement) {
             return {};
             return {};
+        }
 
         if(which === 'anchor') {
             return {
                 element: anchorElement,
                 offset: selection.anchorOffset,
 
         if(which === 'anchor') {
             return {
                 element: anchorElement,
                 offset: selection.anchorOffset,
-                offsetAtBeginning: selection.anchorOffset === 0,
-                offsetAtEnd: selection.anchorNode.data.length === selection.anchorOffset
+                offsetAtBeginning: selection.anchorOffset === 0 || anchorElement.getText() === '',
+                offsetAtEnd: selection.anchorNode.data.length === selection.anchorOffset || anchorElement.getText() === ''
             };
         }
         if(which === 'focus') {
             return {
                 element: focusElement,
                 offset: selection.focusOffset,
             };
         }
         if(which === 'focus') {
             return {
                 element: focusElement,
                 offset: selection.focusOffset,
-                offsetAtBeginning: selection.focusOffset === 0,
-                offsetAtEnd: selection.focusNode.data.length === selection.focusOffset
+                offsetAtBeginning: selection.focusOffset === 0 || focusElement.getText() === '',
+                offsetAtEnd: selection.focusNode.data.length === selection.focusOffset || focusElement.getText() === '',
             };
         }
         
             };
         }
         
-        var element,
-            offset;
-
-        if(anchorElement.parent().sameNode(focusElement.parent())) {
-            var parent = anchorElement.parent(),
-                anchorFirst = parent.childIndex(anchorElement) < parent.childIndex(focusElement);
+        var getPlaceData = function(anchorFirst) {
+            var element, offset;
             if(anchorFirst) {
                 if(which === 'start') {
                     element = anchorElement;
             if(anchorFirst) {
                 if(which === 'start') {
                     element = anchorElement;
-                    offset = selection.anchorOffset
+                    offset = selection.anchorOffset;
                 }
                 else if(which === 'end') {
                 }
                 else if(which === 'end') {
-                    element = focusElement,
-                    offset = selection.focusOffset
+                    element = focusElement;
+                    offset = selection.focusOffset;
                 }
             } else {
                 if(which === 'start') {
                 }
             } else {
                 if(which === 'start') {
-                    element = focusElement,
-                    offset = selection.focusOffset
+                    element = focusElement;
+                    offset = selection.focusOffset;
                 }
                 else if(which === 'end') {
                     element = anchorElement;
                 }
                 else if(which === 'end') {
                     element = anchorElement;
-                    offset = selection.anchorOffset
+                    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 = selection.anchorOffset
+            return {element: element, offset: offset};
+        };
+
+        var anchorFirst, placeData, parent;
+
+        if(anchorElement.parent().sameNode(focusElement.parent())) {
+            parent = anchorElement.parent();
+            if(selection.anchorNode === selection.focusNode) {
+                anchorFirst = selection.anchorOffset <= selection.focusOffset;
             } else {
             } else {
-                element = focusElement;
-                offset = selection.focusOffset
+                anchorFirst = parent.childIndex(anchorElement) < parent.childIndex(focusElement);
             }
             }
+            placeData = getPlaceData(anchorFirst);
+        } else {
+            /*jshint bitwise: false*/
+            anchorFirst = selection.anchorNode.compareDocumentPosition(selection.focusNode) & Node.DOCUMENT_POSITION_FOLLOWING;
+            placeData = getPlaceData(anchorFirst);
         }
 
         }
 
-        var nodeLen = (element.sameNode(focusElement) ? selection.focusNode : selection.anchorNode).length;
+        var nodeLen = (placeData.element.sameNode(focusElement) ? selection.focusNode : selection.anchorNode).length;
         return {
         return {
-            element: element,
-            offset: offset,
-            offsetAtBeginning: offset === 0,
-            offsetAtEnd: nodeLen === offset
-        }
+            element: placeData.element,
+            offset: placeData.offset,
+            offsetAtBeginning: placeData.offset === 0 || focusElement.getText() === '',
+            offsetAtEnd: nodeLen === placeData.offset || focusElement.getText() === ''
+        };
     }
     }
-})
+});
 
 return {
 
 return {
-    fromXML: function(xml, publisher) {
-        return new Canvas(xml, publisher);
+    fromXMLDocument: function(wlxmlDocument, publisher) {
+        return new Canvas(wlxmlDocument, publisher);
     }
 };
 
     }
 };