fixing wrapping DocumentElements

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

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 3ae6a3e..d883835 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -6,41 +6,69 @@ define([
     
 'use strict';
 
-var Canvas = function(xml) {
-    xml = $.parseXML(xml);
-    this.d = xml !== null ? $(xml.childNodes[0]) : null;
-    if(this.d) {
-        var wrapper = $('<div>');
-        wrapper.append(this.d);
-        wrapper.find(':not(iframe)').addBack().contents()
-            .filter(function() {return this.nodeType === Node.TEXT_NODE})
-            .each(function() {
-
-                var el = $(this);
-                
-                // TODO: use DocumentElement API
-                var spanParent = el.parent().prop('tagName') === 'span',
-                    spanBefore = el.prev().length > 0  && $(el.prev()[0]).prop('tagName') === 'span',
-                    spanAfter = el.next().length > 0 && $(el.next()[0]).prop('tagName') === '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) ? ' ' : '');
-
-                } else {
-                    this.data = $.trim(this.data);
-                }
-            });
-        this.d.unwrap();
-    };
+var Canvas = function(wlxml) {
+    this.loadWlxml(wlxml);
 };
 
 $.extend(Canvas.prototype, {
 
+    loadWlxml: function(wlxml) {
+        var d = wlxml ? $($.trim(wlxml)) : null;
+        if(d) {
+            var wrapper = $('<div>');
+            wrapper.append(d);
+            
+            wrapper.find('*').replaceWith(function() {
+                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);}));
+                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);
+                }
+                toret.append(currentTag.contents());
+                return toret;
+            });
+
+            wrapper.find(':not(iframe)').addBack().contents()
+                .filter(function() {return this.nodeType === Node.TEXT_NODE})
+                .each(function() {
+
+                    var el = $(this);
+                    
+                    // 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) ? ' ' : '');
+
+                    } 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();
+                    }
+                });
+            
+            this.d = wrapper.children(0);
+            this.d.unwrap();
+        } else {
+            this.d = null;
+        }
+    },
+
     doc: function() {
         if(this.d === null)
             return null;
@@ -139,6 +167,46 @@ $.extend(Canvas.prototype.list, {
             element.detach();
             listElement.append(element);
         });
+    },
+    extractItems: function(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),
+            extractedItems = [],
+            succeedingItems = [],
+            items = list.children(),
+            i;
+
+        for(i = Math.min(idx1,idx2); i <= Math.max(idx1, idx2); i++) {
+            extractedItems.push(items[i]);
+            items[i].detach();
+        }
+        for(i = i; i < items.length; i++) {
+            succeedingItems.push(items[i]);
+            items[i].detach();
+        }
+
+        var last = list;
+        extractedItems.forEach(function(item) {
+            item.setWlxmlClass(null); //
+            last.after(item);
+            last = item;
+        });
+
+        if(list.children().length === 0)
+            list.detach();
+
+        if(succeedingItems.length > 0) {
+            var secondList = documentElement.DocumentNodeElement.create({tag: 'div', klass:'list-items'}, this);
+            last.after(secondList);
+
+            succeedingItems.forEach(function(item) {
+                secondList.append(item);
+            });
+        }
     }
 });