X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/5c2e36d7dbb5d7437b70183f87fb68ccb6c5d866..61143e615dfb903cd11c11539b7259cc4bc8b9fe:/modules/documentCanvas/canvas/canvas.js?ds=inline

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 88a8839..079c229 100644
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -23,13 +23,28 @@ $.extend(Canvas.prototype, {
                 var currentTag = $(this);
                 if(currentTag.attr('wlxml-tag'))
                     return;
-                var element = documentElement.DocumentNodeElement.createDOM({
+
+                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;
+                }
+
+                var element = documentElement.DocumentNodeElement.create({
                     tag: currentTag.prop('tagName').toLowerCase(),
-                    klass: currentTag.attr('class')
+                    klass: currentTag.attr('class'),
+                    meta: meta,
+                    others: others
                 });
 
-                element.append(currentTag.contents());
-                return element;
+                element.dom().append(currentTag.contents());
+                ['orig-before', 'orig-append'].forEach(function(attr) {
+                    element.data(attr, '');
+                });
+                return element.dom();
             });
 
             this.wrapper.find(':not(iframe)').addBack().contents()
@@ -43,21 +58,41 @@ $.extend(Canvas.prototype, {
                         spanBefore = el.prev().length > 0  && $(el.prev()[0]).attr('wlxml-tag') === 'span',
                         spanAfter = el.next().length > 0 && $(el.next()[0]).attr('wlxml-tag') === 'span';
                         
+                    var oldText = this.data,
+                        oldLength = this.data.length;
+                    var parent = el.parent(),
+                        parentContents = parent.contents(),
+                        idx = parentContents.index(this),
+                        next = idx < parentContents.length - 1 ? parentContents[idx+1] : null;
+
+                    var addInfo = function() {
+                        if(next) {
+                            $(next).data('orig-before', oldText);
+                        } else {
+                            parent.data('orig-append', oldText);
+                        }
+                    }
+
                     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) ? ' ' : '')
+                        var newText = (startSpace && (spanParent || spanBefore) ? ' ' : '')
                                     + trimmed
                                     + (endSpace && (spanParent || spanAfter) ? ' ' : '');
-
+                        if(newText !== oldText) {
+                            this.data = newText;
+                            addInfo();
+                        }
                     } else {
-                        var oldLength = this.data.length;
+
                         this.data = $.trim(this.data);
                         if(this.data.length === 0 && oldLength > 0 && el.parent().contents().length === 1)
                             this.data = ' ';
                         if(this.data.length === 0) {
-                            $(this).remove();
+                            addInfo();
+                            el.remove();
+
                             return true; // continue
                         }
                     }
@@ -264,6 +299,24 @@ $.extend(Canvas.prototype, {
     setCursorPosition: function(position) {
         if(position.element)
             this._moveCaretToTextElement(position.element, position.offset);
+    },
+
+    toXML: function() {
+        var d = function(element, parent, level) {
+            console.log(element.getText ? 'text: ' + element.getText() : 'node: ' + element.getWlxmlTag());
+            var isElementNode = element instanceof documentElement.DocumentNodeElement;
+            parent.prepend(element.toXML(level));
+            if(isElementNode) {
+                var dom = $(parent.children()[0]),
+                    elementChildren = element.children();
+                for(var i = elementChildren.length - 1; i >= 0; i--) {
+                    d(elementChildren[i], dom, level + 1);
+                }
+            }
+        }
+        var parent = $('<div>');
+        d(this.doc(), parent, 0);
+        return parent.html();
     }
 });
 
@@ -425,6 +478,9 @@ $.extend(Cursor.prototype, {
     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),
@@ -441,6 +497,14 @@ $.extend(Cursor.prototype, {
                 offsetAtEnd: anchorElement && anchorElement.getText().length === selection.anchorOffset
             };
         }
+        if(which === 'focus') {
+            return {
+                element: focusElement,
+                offset: selection.focusOffset,
+                offsetAtBeginning: selection.focusOffset === 0,
+                offsetAtEnd: focusElement && focusElement.getText().length === selection.focusOffset
+            };
+        }
         
         var element,
             offset;
@@ -468,7 +532,7 @@ $.extend(Cursor.prototype, {
                 }
             }
         } else {
-            // TODO: Handle order
+            // TODO: Handle order via https://developer.mozilla.org/en-US/docs/Web/API/Node.compareDocumentPosition
             if(which === 'start') {
                 element = anchorElement;
                 offset = selection.anchorOffset