fnpjs: Action now triggers actionExecuted event instead of using callback

[fnpeditor.git] / src / smartxml / core.js

diff --git a/src/smartxml/core.js b/src/smartxml/core.js
index fdce751..f907a20 100644 (file)
--- a/src/smartxml/core.js
+++ b/src/smartxml/core.js
@@ -23,7 +23,7 @@ var INSERTION = function(implementation) {
             next.detach();
         }
         returned = implementation.call(this, insertion.ofNode);
             next.detach();
         }
         returned = implementation.call(this, insertion.ofNode);

-        if(!options.silent && returned.sameNode(insertion.ofNode)) {
+        if(!options.silent && returned && returned.sameNode(insertion.ofNode)) {

             if(!insertion.insertsNew) {
                 this.triggerChangeEvent('nodeDetached', {node: insertion.ofNode, parent: nodeParent, move: true});
             }
             if(!insertion.insertsNew) {
                 this.triggerChangeEvent('nodeDetached', {node: insertion.ofNode, parent: nodeParent, move: true});
             }


@@ -63,7 +63,11 @@ var documentNodeTransformations = {
     },
 
     after: INSERTION(function(node) {
     },
 
     after: INSERTION(function(node) {

+        if(this.isRoot()) {
+            return;
+        }

         var next = this.next();
         var next = this.next();

+

         if(next && next.nodeType === Node.TEXT_NODE && node.nodeType === Node.TEXT_NODE) {
             next.setText(node.getText() + next.getText());
             node.detach();
         if(next && next.nodeType === Node.TEXT_NODE && node.nodeType === Node.TEXT_NODE) {
             next.setText(node.getText() + next.getText());
             node.detach();


@@ -74,6 +78,9 @@ var documentNodeTransformations = {
     }),
 
     before: INSERTION(function(node) {
     }),
 
     before: INSERTION(function(node) {

+        if(this.isRoot()) {
+            return;
+        }

         var prev = this.prev();
         if(prev && prev.nodeType === Node.TEXT_NODE && node.nodeType === Node.TEXT_NODE) {
             prev.setText(prev.getText() + node.getText());
         var prev = this.prev();
         if(prev && prev.nodeType === Node.TEXT_NODE && node.nodeType === Node.TEXT_NODE) {
             prev.setText(prev.getText() + node.getText());


@@ -113,12 +120,24 @@ var documentNodeTransformations = {
 
 var elementNodeTransformations = {
 
 
 var elementNodeTransformations = {
 

-    detach: function() {
+    detach: function(params) {

         var next;
         var next;

+        params = _.extend({
+            normalizeStrategy: 'merge'
+        }, params);
+

         if(this.parent() && this.isSurroundedByTextNodes()) {
         if(this.parent() && this.isSurroundedByTextNodes()) {

-            next = this.next();
-            this.prev().appendText(next.getText());
-            next.detach();
+            if(params.normalizeStrategy === 'detach-left') {
+                this.prev().detach();
+            } else if(params.normalizeStrategy === 'detach-right') {
+                this.next().detach();
+            } else if(params.normalizeStrategy === 'merge') {
+                next = this.next();
+                this.prev().appendText(next.getText());
+                next.detach();
+            } else {
+                throw new Error('unknown normalize strategy for detach');
+            }

         }
         return this.__super__.detach();
     },
         }
         return this.__super__.detach();
     },


@@ -455,7 +474,7 @@ var documentTransformations = {
         return insertion.ofNode;
     },
     deleteText: function(params) {
         return insertion.ofNode;
     },
     deleteText: function(params) {

-        var ptr, next, toDetach, middle, text;
+        var ptr, next, nextNext, toDetach, middle, text;

 
         if(params.from.node.sameNode(params.to.node)) {
             ptr = params.from.node;
 
         if(params.from.node.sameNode(params.to.node)) {
             ptr = params.from.node;


@@ -483,7 +502,11 @@ var documentTransformations = {
                 } else {
                     toDetach = next;
                     next = next.next();
                 } else {
                     toDetach = next;
                     next = next.next();

-                    toDetach.detach();
+                    nextNext = next ? next.next() : null;
+                    toDetach.detach({normalizeStrategy: (next && next.sameNode(params.to.node)) ? 'merge' : 'detach-right'});
+                    if(next && !next.isInDocument()) {
+                        next = nextNext;
+                    }

                 }
             } else {
                 ptr = ptr.parent();
                 }
             } else {
                 ptr = ptr.parent();