editor: update old transform api calls to new way of calling transformations

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

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index 1379153..2fd4e41 100644 (file)
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -2,36 +2,14 @@ define([
     'libs/jquery',
     'libs/underscore',
     'libs/backbone',
     'libs/jquery',
     'libs/underscore',
     'libs/backbone',

-    'smartxml/events'
-], function($, _, Backbone, events) {
+    'smartxml/events',
+    'smartxml/transformations',
+    'smartxml/core'
+], function($, _, Backbone, events, transformations, coreTransformations) {

     
 'use strict';
 /* globals Node */
 
     
 'use strict';
 /* globals Node */
 

-var TEXT_NODE = Node.TEXT_NODE;
-
-
-var INSERTION = function(implementation) {
-    var toret = function(node) {
-        var insertion = this.getNodeInsertion(node),
-            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);
-        return insertion.ofNode;
-    };
-    return toret;
-};
-
-// var TRANSFORMATION = function(name, implementation) {
-//     //implementation._isTransformation = true;
-
-//     createDumbTransformation(name, implementation, )
-
-//     return implementation;
-// };

 
 var DocumentNode = function(nativeNode, document) {
     if(!document) {
 
 var DocumentNode = function(nativeNode, document) {
     if(!document) {


@@ -44,12 +22,8 @@ var DocumentNode = function(nativeNode, document) {
 
 $.extend(DocumentNode.prototype, {
 
 
 $.extend(DocumentNode.prototype, {
 

-    transform: function(name, args) {
-        var Transformation = contextTransformations[name],
-            transformation;
-        if(Transformation) {
-            transformation = new Transformation(this.document, this, args);
-        }
+    transform: function(Transformation, args) {
+        var transformation = new Transformation(this.document, this, args);

         return this.document.transform(transformation);
     },
 
         return this.document.transform(transformation);
     },
 


@@ -60,17 +34,14 @@ $.extend(DocumentNode.prototype, {
 
     clone: function() {
         var clone = this._$.clone(true, true);
 
     clone: function() {
         var clone = this._$.clone(true, true);

-        // clone.find('*').addBack().each(function() {
-        //     var n = $(this);
-        //     if(n.data('canvasElement')) {
-        //         n.data('canvasElement', $.extend(true, {}, n.data('canvasElement')));
-        //         n.data('canvasElement').$element = n.data('canvasElement').$element.clone(true, true);
-        //     }
-        // });

         return this.document.createDocumentNode(clone[0]);
     },
 
     getPath: function(ancestor) {
         return this.document.createDocumentNode(clone[0]);
     },
 
     getPath: function(ancestor) {

+        if(!(this.document.containsNode(this))) {
+            return null;
+        }
+

         var nodePath = [this].concat(this.parents()),
             toret, idx;
         ancestor = ancestor || this.document.root;
         var nodePath = [this].concat(this.parents()),
             toret, idx;
         ancestor = ancestor || this.document.root;


@@ -94,23 +65,6 @@ $.extend(DocumentNode.prototype, {
         return this.document.root.sameNode(this);
     },
 
         return this.document.root.sameNode(this);
     },
 

-    detach: function() {
-        var parent = this.parent();
-        this._$.detach();
-        this.triggerChangeEvent('nodeDetached', {parent: parent});
-        return this;
-    },
-
-    replaceWith: function(node) {
-        var toret;
-        if(this.isRoot()) {
-            return this.document.replaceRoot(node);
-        }
-        toret = this.after(node);
-        this.detach();
-        return toret;
-    },
-

     sameNode: function(otherNode) {
         return !!(otherNode) && this.nativeNode === otherNode.nativeNode;
     },
     sameNode: function(otherNode) {
         return !!(otherNode) && this.nativeNode === otherNode.nativeNode;
     },


@@ -152,46 +106,13 @@ $.extend(DocumentNode.prototype, {
         return prev && (prev.nodeType === Node.TEXT_NODE) && next && (next.nodeType === Node.TEXT_NODE);
     },
 
         return prev && (prev.nodeType === Node.TEXT_NODE) && next && (next.nodeType === Node.TEXT_NODE);
     },
 

-    after: INSERTION(function(nativeNode) {
-        return this._$.after(nativeNode);
-    }),
-
-    before: INSERTION(function(nativeNode) {
-        return this._$.before(nativeNode);
-    }),
-
-    wrapWith: function(node) {
-        var insertion = this.getNodeInsertion(node);
-        if(this.parent()) {
-            this.before(insertion.ofNode);
-        }
-        insertion.ofNode.append(this);
-        return insertion.ofNode;
-    },
-
-    /**
-    * Removes parent of a node if node has no siblings.
-    */
-    unwrap: function() {
-        if(this.isRoot()) {
-            return;
-        }
-        var parent = this.parent(),
-            grandParent;
-        if(parent.contents().length === 1) {
-            grandParent = parent.parent();
-            parent.unwrapContent();
-            return grandParent;
-        }
-    },
-
-    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);
         }
         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);
         }
              event = new events.ChangeEvent('nodeDetached', {node: node, parent: origParent});
              this.document.trigger('change', event);
         }


@@ -209,6 +130,7 @@ $.extend(DocumentNode.prototype, {
     }
 });
 
     }
 });
 

+

 var ElementNode = function(nativeNode, document) {
     DocumentNode.call(this, nativeNode, document);
 };
 var ElementNode = function(nativeNode, document) {
     DocumentNode.call(this, nativeNode, document);
 };


@@ -217,16 +139,6 @@ ElementNode.prototype = Object.create(DocumentNode.prototype);
 $.extend(ElementNode.prototype, {
     nodeType: Node.ELEMENT_NODE,
 
 $.extend(ElementNode.prototype, {
     nodeType: Node.ELEMENT_NODE,
 

-    detach: function() {
-        var next;
-        if(this.parent() && this.isSurroundedByTextElements()) {
-            next = this.next();
-            this.prev().appendText(next.getText());
-            next.detach();
-        }
-        return DocumentNode.prototype.detach.call(this);
-    },
-

     setData: function(key, value) {
         if(value !== undefined) {
             this._$.data(key, value);
     setData: function(key, value) {
         if(value !== undefined) {
             this._$.data(key, value);


@@ -247,12 +159,18 @@ $.extend(ElementNode.prototype, {
         return this.nativeNode.tagName.toLowerCase();
     },
 
         return this.nativeNode.tagName.toLowerCase();
     },
 

-    contents: function() {
+    contents: function(selector) {

         var toret = [],
             document = this.document;
         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;
     },
 
         return toret;
     },
 


@@ -260,37 +178,10 @@ $.extend(ElementNode.prototype, {
         return this._$.contents().index(node._$);
     },
 
         return this._$.contents().index(node._$);
     },
 

-    setTag: function(tagName) {
-        var node = this.document.createDocumentNode({tagName: tagName}),
-            oldTagName = this.getTagName(),
-            myContents = this._$.contents();
-
-        this.getAttrs().forEach(function(attribute) {
-            node.setAttr(attribute.name, attribute.value, true);
-        });
-        node.setData(this.getData());
-
-        if(this.sameNode(this.document.root)) {
-            defineDocumentProperties(this.document, node._$);
-        }
-        this._$.replaceWith(node._$);
-        this._setNativeNode(node._$[0]);
-        this._$.append(myContents);
-        this.triggerChangeEvent('nodeTagChange', {oldTagName: oldTagName, newTagName: this.getTagName()});
-    },
-

     getAttr: function(name) {
         return this._$.attr(name);
     },
 
     getAttr: function(name) {
         return this._$.attr(name);
     },
 

-    setAttr: function(name, value, silent) {
-        var oldVal = this.getAttr(name);
-        this._$.attr(name, value);
-        if(!silent) {
-            this.triggerChangeEvent('nodeAttrChange', {attr: name, oldVal: oldVal, newVal: value});
-        }
-    },
-

     getAttrs: function() {
         var toret = [];
         for(var i = 0; i < this.nativeNode.attributes.length; i++) {
     getAttrs: function() {
         var toret = [];
         for(var i = 0; i < this.nativeNode.attributes.length; i++) {


@@ -299,76 +190,6 @@ $.extend(ElementNode.prototype, {
         return toret;
     },
 
         return toret;
     },
 

-    append: INSERTION(function(nativeNode) {
-        this._$.append(nativeNode);
-    }),
-
-    prepend: INSERTION(function(nativeNode) {
-        this._$.prepend(nativeNode);
-    }),
-
-    insertAtIndex: function(nativeNode, index) {
-        var contents = this.contents();
-        if(index < contents.length) {
-            return contents[index].before(nativeNode);
-        } else if(index === contents.length) {
-            return this.append(nativeNode);
-        }
-    },
-
-    unwrapContent: function() {
-        var parent = this.parent();
-        if(!parent) {
-            return;
-        }
-
-        var myContents = this.contents(),
-            myIdx = parent.indexOf(this);
-
-
-        if(myContents.length === 0) {
-            return this.detach();
-        }
-
-        var prev = this.prev(),
-            next = this.next(),
-            moveLeftRange, moveRightRange, leftMerged;
-
-        if(prev && (prev.nodeType === TEXT_NODE) && (myContents[0].nodeType === TEXT_NODE)) {
-            prev.appendText(myContents[0].getText());
-            myContents[0].detach();
-            moveLeftRange = true;
-            leftMerged = true;
-        } else {
-            leftMerged = false;
-        }
-
-        if(!(leftMerged && myContents.length === 1)) {
-            var lastContents = _.last(myContents);
-            if(next && (next.nodeType === TEXT_NODE) && (lastContents.nodeType === TEXT_NODE)) {
-                next.prependText(lastContents.getText());
-                lastContents.detach();
-                moveRightRange = true;
-            }
-        }
-
-        var childrenLength = this.contents().length;
-        this.contents().forEach(function(child) {
-            this.before(child);
-        }.bind(this));
-
-        this.detach();
-
-        return {
-            element1: parent.contents()[myIdx + (moveLeftRange ? -1 : 0)],
-            element2: parent.contents()[myIdx + childrenLength-1 + (moveRightRange ? 1 : 0)]
-        };
-    },
-
-    wrapText: function(params) {
-        return this.document._wrapText(_.extend({inside: this}, params));
-    },
-

     toXML: function() {
         var wrapper = $('<div>');
         wrapper.append(this._getXMLDOMToDump());
     toXML: function() {
         var wrapper = $('<div>');
         wrapper.append(this._getXMLDOMToDump());


@@ -380,6 +201,7 @@ $.extend(ElementNode.prototype, {
     }
 });
 
     }
 });
 

+

 var TextNode = function(nativeNode, document) {
     DocumentNode.call(this, nativeNode, document);
 };
 var TextNode = function(nativeNode, document) {
     DocumentNode.call(this, nativeNode, document);
 };


@@ -392,74 +214,6 @@ $.extend(TextNode.prototype, {
         return this.nativeNode.data;
     },
 
         return this.nativeNode.data;
     },
 

-    setText: function(text) {
-        console.log('smartxml: ' + text);
-        this.nativeNode.data = text;
-        this.triggerTextChangeEvent();
-    },
-
-    appendText: function(text) {
-        this.nativeNode.data = this.nativeNode.data + text;
-        this.triggerTextChangeEvent();
-    },
-
-    prependText: function(text) {
-        this.nativeNode.data = text + this.nativeNode.data;
-        this.triggerTextChangeEvent();
-    },
-
-    wrapWith: function(desc) {
-        if(typeof desc.start === 'number' && typeof desc.end === 'number') {
-            return this.document._wrapText({
-                inside: this.parent(),
-                textNodeIdx: this.parent().indexOf(this),
-                offsetStart: Math.min(desc.start, desc.end),
-                offsetEnd: Math.max(desc.start, desc.end),
-                _with: {tagName: desc.tagName, attrs: desc.attrs}
-            });
-        } else {
-            return DocumentNode.prototype.wrapWith.call(this, desc);
-        }
-    },
-
-    split: function(params) {
-        var parentElement = this.parent(),
-            passed = false,
-            succeedingChildren = [],
-            prefix = this.getText().substr(0, params.offset),
-            suffix = this.getText().substr(params.offset);
-
-        parentElement.contents().forEach(function(child) {
-            if(passed) {
-                succeedingChildren.push(child);
-            }
-            if(child.sameNode(this)) {
-                passed = true;
-            }
-        }.bind(this));
-
-        if(prefix.length > 0) {
-            this.setText(prefix);
-        }
-        else {
-            this.detach();
-        }
-
-        var attrs = {};
-        parentElement.getAttrs().forEach(function(attr) {attrs[attr.name] = attr.value; });
-        var newElement = this.document.createDocumentNode({tagName: parentElement.getTagName(), attrs: attrs});
-        parentElement.after(newElement);
-
-        if(suffix.length > 0) {
-            newElement.append({text: suffix});
-        }
-        succeedingChildren.forEach(function(child) {
-            newElement.append(child);
-        });
-
-        return {first: parentElement, second: newElement};
-    },
-

     triggerTextChangeEvent: function() {
         var event = new events.ChangeEvent('nodeTextChange', {node: this});
         this.document.trigger('change', event);
     triggerTextChangeEvent: function() {
         var event = new events.ChangeEvent('nodeTextChange', {node: this});
         this.document.trigger('change', event);


@@ -471,10 +225,40 @@ var parseXML = function(xml) {
     return $($.trim(xml))[0];
 };
 
     return $($.trim(xml))[0];
 };
 

+var registerTransformation = function(desc, name, target) {
+    var Transformation = transformations.createContextTransformation(desc, name);
+    target[name] = function() {
+        var instance = this,
+            args = Array.prototype.slice.call(arguments, 0);
+        return instance.transform(Transformation, args);
+    };
+};
+
+var registerMethod = function(methodName, method, target) {
+    if(target[methodName]) {
+        throw new Error('Cannot extend {target} with method name {methodName}. Name already exists.'
+            .replace('{target}', target)
+            .replace('{methodName}', methodName)
+        );
+    }
+    target[methodName] = method;
+};
+
+

 var Document = function(xml) {
     this.loadXML(xml);
     this.undoStack = [];
     this.redoStack = [];
 var Document = function(xml) {
     this.loadXML(xml);
     this.undoStack = [];
     this.redoStack = [];

+    this._transformationLevel = 0;
+    
+    this._nodeMethods = {};
+    this._textNodeMethods = {};
+    this._elementNodeMethods = {};
+    this._nodeTransformations = {};
+    this._textNodeTransformations = {};
+    this._elementNodeTransformations = {};
+    
+    this.registerExtension(coreTransformations);

 };
 
 $.extend(Document.prototype, Backbone.Events, {
 };
 
 $.extend(Document.prototype, Backbone.Events, {


@@ -496,18 +280,34 @@ $.extend(Document.prototype, Backbone.Events, {
                 from = node[0];
             }
         }
                 from = node[0];
             }
         }

-        var Factory;
+        var Factory, typeMethods, typeTransformations;

         if(from.nodeType === Node.TEXT_NODE) {
             Factory = this.TextNodeFactory;
         if(from.nodeType === Node.TEXT_NODE) {
             Factory = this.TextNodeFactory;

+            typeMethods = this._textNodeMethods;
+            typeTransformations = this._textNodeTransformations;

         } else if(from.nodeType === Node.ELEMENT_NODE) {
             Factory = this.ElementNodeFactory;
         } else if(from.nodeType === Node.ELEMENT_NODE) {
             Factory = this.ElementNodeFactory;

+            typeMethods = this._elementNodeMethods;
+            typeTransformations = this._elementNodeTransformations;

         }
         }

-        return new Factory(from, this);
+        var toret = new Factory(from, this);
+        _.extend(toret, this._nodeMethods);
+        _.extend(toret, typeMethods);
+        
+        _.extend(toret, this._nodeTransformations);
+        _.extend(toret, typeTransformations);
+        
+        toret.__super__ = _.extend({}, this._nodeMethods, this._nodeTransformations);
+        _.keys(toret.__super__).forEach(function(key) {
+            toret.__super__[key] = _.bind(toret.__super__[key], toret);
+        });
+
+        return toret;

     },
 
     loadXML: function(xml, options) {
         options = options || {};
     },
 
     loadXML: function(xml, options) {
         options = options || {};

-        defineDocumentProperties(this, $(parseXML(xml)));
+        this._defineDocumentProperties($(parseXML(xml)));

         if(!options.silent) {
             this.trigger('contentSet');
         }
         if(!options.silent) {
             this.trigger('contentSet');
         }


@@ -521,42 +321,6 @@ $.extend(Document.prototype, Backbone.Events, {
         return this.root && (node.nativeNode === this.root.nativeNode || node._$.parents().index(this.root._$) !== -1);
     },
 
         return this.root && (node.nativeNode === this.root.nativeNode || node._$.parents().index(this.root._$) !== -1);
     },
 

-    wrapNodes: function(params) {
-        if(!(params.node1.parent().sameNode(params.node2.parent()))) {
-            throw new Error('Wrapping non-sibling nodes not supported.');
-        }
-
-        var parent = params.node1.parent(),
-            parentContents = parent.contents(),
-            wrapper = this.createDocumentNode({
-                tagName: params._with.tagName,
-                attrs: params._with.attrs}),
-            idx1 = parent.indexOf(params.node1),
-            idx2 = parent.indexOf(params.node2);
-
-        if(idx1 > idx2) {
-            var tmp = idx1;
-            idx1 = idx2;
-            idx2 = tmp;
-        }
-
-        var insertingMethod, insertingTarget;
-        if(idx1 === 0) {
-            insertingMethod = 'prepend';
-            insertingTarget = parent;
-        } else {
-            insertingMethod = 'after';
-            insertingTarget = parentContents[idx1-1];
-        }
-
-        for(var i = idx1; i <= idx2; i++) {
-            wrapper.append(parentContents[i].detach());
-        }
-
-        insertingTarget[insertingMethod](wrapper);
-        return wrapper;
-    },
-

     getSiblingParents: function(params) {
         var parents1 = [params.node1].concat(params.node1.parents()).reverse(),
             parents2 = [params.node2].concat(params.node2.parents()).reverse(),
     getSiblingParents: function(params) {
         var parents1 = [params.node1].concat(params.node1.parents()).reverse(),
             parents2 = [params.node2].concat(params.node2.parents()).reverse(),


@@ -576,58 +340,7 @@ $.extend(Document.prototype, Backbone.Events, {
         return {node1: parents1[i], node2: parents2[i]};
     },
 
         return {node1: parents1[i], node2: parents2[i]};
     },
 

-    _wrapText: function(params) {
-        params = _.extend({textNodeIdx: 0}, params);
-        if(typeof params.textNodeIdx === 'number') {
-            params.textNodeIdx = [params.textNodeIdx];
-        }
-        
-        var contentsInside = params.inside.contents(),
-            idx1 = Math.min.apply(Math, params.textNodeIdx),
-            idx2 = Math.max.apply(Math, params.textNodeIdx),
-            textNode1 = contentsInside[idx1],
-            textNode2 = contentsInside[idx2],
-            sameNode = textNode1.sameNode(textNode2),
-            prefixOutside = textNode1.getText().substr(0, params.offsetStart),
-            prefixInside = textNode1.getText().substr(params.offsetStart),
-            suffixInside = textNode2.getText().substr(0, params.offsetEnd),
-            suffixOutside = textNode2.getText().substr(params.offsetEnd)
-        ;
-
-        if(!(textNode1.parent().sameNode(textNode2.parent()))) {
-            throw new Error('Wrapping text in non-sibling text nodes not supported.');
-        }
-        
-        var wrapperElement = this.createDocumentNode({tagName: params._with.tagName, attrs: params._with.attrs});
-        textNode1.after(wrapperElement);
-        textNode1.detach();
-        
-        if(prefixOutside.length > 0) {
-            wrapperElement.before({text:prefixOutside});
-        }
-        if(sameNode) {
-            var core = textNode1.getText().substr(params.offsetStart, params.offsetEnd - params.offsetStart);
-            wrapperElement.append({text: core});
-        } else {
-            textNode2.detach();
-            if(prefixInside.length > 0) {
-                wrapperElement.append({text: prefixInside});
-            }
-            for(var i = idx1 + 1; i < idx2; i++) {
-                wrapperElement.append(contentsInside[i]);
-            }
-            if(suffixInside.length > 0) {
-                wrapperElement.append({text: suffixInside});
-            }
-        }
-        if(suffixOutside.length > 0) {
-            wrapperElement.after({text: suffixOutside});
-        }
-        return wrapperElement;
-    },
-

     trigger: function() {
     trigger: function() {

-        //console.log('trigger: ' + arguments[0] + (arguments[1] ? ', ' + arguments[1].type : ''));

         Backbone.Events.trigger.apply(this, arguments);
     },
 
         Backbone.Events.trigger.apply(this, arguments);
     },
 


@@ -643,47 +356,95 @@ $.extend(Document.prototype, Backbone.Events, {
         return insertion;
     },
 
         return insertion;
     },
 

-    replaceRoot: function(node) {
-        var insertion = this.getNodeInsertion(node);
-        this.root.detach();
-        defineDocumentProperties(this, insertion.ofNode._$);
-        insertion.ofNode.triggerChangeEvent('nodeAdded');
-        return insertion.ofNode;
+    registerMethod: function(methodName, method, dstName) {
+        var doc = this;
+        var destination = {
+            document: doc,
+            documentNode: doc._nodeMethods,
+            textNode: doc._textNodeMethods,
+            elementNode: doc._elementNodeMethods
+        }[dstName];
+        registerMethod(methodName, method, destination);
+    },
+
+    registerTransformation: function(desc, name, dstName) {
+        var doc = this;
+        var destination = {
+            document: doc,
+            documentNode: doc._nodeTransformations,
+            textNode: doc._textNodeTransformations,
+            elementNode: doc._elementNodeTransformations
+        }[dstName];
+        registerTransformation(desc, name, destination);
+    },
+
+    registerExtension: function(extension) {
+        var doc = this;
+
+        ['document', 'documentNode', 'elementNode', 'textNode'].forEach(function(dstName) {
+            var dstExtension = extension[dstName];
+            if(dstExtension) {
+                if(dstExtension.methods) {
+                    _.pairs(dstExtension.methods).forEach(function(pair) {
+                        var methodName = pair[0],
+                            method = pair[1];
+
+                        doc.registerMethod(methodName, method, dstName);
+
+                    });
+                }
+
+                if(dstExtension.transformations) {
+                    _.pairs(dstExtension.transformations).forEach(function(pair) {
+                        var name = pair[0],
+                            desc = pair[1];
+                        doc.registerTransformation(desc, name, dstName);
+                    });
+                }
+            }
+        });

     },
 
     },
 

-    transform: function(transformationName, args) {
-        console.log('transform');
-        var Transformation, transformation, toret;
-        if(typeof transformationName === 'string') {
-            Transformation = transformations[transformationName];
-            if(Transformation) {
-                transformation = new Transformation(args);
-            }
+    transform: function(Transformation, args) {
+        var toret, transformation;
+
+        if(typeof Transformation === 'function') {
+            transformation = new Transformation(this, this, args);

         } else {
         } else {

-            transformation = transformationName;
+            transformation = Transformation;

         }
         if(transformation) {
         }
         if(transformation) {

-            toret = transformation.run();
-            this.undoStack.push(transformation);
-            console.log('clearing redo stack');
-            this.redoStack = [];
+            this._transformationLevel++;
+            toret = transformation.run({beUndoable:this._transformationLevel === 1});
+            if(this._transformationLevel === 1 && !this._undoInProgress) {
+                this.undoStack.push(transformation);
+            }
+            if(!this._undoInProgress && this._transformationLevel === 1) {
+                this.redoStack = [];
+            }
+            this._transformationLevel--;

             return toret;
         } else {
             return toret;
         } else {

-            throw new Error('Transformation ' + transformationName + ' doesn\'t exist!');
+            throw new Error('Transformation ' + transformation + ' doesn\'t exist!');

         }
     },
     undo: function() {
         var transformation = this.undoStack.pop();
         if(transformation) {
         }
     },
     undo: function() {
         var transformation = this.undoStack.pop();
         if(transformation) {

+            this._undoInProgress = true;

             transformation.undo();
             transformation.undo();

+            this._undoInProgress = false;

             this.redoStack.push(transformation);
         }
     },
     redo: function() {
         var transformation = this.redoStack.pop();
         if(transformation) {
             this.redoStack.push(transformation);
         }
     },
     redo: function() {
         var transformation = this.redoStack.pop();
         if(transformation) {

-            transformation.run();
+            this._transformationLevel++;
+            transformation.run({beUndoable: true});
+            this._transformationLevel--;

             this.undoStack.push(transformation);
             this.undoStack.push(transformation);

+

         }
     },
 
         }
     },
 


@@ -693,330 +454,24 @@ $.extend(Document.prototype, Backbone.Events, {
             toret = toret.contents()[idx];
         });
         return toret;
             toret = toret.contents()[idx];
         });
         return toret;

-    }
-});
-
-var defineDocumentProperties = function(doc, $document) {
-    Object.defineProperty(doc, 'root', {get: function() {
-        return doc.createDocumentNode($document[0]);
-    }, configurable: true});
-    Object.defineProperty(doc, 'dom', {get: function() {
-        return $document[0];
-    }, configurable: true});
-};
-
-
-// var registerTransformationsFromObject = function(object) {
-//     _.values(object).filter(function(val) {
-//         return typeof val === 'function' && val._isTransformation;
-//     })
-//     .forEach(function(val) {
-//         registerTransformation(val._transformationName, val, object);
-//     });
-// };
-// registerTransformationsFromObject(ElementNode.prototype);
-// registerTransformationsFromObject(TextNode.prototype);
-// registerTransformationsFromObject(Document.prototype);
-
-// var Transformation = function() {
-// };
-// $.extend(Transformation.prototype, {
-
-// });
-
-
-// var createDumbTransformation = function(impl, contextObject) {
-//     var DumbTransformation = function(args) {
-//         this.args = this.args;
-//     };
-//     DumbTransformation.prototype = Object.create(Transformation.prototype);
-//     $.extend(DumbTransformation.prototype, {
-//         run: function() {
-//             impl.apply(contextObject, this.args);
-//         }
-//     });
-
-//     return DumbTransformation;
-
-
-// };
-
-var transformations = {};
-// var registerTransformation = function(name, impl, contextObject) {
-//     if(typeof impl === 'function') {
-//         transformations[name] = createDumbTransformation(impl, contextObject);
-//     }
-// };
-
-// registerTransformation('detachx', DocumentNode.prototype.detach,  )
-
-
-// 1. detach via totalny fallback
-var DetachNodeTransformation = function(args) {
-    this.node = args.node;
-    this.document = this.node.document;
-};
-$.extend(DetachNodeTransformation.prototype, {
-    run: function() {
-        this.oldRoot = this.node.document.root.clone();
-        this.path = this.node.getPath();
-        this.node.detach(); // @TS
-        
-    },
-    undo: function() {
-        this.document.root.replaceWith(this.oldRoot); // this.getDocument?
-        this.node = this.document.getNodeByPath(this.path);
-    }
-});
-transformations['detach'] = DetachNodeTransformation;
-
-//2. detach via wskazanie changeroot
-
-var Detach2NodeTransformation = function(args) {
-    this.nodePath = args.node.getPath();
-    this.document = args.node.document;
-};
-$.extend(Detach2NodeTransformation.prototype, {
-    run: function() {
-        var node = this.document.getNodeByPath(this.nodePath),
-            root = node.parent() ? node.parent() : this.document.root;
-        
-        this.rootPath = root.getPath();
-        this.oldRoot = (root).clone();
-        node.detach();
-    },
-    undo: function() {
-        this.document.getNodeByPath(this.rootPath).replaceWith(this.oldRoot);
-    }
-});
-//transformations['detach2'] = Detach2NodeTransformation;
-
-//2a. generyczna transformacja
-
-var createTransformation = function(desc) {
-
-    var NodeTransformation = function(args) {
-        this.nodePath = args.node.getPath();
-        this.document = args.node.document;
-        this.args = args;
-    };
-    $.extend(NodeTransformation.prototype, {
-        run: function() {
-            var node = this.document.getNodeByPath(this.nodePath),
-                root;
-
-            if(desc.getRoot) {
-                root = desc.getRoot(node);
-            } else {
-                root = this.document.root;
-            }
-            
-            this.rootPath = root.getPath();
-            this.oldRoot = (root).clone();
-            desc.impl.call(node, this.args);
-        },
-        undo: function() {
-            this.document.getNodeByPath(this.rootPath).replaceWith(this.oldRoot);
-        }
-    });
-
-    return NodeTransformation;
-}
-
-///
-var Transformation = function(args) {
-    this.args = args;
-};
-$.extend(Transformation.prototype, {
-    run: function() {
-        throw new Error('not implemented');
-    },
-    undo: function() {
-        throw new Error('not implemented');
-    },
-});
-
-var createGenericTransformation = function(desc) {
-    var GenericTransformation = function(document, args) {
-        //document.getNodeByPath(contextPath).call(this, args);
-        this.args = args;
-        this.document = document;
-    };
-    $.extend(GenericTransformation.prototype, {
-        run: function() {
-            var changeRoot = desc.getChangeRoot ? desc.getChangeRoot.call(this) : this.document.root;
-            this.snapshot = changeRoot.clone();
-            this.changeRootPath = changeRoot.getPath();
-            return desc.impl.call(this.context, this.args); // a argumenty do metody?
-        },
-        undo: function() {
-            this.document.getNodeByPath(this.changeRootPath).replaceWith(this.snapshot);
-        },
-    });
-
-    return GenericTransformation;
-};
-
-// var T = createGenericTransformation({impl: function() {}});
-// var t = T(doc, {a:1,b:2,c3:3});
-
-
-var createContextTransformation = function(desc) {
-    // mozna sie pozbyc przez przeniesienie object/context na koniec argumentow konstruktora generic transformation
-    var GenericTransformation = createGenericTransformation(desc);
-
-    var ContextTransformation = function(document, object, args) {
-        var contextPath = object.getPath();
-
-        GenericTransformation.call(this, document, args);
-        
-        Object.defineProperty(this, 'context', {
-            get: function() {
-                return document.getNodeByPath(contextPath);
-            }
-        });
-    }
-    ContextTransformation.prototype = Object.create(GenericTransformation.prototype);
-    return ContextTransformation;
-}
-// var T = createContextTransformation({impl: function() {}});
-// var t = T(doc, node, {a:1,b:2,c3:3});
-///
-
-var contextTransformations = {};
-contextTransformations['setText'] = createContextTransformation({
-    impl: function(args) {
-        this.setText(args.text);

     },
     },

-    getChangeRoot: function() {
-        return this.context;
-    }
-});
-
-contextTransformations['setAttr'] = createContextTransformation({
-    impl: function(args) {
-        this.setAttr(args.name, args.value);
-    },
-    getChangeRoot: function() {
-        return this.context;
-    }
-});

 
 

-contextTransformations['split'] = createContextTransformation({
-    impl: function(args) {
-        return this.split({offset: args.offset});
-    }//,
-    // getChangeRoot: function() {
-    //     return this.context.parent().parent();
-    // }
-});
-
-// var TRANSFORMATION2 = function(f, getChangeRoot, undo) {
-//     var context = this,
-
-
-//     var transformation = createContextTransformation({
-//         impl: f,
-//         getChangeRoot: getChangeRoot,
-
-//     });
-
-//     var toret = function() {
-//         var 
-//         f.apply(context, createArgs ? createArgs(arguments) : arguments)
-//     };
-//     return toret;
-// }
-
-transformations['detach2'] = createTransformation({
-    // impl: function() {
-    //     //this.setAttr('class', 'cite'); //  
-    // },
-    impl: ElementNode.prototype.detach,
-    getRoot: function(node) {
-        return node.parent();
+    _defineDocumentProperties: function($document) {
+        var doc = this;
+        Object.defineProperty(doc, 'root', {get: function() {
+            return doc.createDocumentNode($document[0]);
+        }, configurable: true});
+        Object.defineProperty(doc, 'dom', {get: function() {
+            return $document[0];
+        }, configurable: true});

     }
     }

-

 });
 
 });
 

-transformations['setText-old'] = createTransformation({
-    impl: function(args) {
-        this.setText(args.text)
-    },
-    getRoot: function(node) {
-        return node;
-    }
-
-});
-
-transformations['setClass-old'] = createTransformation({
-    impl: function(args) {
-        this.setClass(args.klass);
-    },
-    getRoot: function(node) {
-        return node;
-    }
-})
-
-//3. detach z pełnym własnym redo
-
-var Detach3NodeTransformation = function(args) {
-    this.node = args.node;
-    this.document = this.node.document;
-};
-$.extend(Detach3NodeTransformation.prototype, {
-    run: function() {
-        //this.index = this.node.getIndex();
-        //this.parent = this.node.parent();
-        
-        this.path = this.node.getPath();
-        if(this.node.isSurroundedByTextElements()) {
-            this.prevText = this.node.prev().getText();
-            this.nextText = this.node.next().getText();
-            this.merge = true;
-        } else {
-            this.prevText = this.nextText = null;
-            this.merge = false;
-        }
-
-        this.node.detach();
-    },
-    undo: function() {
-        var parent = this.document.getNodeByPath(this.path.slice(0,-1)),
-            idx = _.last(this.path);
-        var inserted = parent.insertAtIndex(this.node, idx);
-        if(this.merge) {
-            if(inserted.next()) {
-                inserted.before({text: this.prevText});
-                inserted.next().setText(this.nextText);
-            } else {
-                inserted.prev().setText(this.prevText);
-                inserted.after({text: this.nextText});
-            }
-        }
-    }
-});
-transformations['detach3'] = Detach3NodeTransformation;
-
-
-var registerTransformationsFromObject = function(object) {
-    _.pairs(object).filter(function(pair) {
-        var property = pair[1];
-        return typeof property === 'function' && property._isTransformation;
-    })
-    .forEach(function(pair) {
-        var name = pair[0],
-            method = pair[1];
-        object.registerTransformation(name, createContextTransformation(method));
-    });
-};
-registerTransformationsFromObject(ElementNode.prototype);
-registerTransformationsFromObject(TextNode.prototype);
-registerTransformationsFromObject(Document.prototype);

 
 return {
     documentFromXML: function(xml) {
 
 return {
     documentFromXML: function(xml) {

-        return new Document(xml);
+        var doc = new Document(xml);
+        return doc;

     },
 
     elementNodeFromXML: function(xml) {
     },
 
     elementNodeFromXML: function(xml) {


@@ -1025,7 +480,8 @@ return {
 
     Document: Document,
     DocumentNode: DocumentNode,
 
     Document: Document,
     DocumentNode: DocumentNode,

-    ElementNode: ElementNode
+    ElementNode: ElementNode,
+    TextNode: TextNode

 };
 
 });
\ No newline at end of file
 };
 
 });
\ No newline at end of file