moving wlxml object api transformations directly into .object properties name space

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

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index 712c0ad..831a96a 100644 (file)
--- 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),
 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);
             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;
         return insertion.ofNode;
     };
     return toret;


@@ -37,14 +38,8 @@ var DocumentNode = function(nativeNode, document) {
 
 $.extend(DocumentNode.prototype, {
 
 
 $.extend(DocumentNode.prototype, {
 

-    transformations: new transformations.TransformationStorage(),
-
-    transform: function(name, args) {
-        var Transformation = this.transformations.get(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);
     },
 


@@ -180,13 +175,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);
         }
         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);
         }


@@ -242,12 +237,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;
     },
 


@@ -375,52 +376,6 @@ $.extend(ElementNode.prototype, {
     }
 });
 
     }
 });
 

-// trans
-
-// todo - split+append
-
-ElementNode.prototype.transformations.register(transformations.createContextTransformation({
-    name: 'smartxml.setAttr',
-    impl: function(args) {
-        this.setAttr(args.name, args.value);
-    },
-    getChangeRoot: function() {
-        return this.context;
-    }
-}));
-
-DocumentNode.prototype.transformations.register(transformations.createContextTransformation({
-    name: 'smartxml.wrapWith',
-    getChangeRoot: function() {
-        return this.context.parent();
-    },
-    impl: function(args) {
-        return this.wrapWith(args);
-    }
-}));
-
-DocumentNode.prototype.transformations.register(transformations.createContextTransformation({
-    name: 'smartxml.wrapText',
-    getChangeRoot: function() {
-        return this.context;
-    },
-    impl: function(args) {
-        return this.wrapText(args);
-    }
-}));
-
-DocumentNode.prototype.transformations.register(transformations.createContextTransformation({
-    name: 'smartxml.detach',
-    getChangeRoot: function() {
-        return this.context.parent();
-    },
-    impl: function(args) {
-        return this.detach();
-    }
-}));
-
-///
-

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


@@ -434,7 +389,7 @@ $.extend(TextNode.prototype, {
     },
 
     setText: function(text) {
     },
 
     setText: function(text) {

-        console.log('smartxml: ' + text);
+        //console.log('smartxml: ' + text);

         this.nativeNode.data = text;
         this.triggerTextChangeEvent();
     },
         this.nativeNode.data = text;
         this.triggerTextChangeEvent();
     },


@@ -508,63 +463,42 @@ $.extend(TextNode.prototype, {
 });
 
 
 });
 
 

-TextNode.prototype.transformations.register(transformations.createContextTransformation({
-    name: 'rng.breakContent',
-    // impl: function(args) {
-    //     var node = this.context,
-    //         newNodes, emptyNode, emptyText;
-    //     newNodes = node.transform('smartxml.split', {offset: args.offset});
-    //     [newNodes.first, newNodes.second].some(function(newNode) {
-    //         if(!(newNode.contents().length)) {
-    //             newNode.transform('smartxml.append', {text: ''});
-    //             return true; // break
-    //         }
-    //     });
-    //     return _.extend(newNodes, {emptyText: emptyText});
-    // },
-    impl: function(args) {
-        var node = this,
-            newNodes, emptyNode, emptyText;
-        newNodes = node.split({offset: args.offset});
-        [newNodes.first, newNodes.second].some(function(newNode) {
-            if(!(newNode.contents().length)) {
-                newNode.append({text: ''});
-                return true; // break
-            }
-        });
-        return _.extend(newNodes, {emptyText: emptyText});
-    },
-    getChangeRoot: function() {
-        return this.context.parent().parent();
-    }
-}));
-
+var parseXML = function(xml) {
+    return $($.trim(xml))[0];
+};

 
 

-ElementNode.prototype.transformations.register(transformations.createContextTransformation({
-    name: 'smartxml.setText',
-    impl: function(args) {
-        this.setText(args.text);
-    },
-    getChangeRoot: function() {
-        return this.context;
+var registerTransformation = function(desc, name, target) {
+    var Transformation = transformations.createContextTransformation(desc, name);
+    target[name] = function(args) {
+        var instance = this;
+        return instance.transform(Transformation, args);

     }
     }

-}));
-
+};

 
 

