X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/72006ca5628befdc32bb1cd31002f22c4a7c8bca..4442dc983215c50244bfc43bec26b6d7d9806dbe:/modules/documentCanvas/canvas/canvas.js

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 3ae6a3e..c4bfc09 100644
--- 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;
@@ -87,6 +115,11 @@ $.extend(Canvas.prototype, {
             wrapperElement.after({text: suffixOutside});
         return wrapperElement;
     },
+    getDocumentElement: function(from) {
+        if(from instanceof HTMLElement || from instanceof Text) {
+           return documentElement.wrap(from, this);
+        }
+    },
     list: {}
 });
 
@@ -107,7 +140,8 @@ $.extend(Canvas.prototype.list, {
         
         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') {
@@ -119,15 +153,15 @@ $.extend(Canvas.prototype.list, {
                 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')) {
-            listElement.wrap({tag: 'div', klass: 'item'});
+            listElement.wrapWithNodeElement({tag: 'div', klass: 'item'});
             toret = listElement.parent();
         } else {
             toret = listElement;
@@ -139,6 +173,83 @@ $.extend(Canvas.prototype.list, {
             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');
     }
 });