X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/393685bcd5f1b3cf31cdea0cf36c2ac7e44f31c3..61143e615dfb903cd11c11539b7259cc4bc8b9fe:/modules/documentCanvas/canvas/canvas.js

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 46dfd6d..079c229 100644
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -24,17 +24,20 @@ $.extend(Canvas.prototype, {
                 if(currentTag.attr('wlxml-tag'))
                     return;
 
-                var meta = {};
+                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'),
-                    meta: meta
+                    meta: meta,
+                    others: others
                 });
 
                 element.dom().append(currentTag.contents());
@@ -55,32 +58,40 @@ $.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 oldText = this.data,
-                            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) {
-                            var parent = $(this).parent(),
-                                parentContents = parent.contents(),
-                                idx = parentContents.index(this),
-                                next = idx < parentContents.length - 1 ? parentContents[idx+1] : null;
-
-                            if(next) {
-                                $(next).data('orig-before', oldText);
-                            } else {
-                                parent.data('orig-append', oldText);
-                            }
-                            $(this).remove();
+                            addInfo();
+                            el.remove();
 
                             return true; // continue
                         }