-var parseXML = function(xml) {
-    return $($.trim(xml))[0];
+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._nodeTransformations = {};

 };
 
 $.extend(Document.prototype, Backbone.Events, {
     ElementNodeFactory: ElementNode,
     TextNodeFactory: TextNode,
 };
 
 $.extend(Document.prototype, Backbone.Events, {
     ElementNodeFactory: ElementNode,
     TextNodeFactory: TextNode,

-    transformations: new transformations.TransformationStorage(),

 
     createDocumentNode: function(from) {
         if(!(from instanceof Node)) {
 
     createDocumentNode: function(from) {
         if(!(from instanceof Node)) {


@@ -587,7 +521,10 @@ $.extend(Document.prototype, Backbone.Events, {
         } else if(from.nodeType === Node.ELEMENT_NODE) {
             Factory = this.ElementNodeFactory;
         }
         } else if(from.nodeType === Node.ELEMENT_NODE) {
             Factory = this.ElementNodeFactory;
         }

-        return new Factory(from, this);
+        var toret = new Factory(from, this);
+        _.extend(toret, this._nodeMethods);
+        _.extend(toret, this._nodeTransformations);
+        return toret;

     },
 
     loadXML: function(xml, options) {
     },
 
     loadXML: function(xml, options) {


@@ -736,19 +673,71 @@ $.extend(Document.prototype, Backbone.Events, {
         return insertion.ofNode;
     },
 
         return insertion.ofNode;
     },
 

-    transform: function(transformation, args) {
-        console.log('transform');
-        var Transformation, toret;
-        if(typeof transformation === 'string') {
-            Transformation = this.transformations.get(transformation);
-            if(Transformation) {
-                transformation = new Transformation(this, this, args);
+    registerMethod: function(methodName, method) {
+        registerMethod(methodName, method, this);
+    },
+
+    registerNodeMethod: function(methodName, method) {
+        registerMethod(methodName, method, this._nodeMethods);
+    },
+
+    registerDocumentTransformation: function(desc, name) {
+        registerTransformation(desc, name, this);
+    },
+
+    registerNodeTransformation: function(desc, name) {
+        registerTransformation(desc, name, this._nodeTransformations);
+    },
+
+    registerExtension: function(extension) {
+        //debugger;
+        var doc = this,
+            existingPropertyNames = _.values(this);
+
+        ['document', 'documentNode'].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],
+                            operation;
+                        operation = {document: 'registerMethod', documentNode: 'registerNodeMethod'}[dstName];
+                        doc[operation](methodName, method);
+
+                    });
+                }
+
+                if(dstExtension.transformations) {
+                    _.pairs(dstExtension.transformations).forEach(function(pair) {
+                        var name = pair[0],
+                            desc = pair[1],
+                            operation;
+                        operation = {document: 'registerDocumentTransformation', documentNode: 'registerNodeTransformation'}[dstName];
+                        doc[operation](desc, name);
+                    });
+                }

             }
             }

-        } 
+        });
+    },
+
+    transform: function(Transformation, args) {
+        //console.log('transform');
+        var toret, transformation;
+
+        if(typeof Transformation === 'function') {
+            transformation = new Transformation(this, this, args);
+        } else {
+            transformation = Transformation;
+        }

         if(transformation) {
         if(transformation) {

+            this._transformationLevel++;

             toret = transformation.run();
             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 {
             this.redoStack = [];
             return toret;
         } else {


@@ -788,20 +777,6 @@ var defineDocumentProperties = function(doc, $document) {
     }, configurable: true});
 };
 
     }, configurable: true});
 };
 

-Document.prototype.transformations.register(transformations.createContextTransformation({
-    name: 'smartxml.wrapNodes',
-    // init: function() {
-
-    // },
-    // getChangeRoot: function() {
-    //     return this.context;
-    // },
-    impl: function(args) {
-        this.wrapNodes(args);
-    },
-
-}));
-

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


@@ -814,7 +789,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