Moving DocumentNodeElement methods where they belong

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index d0adbc0..84610b8 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -18,26 +18,6 @@ $.extend(DocumentElement.prototype, {
     dom: function() {
         return this.$element;
     },
     dom: function() {
         return this.$element;
     },

-    children: function() {
-        var toret = [];
-        if(this instanceof DocumentTextElement)
-            return toret;
-
-
-        var elementContent = this.$element.contents();
-        var element = this;
-        elementContent.each(function(idx) {
-            var childElement = documentElementFromHTMLElement(this, element.canvas);
-            if(idx === 0 && elementContent.length > 1 && elementContent[1].nodeType === Node.ELEMENT_NODE && (childElement instanceof DocumentTextElement) && $.trim($(this).text()) === '')
-                return true;
-            if(idx > 0 && childElement instanceof DocumentTextElement) {
-                if(toret[toret.length-1] instanceof DocumentNodeElement && $.trim($(this).text()) === '')
-                    return true;
-            }
-            toret.push(childElement);
-        });
-        return toret;
-    },

     parent: function() {
         return documentElementFromHTMLElement(this.$element.parent()[0], this.canvas);
     },
     parent: function() {
         return documentElementFromHTMLElement(this.$element.parent()[0], this.canvas);
     },


@@ -53,18 +33,6 @@ $.extend(DocumentElement.prototype, {
         return wrapper;
     },
 
         return wrapper;
     },
 

-    childIndex: function(child) {
-        var children = this.children(),
-            toret = null;
-        children.forEach(function(c, idx) {
-            if(c.sameNode(child)) {
-                toret = idx;
-                return false;
-            }
-        });
-        return toret;
-    },
-

     detach: function() {
         this.$element.detach();
         this.canvas = null;
     detach: function() {
         this.$element.detach();
         this.canvas = null;


@@ -105,6 +73,37 @@ $.extend(DocumentNodeElement.prototype, {
     after: function(params) {
         manipulate(this, params, 'after');
     },
     after: function(params) {
         manipulate(this, params, 'after');
     },

+    children: function() {
+        var toret = [];
+        if(this instanceof DocumentTextElement)
+            return toret;
+
+
+        var elementContent = this.$element.contents();
+        var element = this;
+        elementContent.each(function(idx) {
+            var childElement = documentElementFromHTMLElement(this, element.canvas);
+            if(idx === 0 && elementContent.length > 1 && elementContent[1].nodeType === Node.ELEMENT_NODE && (childElement instanceof DocumentTextElement) && $.trim($(this).text()) === '')
+                return true;
+            if(idx > 0 && childElement instanceof DocumentTextElement) {
+                if(toret[toret.length-1] instanceof DocumentNodeElement && $.trim($(this).text()) === '')
+                    return true;
+            }
+            toret.push(childElement);
+        });
+        return toret;
+    },
+    childIndex: function(child) {
+        var children = this.children(),
+            toret = null;
+        children.forEach(function(c, idx) {
+            if(c.sameNode(child)) {
+                toret = idx;
+                return false;
+            }
+        });
+        return toret;
+    },

     getWlxmlTag: function() {
         return this.$element.attr('wlxml-tag');
     },
     getWlxmlTag: function() {
         return this.$element.attr('wlxml-tag');
     },