Fixing typo in cursor.getSelectionBoundry

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

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index ba7daef..dd15d06 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -1,13 +1,15 @@
 define([
 'libs/jquery-1.9.1.min',
 'libs/underscore-min',
 define([
 'libs/jquery-1.9.1.min',
 'libs/underscore-min',

-'modules/documentCanvas/canvas/documentElement'
-], function($, _, documentElement) {
+'modules/documentCanvas/canvas/documentElement',
+'modules/documentCanvas/canvas/utils'
+], function($, _, documentElement, utils) {

     
 'use strict';
 
     
 'use strict';
 

-var Canvas = function(wlxml) {
+var Canvas = function(wlxml, publisher) {

     this.loadWlxml(wlxml);
     this.loadWlxml(wlxml);

+    this.publisher = publisher ? publisher : function() {};

 };
 
 $.extend(Canvas.prototype, {
 };
 
 $.extend(Canvas.prototype, {


@@ -15,59 +17,257 @@ $.extend(Canvas.prototype, {
     loadWlxml: function(wlxml) {
         var d = wlxml ? $($.trim(wlxml)) : null;
         if(d) {
     loadWlxml: function(wlxml) {
         var d = wlxml ? $($.trim(wlxml)) : null;
         if(d) {

-            var wrapper = $('<div>');
-            wrapper.append(d);
+            this.wrapper = $('<div>').addClass('canvas-wrapper').attr('contenteditable', true);
+            this.wrapper.append(d);

             
             

-            wrapper.find('*').replaceWith(function() {
+            this.wrapper.find('*').replaceWith(function() {

                 var currentTag = $(this);
                 if(currentTag.attr('wlxml-tag'))
                     return;
                 var currentTag = $(this);
                 if(currentTag.attr('wlxml-tag'))
                     return;

-                var toret = $('<div>').attr('wlxml-tag', currentTag.prop('tagName').toLowerCase());
-                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);}));
+
+                var meta = {}, others = {};

                 for(var i = 0; i < this.attributes.length; i++) {
                 for(var i = 0; i < this.attributes.length; i++) {

-                    var attr = this.attributes.item(i);
-                    var value = attr.name === 'class' ? attr.value.replace(/\./g, '-') : attr.value;
-                    toret.attr('wlxml-' + attr.name, value);
+                    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;

                 }
                 }

-                toret.append(currentTag.contents());
-                return toret;
+
+                var element = documentElement.DocumentNodeElement.create({
+                    tag: currentTag.prop('tagName').toLowerCase(),
+                    klass: currentTag.attr('class'),
+                    meta: meta,
+                    others: others,
+                    rawChildren: currentTag.contents()
+                });
+
+                ['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) {
+                    element.data(attr, '');
+                });
+                return element.dom();

             });
 
             });
 

-            wrapper.find(':not(iframe)').addBack().contents()
+            var FIRST_CONTENT_INDEX = 0;
+
+            // @@ TODO - refactor!
+            var getNode = function(element) {
+                return element.children('[document-element-content]');
+            }
+
+            this.wrapper.find(':not(iframe)').addBack().contents()

                 .filter(function() {return this.nodeType === Node.TEXT_NODE})
                 .each(function() {
 
                 .filter(function() {return this.nodeType === Node.TEXT_NODE})
                 .each(function() {
 

-                    var el = $(this);
-                    

                     // TODO: use DocumentElement API
                     // TODO: use DocumentElement API

-                    var spanParent = el.parent().attr('wlxml-tag') === 'span',
-                        spanBefore = el.prev().length > 0  && $(el.prev()[0]).attr('wlxml-tag') === 'span',
-                        spanAfter = el.next().length > 0 && $(el.next()[0]).attr('wlxml-tag') === 'span';
-                        
-                    if(spanParent || spanBefore || spanAfter) {
-                        var startSpace = /\s/g.test(this.data.substr(0,1));
-                        var endSpace = /\s/g.test(this.data.substr(-1)) && this.data.length > 1;
-                        var trimmed = $.trim(this.data);
-                        this.data = (startSpace && (spanParent || spanBefore) ? ' ' : '')
-                                    + trimmed
-                                    + (endSpace && (spanParent || spanAfter) ? ' ' : '');

 
 

+                    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'))
+                        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);
+                    }
+
+                    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 {
                     } else {

-                        this.data = $.trim(this.data);
+                        if(text.trimmed.length === 0 && text.original.length > 0 && elParent.contents().length === 1)
+                            text.transformed = ' ';
+                    }
+
+                    if(!text.transformed) {
+                        addInfo(text.original, 'below');
+                        el.remove();
+                        return true; // continue

                     }
                     }

+
+                    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');
+                            }
+                        }
+                    }
+
+                    var element = documentElement.DocumentTextElement.create({text: text.transformed});
+                    el.replaceWith(element.dom());

                 });
             
                 });
             

-            this.d = wrapper.children(0);
-            this.d.unwrap();
+            this.d = this.wrapper.children(0);
+
+            var canvas = this;
+            this.wrapper.on('keydown', function(e) {
+                if(e.which === 13) { 
+                    e.preventDefault();
+                    var cursor = canvas.getCursor();
+                    if(!cursor.isSelecting()) {
+                        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: ''}, this));
+                            canvas.setCurrentElement(goto);
+                        }
+                    }
+                }
+            });
+
+
+            var KEYS = {
+                ARROW_LEFT: 37,
+                ARROW_UP: 38,
+                ARROW_RIGHT: 39,
+                ARROW_DOWN: 40
+            }
+
+            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) {
+                if(e.which >= 37 && e.which <= 40) {
+                    var position = canvas.getCursor().getPosition(),
+                        element = position.element;
+                    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);
+                            }
+                        }
+                    }
+
+
+                }
+            });
+
+            this.wrapper.on('click', '[document-node-element], [document-text-element]', function(e) {
+                e.stopPropagation();
+                canvas.setCurrentElement(canvas.getDocumentElement(e.currentTarget), {caretTo: false});
+            });
+
+            var observer = new MutationObserver(function(mutations) {
+                mutations.forEach(function(mutation) {
+                    if(documentElement.DocumentTextElement.isContentContainer(mutation.target) && mutation.target.data === '')
+                        mutation.target.data = utils.unicode.ZWS;
+                });
+            });
+            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);
+            });
+

         } else {
             this.d = null;
         }
     },
 
         } else {
             this.d = null;
         }
     },
 

