fnpjs: Action now triggers actionExecuted event instead of using callback

[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 99a12f5..d40ca9b 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/documentElement.js
+++ b/src/editor/modules/documentCanvas/canvas/documentElement.js
@@ -151,13 +151,26 @@ $.extend(DocumentNodeElement.prototype, {
     _container: function() {
         return this.dom.children('[document-element-content]');
     },
     _container: function() {
         return this.dom.children('[document-element-content]');
     },

-    detach: function() {
-        var parents = this.parents();
-        this.dom.detach();
-        if(parents[0]) {
-            parents[0].refreshPath();
+    detach: function(isChild) {
+        var parents;
+
+        if(this.gutterGroup) {
+            this.gutterGroup.remove();
+        }
+        if(_.isFunction(this.children)) {
+            this.children().forEach(function(child) {
+                child.detach(true);
+            });

         }
         }

-         return this;
+
+        if(!isChild) {
+            parents = this.parents();
+            this.dom.detach();
+            if(parents[0]) {
+                parents[0].refreshPath();
+            }
+        }
+        return this;

     },
     before: function(params) {
         return manipulate(this, params, 'before');
     },
     before: function(params) {
         return manipulate(this, params, 'before');


@@ -214,8 +227,10 @@ $.extend(DocumentTextElement.prototype, {
             .text(this.wlxmlNode.getText() || utils.unicode.ZWS);
         return dom;
     },
             .text(this.wlxmlNode.getText() || utils.unicode.ZWS);
         return dom;
     },

-    detach: function() {
-        this.dom.detach();
+    detach: function(isChild) {
+        if(!isChild) {
+            this.dom.detach();
+        }

         return this;
     },
     setText: function(text) {
         return this;
     },
     setText: function(text) {