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 bb6258e..831a96a 100644 (file)
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -38,12 +38,8 @@ var DocumentNode = function(nativeNode, document) {
 
 $.extend(DocumentNode.prototype, {
 
-    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);
     },
 
@@ -380,63 +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;
-//     }
-// }));
-
-// 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() {
-//         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);
 };
@@ -524,60 +463,16 @@ $.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();
-//     },
-//     isAllowed: function(args) {
-//         var parent = this.parent();
-//         return !!(parent && parent.parent());
-//     }
-// }));
-
-
-// ElementNode.prototype.transformations.register(transformations.createContextTransformation({
-//     name: 'smartxml.setText',
-//     impl: function(args) {
-//         this.setText(args.text);
-//     },
-//     getChangeRoot: function() {
-//         return this.context;
-//     }
-// }));
-
-
 var parseXML = function(xml) {
     return $($.trim(xml))[0];
 };
 
 var registerTransformation = function(desc, name, target) {
     var Transformation = transformations.createContextTransformation(desc, name);
-    target.register(Transformation);
+    target[name] = function(args) {
+        var instance = this;
+        return instance.transform(Transformation, args);
+    }
 };
 
 var registerMethod = function(methodName, method, target) {
@@ -596,10 +491,9 @@ var Document = function(xml) {
     this.undoStack = [];
     this.redoStack = [];
     this._transformationLevel = 0;
-    this.transformations = new transformations.TransformationStorage();
     
     this._nodeMethods = {};
-    this._nodeTransformations = new transformations.TransformationStorage();
+    this._nodeTransformations = {};
 };
 
 $.extend(Document.prototype, Backbone.Events, {
@@ -629,7 +523,7 @@ $.extend(Document.prototype, Backbone.Events, {
         }
         var toret = new Factory(from, this);
         _.extend(toret, this._nodeMethods);
-        toret.transformations = this._nodeTransformations;
+        _.extend(toret, this._nodeTransformations);
         return toret;
     },
 
@@ -788,7 +682,7 @@ $.extend(Document.prototype, Backbone.Events, {
     },
 
     registerDocumentTransformation: function(desc, name) {
-        registerTransformation(desc, name, this.transformations);
+        registerTransformation(desc, name, this);
     },
 
     registerNodeTransformation: function(desc, name) {
@@ -827,15 +721,15 @@ $.extend(Document.prototype, Backbone.Events, {
         });
     },
 
-    transform: function(transformation, args) {
+    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);
-            }
-        } 
+        var toret, transformation;
+
+        if(typeof Transformation === 'function') {
+            transformation = new Transformation(this, this, args);
+        } else {
+            transformation = Transformation;
+        }
         if(transformation) {
             this._transformationLevel++;
             toret = transformation.run();
@@ -883,20 +777,6 @@ var defineDocumentProperties = function(doc, $document) {
     }, 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) {