wip: removing console calls

[fnpeditor.git] / src / editor / modules / documentCanvas / canvas / documentElement.js

diff --git a/src/editor/modules/documentCanvas/canvas/documentElement.js b/src/editor/modules/documentCanvas/canvas/documentElement.js
index 0627bc1..1c0719f 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/documentElement.js
+++ b/src/editor/modules/documentCanvas/canvas/documentElement.js
@@ -1,11 +1,10 @@
 define([
 'libs/jquery',
 'libs/underscore',
 define([
 'libs/jquery',
 'libs/underscore',

-'modules/documentCanvas/classAttributes',

 'modules/documentCanvas/canvas/utils',
 'modules/documentCanvas/canvas/widgets',
 'modules/documentCanvas/canvas/wlxmlManagers'
 'modules/documentCanvas/canvas/utils',
 'modules/documentCanvas/canvas/widgets',
 'modules/documentCanvas/canvas/wlxmlManagers'

-], function($, _, classAttributes, utils, widgets, wlxmlManagers) {
+], function($, _, utils, widgets, wlxmlManagers) {

     
 'use strict';
 
     
 'use strict';
 


@@ -18,18 +17,18 @@ var DocumentElement = function(htmlElement, canvas) {
     this._setupDOMHandler(htmlElement);
 }
 
     this._setupDOMHandler(htmlElement);
 }
 

-var elementTypeFromParams = function(params) {
-    return params.text !== undefined ? DocumentTextElement : DocumentNodeElement;

 
 

-};
+var elementTypeFromWlxmlNode = function(wlxmlNode) {
+    return wlxmlNode.nodeType === Node.TEXT_NODE ? DocumentTextElement : DocumentNodeElement;
+}

 
 $.extend(DocumentElement, {
 
 $.extend(DocumentElement, {

-    create: function(params, canvas) {
-        return elementTypeFromParams(params).create(params);
+    create: function(node, canvas) {
+        return elementTypeFromWlxmlNode(node).create(node, canvas);

     },
 
     },
 

-    createDOM: function(params) {
-        return elementTypeFromParams(params).createDOM(params);
+    createDOM: function(wlxmlNode) {
+        return elementTypeFromParams(wlxmlNode).createDOM(params);

     },
 
     fromHTMLElement: function(htmlElement, canvas) {
     },
 
     fromHTMLElement: function(htmlElement, canvas) {


@@ -52,6 +51,13 @@ $.extend(DocumentElement.prototype, {
     dom: function() {
         return this.$element;
     },
     dom: function() {
         return this.$element;
     },

+    data: function() {
+        var dom = this.dom(),
+            args = Array.prototype.slice.call(arguments, 0);
+        if(args.length === 2 && args[1] === undefined)
+            return dom.removeData(args[0]);
+        return dom.data.apply(dom, arguments);
+    },

     parent: function() {
         var parents = this.$element.parents('[document-node-element]');
         if(parents.length)
     parent: function() {
         var parents = this.$element.parents('[document-node-element]');
         if(parents.length)


@@ -73,13 +79,6 @@ $.extend(DocumentElement.prototype, {
         return other && (typeof other === typeof this) && other.dom()[0] === this.dom()[0];
     },
 
         return other && (typeof other === typeof this) && other.dom()[0] === this.dom()[0];
     },
 

-    wrapWithNodeElement: function(wlxmlNode) {
-        var wrapper = DocumentNodeElement.create({tag: wlxmlNode.tag, klass: wlxmlNode.klass}, this);
-        this.dom().replaceWith(wrapper.dom());
-        wrapper.append(this);
-        return wrapper;
-    },
-

     markAsCurrent: function() {
         this.canvas.markAsCurrent(this);
     },
     markAsCurrent: function() {
         this.canvas.markAsCurrent(this);
     },


@@ -139,7 +138,15 @@ var DocumentNodeElement = function(htmlElement, canvas) {
 };
 
 $.extend(DocumentNodeElement, {
 };
 
 $.extend(DocumentNodeElement, {

-    createDOM: function(params, canvas) {
+    create: function(wlxmlNode, canvas) {
+        return this.fromHTMLElement(this.createDOM(wlxmlNode, canvas)[0], canvas);
+    },
+
+    fromHTMLElement: function(htmlElement, canvas) {
+        return new this(htmlElement, canvas);
+    },
+
+    createDOM: function(wlxmlNode, canvas) {

         var dom = $('<div>')
                 .attr('document-node-element', ''),
             widgetsContainer = $('<div>')
         var dom = $('<div>')
                 .attr('document-node-element', ''),
             widgetsContainer = $('<div>')


@@ -154,29 +161,18 @@ $.extend(DocumentNodeElement, {
 
         var element = this.fromHTMLElement(dom[0], canvas);
 
 
         var element = this.fromHTMLElement(dom[0], canvas);
 

-        element.setWlxml({tag: params.tag, klass: params.klass});
-        if(params.meta) {
-            _.keys(params.meta).forEach(function(key) {
-                element.setWlxmlMetaAttr(key, params.meta[key]);
-            });
-        }
-        element.data('other-attrs', params.others);
+        element.data('wlxmlNode', wlxmlNode);
+        wlxmlNode.setData('canvasElement', element);

 
 

-        if(params.rawChildren && params.rawChildren.length) {
-            container.append(params.rawChildren);
-        } else if(params.prepopulateOnEmpty) {
-            element.append(DocumentTextElement.create({text: ''}));
-        }
-        return dom;
-    },
+        element.setWlxml({tag: wlxmlNode.getTagName(), klass: wlxmlNode.getClass()});

 
 

-    create: function(params, canvas) {
-        return this.fromHTMLElement(this.createDOM(params, canvas)[0], canvas);
-    },
+        wlxmlNode.contents().forEach((function(node) {
+            container.append(DocumentElement.create(node).dom());
+        }).bind(this));

 
 

-    fromHTMLElement: function(htmlElement, canvas) {
-        return new this(htmlElement, canvas);
+        return dom;

     }
     }

+

 });
 
 var manipulate = function(e, params, action) {
 });
 
 var manipulate = function(e, params, action) {


@@ -216,124 +212,6 @@ $.extend(DocumentNodeElement.prototype, {
         this.canvas = null;
         return this;
     },
         this.canvas = null;
         return this;
     },

-    unwrapContents: function() {
-        var parent = this.parent();
-        if(!parent)
-            return;
-
-        var parentChildren = parent.children(),
-            myChildren = this.children(),
-            myIdx = parent.childIndex(this);
-
-        if(myChildren.length === 0)
-            return this.detach();
-
-        var moveLeftRange, moveRightRange, leftMerged;
-
-        if(myIdx > 0 && (parentChildren[myIdx-1] instanceof DocumentTextElement) && (myChildren[0] instanceof DocumentTextElement)) {
-            parentChildren[myIdx-1].appendText(myChildren[0].getText());
-            myChildren[0].detach();
-            moveLeftRange = true;
-            leftMerged = true;
-        } else {
-            leftMerged = false;
-        }
-
-        if(!(leftMerged && myChildren.length === 1)) {
-            if(myIdx < parentChildren.length - 1 && (parentChildren[myIdx+1] instanceof DocumentTextElement) && (myChildren[myChildren.length-1] instanceof DocumentTextElement)) {
-                parentChildren[myIdx+1].prependText(myChildren[myChildren.length-1].getText());
-                myChildren[myChildren.length-1].detach();
-                moveRightRange = true;
-            }
-        }
-
-        var childrenLength = this.children().length;
-        this.children().forEach(function(child) {
-            this.before(child);
-        }.bind(this));
-
-        this.detach();
-
-        return {
-            element1: parent.children()[myIdx + (moveLeftRange ? -1 : 0)],
-            element2: parent.children()[myIdx + childrenLength-1 + (moveRightRange ? 1 : 0)]
-        };
-    },
-    data: function() {
-        var dom = this.dom(),
-            args = Array.prototype.slice.call(arguments, 0);
-        if(args.length === 2 && args[1] === undefined)
-            return dom.removeData(args[0]);
-        return dom.data.apply(dom, arguments);
-    },
-    toXML: function(level) {
-        var node = $('<' + this.getWlxmlTag() + '>');
-
-        if(this.getWlxmlClass())
-            node.attr('class', this.getWlxmlClass());
-        var meta = this.getWlxmlMetaAttrs();
-        meta.forEach(function(attr) {
-            if(attr.value)
-                node.attr('meta-' + attr.name, attr.value);
-        });
-        _.keys(this.data('other-attrs') || {}).forEach(function(key) {
-            node.attr(key, this.data('other-attrs')[key]);
-        }, this);
-
-        var addFormatting = function() {
-            var toret = $('<div>');
-            var formattings = {};
-
-            if(this.data('orig-before') !== undefined) {
-                if(this.data('orig-before')) {
-                    toret.prepend(document.createTextNode(this.data('orig-before')));
-                }
-            } else if(level && this.getWlxmlTag() !== 'span') {
-                toret.append('\n' + (new Array(level * 2 + 1)).join(' '));
-            }
-
-            toret.append(node);
-
-            if(this.data('orig-after')) {
-                toret.append(document.createTextNode(this.data('orig-after')));
-            }
-
-            /* Inside node */
-            if(this.data('orig-begin')) {
-                node.prepend(this.data('orig-begin'));
-                formattings.begin = true;
-            }
-
-            if(this.data('orig-end') !== undefined) {
-                if(this.data('orig-end')) {
-                    node.append(this.data('orig-end'));
-                }
-            } else if(this.getWlxmlTag() !== 'span' && children.length){
-                node.append('\n' + (new Array(level * 2 + 1)).join(' '));
-            }
-           
-            return {parts: toret.contents(), formattings: formattings};
-        }.bind(this);
-
-        
-        
-        var children = this.children(),
-            childParts;
-
-        var formatting = addFormatting(node);
-
-        for(var i = children.length - 1; i >= 0; i--) {
-            childParts = children[i].toXML(level + 1);
-            if(typeof childParts === 'string')
-                childParts = [document.createTextNode(childParts)];
-
-            if(formatting.formattings.begin) {
-                $(node.contents()[0]).after(childParts);
-            } else
-                node.prepend(childParts);
-        }
-        return formatting.parts;
-    },

     append: function(params) {
         if(params.tag !== 'span')
             this.data('orig-end', undefined);
     append: function(params) {
         if(params.tag !== 'span')
             this.data('orig-end', undefined);


@@ -402,12 +280,6 @@ $.extend(DocumentNodeElement.prototype, {
     setWlxmlClass: function(klass) {
         if(klass === this.getWlxmlClass())
             return;
     setWlxmlClass: function(klass) {
         if(klass === this.getWlxmlClass())
             return;

-
-        this.getWlxmlMetaAttrs().forEach(function(attr) {
-            if(!classAttributes.hasMetaAttr(klass, attr.name))
-                this.dom().removeAttr('wlxml-meta-' + attr.name);
-        }, this);
-

         if(klass)
             this._container().attr('wlxml-class', klass.replace(/\./g, '-'));
         else
         if(klass)
             this._container().attr('wlxml-class', klass.replace(/\./g, '-'));
         else


@@ -434,24 +306,6 @@ $.extend(DocumentNodeElement.prototype, {
             return true;
         return false;
     },
             return true;
         return false;
     },

-
-    getWlxmlMetaAttr: function(attr) {
-        return this.dom().attr('wlxml-meta-'+attr);
-    },
-
-    getWlxmlMetaAttrs: function() {
-        var toret = [];
-        var attrList = classAttributes.getMetaAttrsList(this.getWlxmlClass());
-        attrList.all.forEach(function(attr) {
-            toret.push({name: attr.name, value: this.getWlxmlMetaAttr(attr.name) || ''});
-        }, this);
-        return toret;
-    },
-
-    setWlxmlMetaAttr: function(attr, value) {
-        this.dom().attr('wlxml-meta-'+attr, value);
-    },
-    

     toggleLabel: function(toggle) {
         var displayCss = toggle ? 'inline-block' : 'none';
         var label = this.dom().children('.canvas-widgets').find('.canvas-widget-label');
     toggleLabel: function(toggle) {
         var displayCss = toggle ? 'inline-block' : 'none';
         var label = this.dom().children('.canvas-widgets').find('.canvas-widget-label');


@@ -478,14 +332,17 @@ var DocumentTextElement = function(htmlElement, canvas) {
 };
 
 $.extend(DocumentTextElement, {
 };
 
 $.extend(DocumentTextElement, {

-    createDOM: function(params) {
-        return $('<div>')
+    createDOM: function(wlxmlTextNode) {
+        var dom = $('<div>')

             .attr('document-text-element', '')
             .attr('document-text-element', '')

-            .text(params.text || utils.unicode.ZWS);
+            .text(wlxmlTextNode.getText() || utils.unicode.ZWS),
+        element = this.fromHTMLElement(dom[0], this);
+        element.data('wlxmlNode', wlxmlTextNode);
+        return dom;

     },
 
     },
 

-    create: function(params, canvas) {
-        return this.fromHTMLElement(this.createDOM(params)[0]);
+    create: function(wlxmlTextNode, canvas) {
+        return this.fromHTMLElement(this.createDOM(wlxmlTextNode)[0]);

     },
 
     fromHTMLElement: function(htmlElement, canvas) {
     },
 
     fromHTMLElement: function(htmlElement, canvas) {


@@ -499,9 +356,6 @@ $.extend(DocumentTextElement, {
 DocumentTextElement.prototype = new DocumentElement();
 
 $.extend(DocumentTextElement.prototype, {
 DocumentTextElement.prototype = new DocumentElement();
 
 $.extend(DocumentTextElement.prototype, {

-    toXML: function(parent) {
-        return this.getText();
-    },

     _setupDOMHandler: function(htmlElement) {
         var $element = $(htmlElement);
         if(htmlElement.nodeType === Node.TEXT_NODE)
     _setupDOMHandler: function(htmlElement) {
         var $element = $(htmlElement);
         if(htmlElement.nodeType === Node.TEXT_NODE)


@@ -523,8 +377,13 @@ $.extend(DocumentTextElement.prototype, {
     prependText: function(text) {
         this.dom().contents()[0].data = text + this.dom().contents()[0].data;
     },
     prependText: function(text) {
         this.dom().contents()[0].data = text + this.dom().contents()[0].data;
     },

-    getText: function() {
-        return this.dom().text().replace(utils.unicode.ZWS, '');
+    getText: function(options) {
+        options = _.extend({raw: false}, options || {});
+        var toret = this.dom().text();
+        if(!options.raw) {
+            toret = toret.replace(utils.unicode.ZWS, '');
+        }
+        return toret;

     },
     isEmpty: function() {
         // Having at least Zero Width Space is guaranteed be Content Observer
     },
     isEmpty: function() {
         // Having at least Zero Width Space is guaranteed be Content Observer


@@ -537,7 +396,7 @@ $.extend(DocumentTextElement.prototype, {
         if(params instanceof DocumentNodeElement) {
             element = params;
         } else {
         if(params instanceof DocumentNodeElement) {
             element = params;
         } else {

-            element = DocumentNodeElement.create(params, this.canvas);
+            element = DocumentElement.create(params, this.canvas);

         }
         this.dom().wrap('<div>');
         this.dom().parent().after(element.dom());
         }
         this.dom().wrap('<div>');
         this.dom().parent().after(element.dom());


@@ -558,84 +417,7 @@ $.extend(DocumentTextElement.prototype, {
         this.dom().unwrap();
         return element;
     },
         this.dom().unwrap();
         return element;
     },

-    wrapWithNodeElement: function(wlxmlNode) {
-        if(typeof wlxmlNode.start === 'number' && typeof wlxmlNode.end === 'number') {
-            return this.canvas.wrapText({
-                inside: this.parent(),
-                textNodeIdx: this.parent().childIndex(this),
-                offsetStart: Math.min(wlxmlNode.start, wlxmlNode.end),
-                offsetEnd: Math.max(wlxmlNode.start, wlxmlNode.end),
-                _with: {tag: wlxmlNode.tag, klass: wlxmlNode.klass}
-            });
-        } else {
-            return DocumentElement.prototype.wrapWithNodeElement.call(this, wlxmlNode);
-        }
-    },
-    unwrap: function() {
-        var parent = this.parent(),
-            toret;
-        if(parent.children().length === 1) {
-            toret = parent.parent();
-            var grandParent = parent.parent();
-            if(grandParent) {
-                var grandParentChildren = grandParent.children(),
-                    idx = grandParent.childIndex(parent),
-                    prev = idx - 1 > -1 ? grandParentChildren[idx-1] : null,
-                    next = idx + 1 < grandParentChildren.length ? grandParentChildren[idx+1] : null;
-                
-                prev = (prev instanceof DocumentTextElement) ? prev : null;
-                next = (next instanceof DocumentTextElement) ? next : null;
-
-                if(prev && next) {
-                    prev.setText(prev.getText() + this.getText() + next.getText());
-                    next.detach();
-                } else if (prev || next) {
-                    var target = prev ? prev : next,
-                        newText = prev ? target.getText() + this.getText() : this.getText() + target.getText();
-                    target.setText(newText);
-                } else {
-                    parent.after(this);
-                }
-            } else {
-                parent.after(this);
-            }
-            parent.detach();
-            return toret;
-        }
-    },
-    split: function(params) {
-        var parentElement = this.parent(),
-            myIdx = parentElement.childIndex(this),
-            myCanvas = this.canvas,
-            passed = false,
-            succeedingChildren = [],
-            thisElement = this,
-            prefix = this.getText().substr(0, params.offset),
-            suffix = this.getText().substr(params.offset);
-
-        parentElement.children().forEach(function(child) {
-            if(passed)
-                succeedingChildren.push(child);
-            if(child.sameNode(thisElement))
-                passed = true;
-        });

 
 

-        if(prefix.length > 0)
-            this.setText(prefix);
-        else
-            this.detach();
-        
-        var newElement = DocumentNodeElement.create({tag: parentElement.getWlxmlTag(), klass: parentElement.getWlxmlClass()}, myCanvas);
-        parentElement.after(newElement);
-
-        if(suffix.length > 0)
-            newElement.append({text: suffix});
-        succeedingChildren.forEach(function(child) {
-            newElement.append(child);
-        });
-
-        return {first: parentElement, second: newElement};
-    },

     divide: function(params) {
         var myText = this.getText();
 
     divide: function(params) {
         var myText = this.getText();