+    view: function() {
+        return this.wrapper;
+    },
+

     doc: function() {
         if(this.d === null)
             return null;
     doc: function() {
         if(this.d === null)
             return null;

-        return documentElement.wrap(this.d.get(0), this); //{wlxmlTag: this.d.prop('tagName')};
+        return documentElement.DocumentNodeElement.fromHTMLElement(this.d.get(0), this); //{wlxmlTag: this.d.prop('tagName')};

     },
 
     wrapText: function(params) {
     },
 
     wrapText: function(params) {


@@ -110,7 +310,112 @@ $.extend(Canvas.prototype, {
             wrapperElement.after({text: suffixOutside});
         return wrapperElement;
     },
             wrapperElement.after({text: suffixOutside});
         return wrapperElement;
     },

-    list: {}
+    getDocumentElement: function(from) {
+        if(from instanceof HTMLElement || from instanceof Text) {
+           return documentElement.DocumentElement.fromHTMLElement(from, this);
+        }
+    },
+    getCursor: function() {
+        return new Cursor(this);
+    },
+
+    list: {},
+
+    
+    getCurrentNodeElement: function() {
+        return this.getDocumentElement(this.wrapper.find('.current-node-element').parent()[0]);
+    },
+
+    getCurrentTextElement: function() {
+        return this.getDocumentElement(this.wrapper.find('.current-text-element')[0]);
+    },
+
+
+
+    setCurrentElement: function(element, params) {
+        params = _.extend({caretTo: 'end'}, params);
+        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');
+                element.dom().addClass('current-text-element');
+            } else {
+                this.wrapper.find('.current-node-element').removeClass('current-node-element')
+                element._container().addClass('current-node-element');
+                this.publisher('currentElementChanged', element);
+            }
+        }.bind(this);
+
+
+        var isTextElement = element instanceof documentElement.DocumentTextElement,
+            nodeElementToLand = isTextElement ? element.parent() : element,
+            textElementToLand = isTextElement ? element : findFirstDirectTextChild(element, nodeElementToLand),
+            currentTextElement = this.getCurrentTextElement(),
+            currentNodeElement = this.getCurrentNodeElement();
+
+        if(currentTextElement && !(currentTextElement.sameNode(textElementToLand)))
+            this.wrapper.find('.current-text-element').removeClass('current-text-element');
+
+        if(textElementToLand) {
+            _markAsCurrent(textElementToLand);
+            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', textElementToLand);
+        } else {
+            document.getSelection().removeAllRanges();
+        }
+
+        if(!(currentNodeElement && currentNodeElement.sameNode(nodeElementToLand))) {
+            _markAsCurrent(nodeElementToLand);
+
+            this.publisher('currentNodeElementSet', nodeElementToLand);
+        }
+    },
+
+    _moveCaretToTextElement: function(element, where) {
+        var range = document.createRange(),
+            node = element.dom().contents()[0];
+
+        if(typeof where !== 'number') {
+            range.selectNodeContents(node);
+        } else {
+            range.setStart(node, where);
+        }
+        
+        var collapseArg = true;
+        if(where === 'end')
+            collapseArg = false;
+        range.collapse(collapseArg);
+        
+        var selection = document.getSelection();
+
+        selection.removeAllRanges();
+        selection.addRange(range);
+        this.wrapper.focus(); // FF requires this for caret to be put where range colllapses, Chrome doesn't.
+    },
+
+    setCursorPosition: function(position) {
+        if(position.element)
+            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, {
 });
 
 $.extend(Canvas.prototype.list, {


@@ -130,7 +435,8 @@ $.extend(Canvas.prototype.list, {
         
         var place = 'before';
         var canvas = this;
         
         var place = 'before';
         var canvas = this;

-        parent.children().forEach(function(element) {
+        parent.children().some(function(element) {
+            var _e = element;

             if(element.sameNode(params.element1))
                 place = 'inside';
             if(place === 'inside') {
             if(element.sameNode(params.element1))
                 place = 'inside';
             if(place === 'inside') {


@@ -142,15 +448,15 @@ $.extend(Canvas.prototype.list, {
                 element.setWlxmlClass('item');
                 elementsToWrap.push(element);
             }
                 element.setWlxmlClass('item');
                 elementsToWrap.push(element);
             }

-            if(element.sameNode(params.element2))
-                return false;
+            if(_e.sameNode(params.element2))
+                return true;

         });
         
         var listElement = documentElement.DocumentNodeElement.create({tag: 'div', klass: 'list-items' + (params.type === 'enum' ? '-enum' : '')});
         
         var toret;
         if(parent.is('list')) {
         });
         
         var listElement = documentElement.DocumentNodeElement.create({tag: 'div', klass: 'list-items' + (params.type === 'enum' ? '-enum' : '')});
         
         var toret;
         if(parent.is('list')) {

-            listElement.wrap({tag: 'div', klass: 'item'});
+            listElement.wrapWithNodeElement({tag: 'div', klass: 'item'});

             toret = listElement.parent();
         } else {
             toret = listElement;
             toret = listElement.parent();
         } else {
             toret = listElement;


@@ -162,12 +468,208 @@ $.extend(Canvas.prototype.list, {
             element.detach();
             listElement.append(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',
+            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 = documentElement.DocumentNodeElement.create({tag: 'div', klass:'list-items'}, this),
+                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');

     }
 });
 
     }
 });
 

+
+var Cursor = function(canvas) {
+    this.canvas = canvas;
+};
+
+$.extend(Cursor.prototype, {
+    isSelecting: function() {
+        var selection = window.getSelection();
+        return !selection.isCollapsed;
+    },
+    isSelectingWithinElement: function() {
+        return this.isSelecting() && this.getSelectionStart().element.sameNode(this.getSelectionEnd().element);
+    },
+    isSelectingSiblings: function() {
+        return this.isSelecting() && this.getSelectionStart().element.parent().sameNode(this.getSelectionEnd().element.parent());
+    },
+    getPosition: function() {
+        return this.getSelectionAnchor();
+    },
+    getSelectionStart: function() {
+        return this.getSelectionBoundry('start');
+    },
+    getSelectionEnd: function() {
+        return this.getSelectionBoundry('end');
+    },
+    getSelectionAnchor: function() {
+        return this.getSelectionBoundry('anchor');
+    },
+    getSelectionFocus: function() {
+        return this.getSelectionBoundry('focus');
+    },
+    getSelectionBoundry: function(which) {
+        var selection = window.getSelection(),
+            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')
+            };
+        }
+        if(which === 'focus') {
+            return {
+                element: focusElement,
+                offset: getOffset('focus'),
+                offsetAtBeginning: getOffset('focus') === 0,
+                offsetAtEnd: selection.focusNode.data.length === getOffset('focus')
+            };
+        }
+        
+        var element,
+            offset;
+
+        if(anchorElement.parent().sameNode(focusElement.parent())) {
+            var parent = anchorElement.parent(),
+                anchorFirst = parent.childIndex(anchorElement) < parent.childIndex(focusElement);
+            if(anchorFirst) {
+                if(which === 'start') {
+                    element = anchorElement;
+                    offset = getOffset('anchor')
+                }
+                else if(which === 'end') {
+                    element = focusElement,
+                    offset = getOffset('focus')
+                }
+            } else {
+                if(which === 'start') {
+                    element = focusElement,
+                    offset = getOffset('focus')
+                }
+                else if(which === 'end') {
+                    element = anchorElement;
+                    offset = getOffset('anchor')
+                }
+            }
+        } else {
+            // TODO: Handle order via https://developer.mozilla.org/en-US/docs/Web/API/Node.compareDocumentPosition
+            if(which === 'start') {
+                element = anchorElement;
+                offset = getOffset('anchor')
+            } else {
+                element = focusElement;
+                offset = getOffset('focus')
+            }
+        }
+
+        var nodeLen = (element.sameNode(focusElement) ? selection.focusNode : selection.anchorNode).length;
+        return {
+            element: element,
+            offset: offset,
+            offsetAtBeginning: offset === 0,
+            offsetAtEnd: nodeLen === offset
+        }
+    }
+})
+

 return {
 return {

-    fromXML: function(xml) {
-        return new Canvas(xml);
+    fromXML: function(xml, publisher) {
+        return new Canvas(xml, publisher);

     }
 };
 
     }
 };