X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/8464a511c74dff643095ce419659df60b0580b7a..ea602146cf83203fe89e24dcba3f0b055577e88c:/src/smartxml/smartxml.js?ds=sidebyside

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index 712c0ad..8110a97 100644
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -15,12 +15,13 @@ var TEXT_NODE = Node.TEXT_NODE;
 var INSERTION = function(implementation) {
     var toret = function(node) {
         var insertion = this.getNodeInsertion(node),
+            nodeWasContained = this.document.containsNode(insertion.ofNode),
             nodeParent;
         if(!(this.document.containsNode(this))) {
             nodeParent = insertion.ofNode.parent();
         }
         implementation.call(this, insertion.ofNode.nativeNode);
-        this.triggerChangeEvent(insertion.insertsNew ? 'nodeAdded' : 'nodeMoved', {node: insertion.ofNode}, nodeParent);
+        this.triggerChangeEvent(insertion.insertsNew ? 'nodeAdded' : 'nodeMoved', {node: insertion.ofNode}, nodeParent, nodeWasContained);
         return insertion.ofNode;
     };
     return toret;
@@ -180,13 +181,13 @@ $.extend(DocumentNode.prototype, {
         }
     },
 
-    triggerChangeEvent: function(type, metaData, origParent) {
+    triggerChangeEvent: function(type, metaData, origParent, nodeWasContained) {
         var node = (metaData && metaData.node) ? metaData.node : this,
             event = new events.ChangeEvent(type, $.extend({node: node}, metaData || {}));
         if(type === 'nodeDetached' || this.document.containsNode(event.meta.node)) {
             this.document.trigger('change', event);
         }
-        if((type === 'nodeAdded' || type === 'nodeMoved') && !(this.document.containsNode(this))) {
+        if((type === 'nodeAdded' || type === 'nodeMoved') && !this.document.containsNode(this) && nodeWasContained) {
              event = new events.ChangeEvent('nodeDetached', {node: node, parent: origParent});
              this.document.trigger('change', event);
         }
@@ -242,12 +243,18 @@ $.extend(ElementNode.prototype, {
         return this.nativeNode.tagName.toLowerCase();
     },
 
-    contents: function() {
+    contents: function(selector) {
         var toret = [],
             document = this.document;
-        this._$.contents().each(function() {
-            toret.push(document.createDocumentNode(this));
-        });
+        if(selector) {
+            this._$.children(selector).each(function() {
+                toret.push(document.createDocumentNode(this));
+            });
+        } else {
+            this._$.contents().each(function() {
+                toret.push(document.createDocumentNode(this));
+            });
+        }
         return toret;
     },
 
@@ -389,6 +396,17 @@ ElementNode.prototype.transformations.register(transformations.createContextTran
     }
 }));
 
+ElementNode.prototype.transformations.register(transformations.createContextTransformation({
+    name: 'smartxml.setAttr2',
+    impl: function(args) {
+        this.prevAttr = this.getAttr(args.name);
+        this.setAttr(args.name, args.value);
+    },
+    undo: function(args) {
+        this.setAttr(args.name, this.prevAttr);
+    }
+}));
+
 DocumentNode.prototype.transformations.register(transformations.createContextTransformation({
     name: 'smartxml.wrapWith',
     getChangeRoot: function() {
@@ -434,7 +452,7 @@ $.extend(TextNode.prototype, {
     },
 
     setText: function(text) {
-        console.log('smartxml: ' + text);
+        //console.log('smartxml: ' + text);
         this.nativeNode.data = text;
         this.triggerTextChangeEvent();
     },
@@ -536,6 +554,10 @@ TextNode.prototype.transformations.register(transformations.createContextTransfo
     },
     getChangeRoot: function() {
         return this.context.parent().parent();
+    },
+    isAllowed: function(args) {
+        var parent = this.parent();
+        return !!(parent && parent.parent());
     }
 }));
 
@@ -559,6 +581,9 @@ var Document = function(xml) {
     this.loadXML(xml);
     this.undoStack = [];
     this.redoStack = [];
+    this._transformationLevel = 0;
+    this.transformations = new transformations.TransformationStorage();
+
 };
 
 $.extend(Document.prototype, Backbone.Events, {
@@ -737,7 +762,7 @@ $.extend(Document.prototype, Backbone.Events, {
     },
 
     transform: function(transformation, args) {
-        console.log('transform');
+        //console.log('transform');
         var Transformation, toret;
         if(typeof transformation === 'string') {
             Transformation = this.transformations.get(transformation);
@@ -746,9 +771,13 @@ $.extend(Document.prototype, Backbone.Events, {
             }
         } 
         if(transformation) {
+            this._transformationLevel++;
             toret = transformation.run();
-            this.undoStack.push(transformation);
-            console.log('clearing redo stack');
+            if(this._transformationLevel === 1) {
+                this.undoStack.push(transformation);
+            }
+            this._transformationLevel--;
+            //console.log('clearing redo stack');
             this.redoStack = [];
             return toret;
         } else {
@@ -814,7 +843,8 @@ return {
 
     Document: Document,
     DocumentNode: DocumentNode,
-    ElementNode: ElementNode
+    ElementNode: ElementNode,
+    TextNode: TextNode
 };
 
 });
\ No newline at end of file