editor: fix resolving cursor destination after breaking content at the edge of text...

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

diff --git a/src/smartxml/transformations.js b/src/smartxml/transformations.js
index 5f0756c..053ed10 100644 (file)
--- a/src/smartxml/transformations.js
+++ b/src/smartxml/transformations.js
@@ -5,12 +5,12 @@ define(function(require) {
 var _ = require('libs/underscore'),
     toret = {};
 
 var _ = require('libs/underscore'),
     toret = {};
 

-var getTransDesc = function(desc, name) {
+var getTransDesc = function(desc) {

     if(typeof desc === 'function') {
         desc = {impl: desc};
     }
     if(!desc.impl) {
     if(typeof desc === 'function') {
         desc = {impl: desc};
     }
     if(!desc.impl) {

-        throw new Error('Got transformation description without implementation.')
+        throw new Error('Got transformation description without implementation.');

     }
     return desc;
 };
     }
     return desc;
 };


@@ -42,18 +42,40 @@ toret.createGenericTransformation = function(desc, name) {
         // });
 
         // potem spr na dotychczasowych undo/redo tests;
         // });
 
         // potem spr na dotychczasowych undo/redo tests;

+        
+

         this.args.forEach(function(arg, idx, args) {
         this.args.forEach(function(arg, idx, args) {

-            if(arg.nodeType) { // ~
-                var path = arg.getPath();
-                Object.defineProperty(args, idx, {
-                    get: function() {
-                        if(transformation.hasRun) {
-                            return transformation.document.getNodeByPath(path);
-                        } else {
-                            return arg;
+            var path;
+            if(arg) {
+                if(arg.nodeType) { // ~
+                    path = arg.getPath();
+                    Object.defineProperty(args, idx, {
+                        get: function() {
+                            if(transformation.hasRun && path) {
+                                return transformation.document.getNodeByPath(path);
+                            } else {
+                                return arg;
+                            }

                         }
                         }

-                    }
-                });
+                    });
+                } else if(_.isObject(arg)) {
+                    _.keys(arg).forEach(function(key) {
+                        var value = arg[key],
+                            path;
+                        if(value && value.nodeType) {
+                            path = value.getPath();
+                            Object.defineProperty(arg, key, {
+                                get: function() {
+                                    if(transformation.hasRun && path) {
+                                        return transformation.document.getNodeByPath(path);
+                                    } else {
+                                        return value;
+                                    }
+                                }
+                            });
+                        }
+                    });
+                }

             }
         });
 
             }
         });
 


@@ -65,35 +87,40 @@ toret.createGenericTransformation = function(desc, name) {
     };
     _.extend(GenericTransformation.prototype, {
         name: name,
     };
     _.extend(GenericTransformation.prototype, {
         name: name,

-        run: function() {
+        run: function(options) {

             var changeRoot;
             var changeRoot;

-            if(!desc.undo) {
-                changeRoot = desc.getChangeRoot ? desc.getChangeRoot.call(this) : this.document.root;
-                this.snapshot = changeRoot.clone();
+            if(!desc.undo && options.beUndoable) {
+                changeRoot = this.getChangeRoot();
+                if(!changeRoot) {
+                     throw new Error(
+                         'Transformation {name} returned invalid change root value'
+                         .replace('{name}', name)
+                     );
+                }

                 this.changeRootPath = changeRoot.getPath();
                 this.changeRootPath = changeRoot.getPath();

+                this.snapshot = changeRoot.clone();

             }
             }

-            //var toret = desc.impl.call(this.context, this.args); // a argumenty do metody?
-            var toret = desc.impl.apply(this.context, this.args);
+            var argsToPass = desc.undo ? [this].concat(this.args) : this.args;
+            var toret = desc.impl.apply(this.context, argsToPass);

             this.hasRun = true;
             return toret;
         },
         undo: function() {
             if(desc.undo) {
             this.hasRun = true;
             return toret;
         },
         undo: function() {
             if(desc.undo) {

-                desc.undo.call(this.context);
+                desc.undo.call(this.context, this);

             } else {
                 this.document.getNodeByPath(this.changeRootPath).replaceWith(this.snapshot);
             }
         },
             } else {
                 this.document.getNodeByPath(this.changeRootPath).replaceWith(this.snapshot);
             }
         },

+        getChangeRoot: desc.getChangeRoot || function() {
+            return this.document.root;
+        }

     });
 
     return GenericTransformation;
 };
     });
 
     return GenericTransformation;
 };

-// var T = createGenericTransformation({impl: function() {}});
-// var t = T(doc, {a:1,b:2,c3:3});
-

 
 toret.createContextTransformation = function(desc, name) {
 
 toret.createContextTransformation = function(desc, name) {

-    // mozna sie pozbyc przez przeniesienie object/context na koniec argumentow konstruktora generic transformation

     var GenericTransformation = toret.createGenericTransformation(desc, name);
 
     var ContextTransformation = function(document, object, args) {
     var GenericTransformation = toret.createGenericTransformation(desc, name);
 
     var ContextTransformation = function(document, object, args) {


@@ -101,78 +128,24 @@ toret.createContextTransformation = function(desc, name) {
 
         if(document === object) {
             this.context = document;
 
         if(document === object) {
             this.context = document;

-        } else {      
+        } else {

             var contextPath = object.getPath(),
                 transformation = this;
             Object.defineProperty(this, 'context', {
                 get: function() {
             var contextPath = object.getPath(),
                 transformation = this;
             Object.defineProperty(this, 'context', {
                 get: function() {

-                    // todo: to jakos inaczej, bo np. this.context w undo transformacji before to juz nie ten sam obiekt
-                    // moze transformacja powinna zwracac zmodyfikowana sciezke do obiektu po dzialaniu run?
-                    

                     if(transformation.hasRun) {
                     if(transformation.hasRun) {

-                        //console.log('returning via path');

                         return transformation.document.getNodeByPath(contextPath);
                     } else {
                         return transformation.document.getNodeByPath(contextPath);
                     } else {

-                        //console.log('returning original arg');

                         return object;
                         return object;

-

                     }
                 }
             });
         }
                     }
                 }
             });
         }

-    }
+    };

     ContextTransformation.prototype = Object.create(GenericTransformation.prototype);
     return ContextTransformation;
     ContextTransformation.prototype = Object.create(GenericTransformation.prototype);
     return ContextTransformation;

-}
-// var T = createContextTransformation({impl: function() {}});
-// var t = T(doc, node, {a:1,b:2,c3:3});
-///
-
-
-
-toret.TransformationStorage = function() {
-    this._transformations = {};

 };
 
 };
 

-_.extend(toret.TransformationStorage.prototype, {
-    
-    register: function(Transformation) {
-        var list = (this._transformations[Transformation.prototype.name] = this._transformations[Transformation.prototype.name] || []);
-        list.push(Transformation);
-    },
-
-    get: function(name) {
-        var transformations = this._transformations[name];
-        if(!transformations) {
-            throw new Error('Transformation "' + name + '" not found!');
-        }
-        // na razie zwraca pierwsza
-        return transformations[0];
-    }
-});
-
-
-
-// var registerTransformationFromMethod = (object, methodName, desc) {
-//         if(!object[methodName]) {
-//             throw new Exeption('Cannot register transformation from unknown method ' + methodName + ' on ' + object);
-//         }
-//         desc.impl = object[name];
-//         Transformation = createContextTransformation(desc);
-//         object.prototype.registerContextTransformation(name, createContextTransformation(method));
-// };
-
-
-// registerTransformationFromMethod(ElementNode, 'setAttr', {
-//     impl: function(args) {
-//         this.setAttr(args.name, args.value);
-//     },
-//     getChangeRoot: function() {
-//         return this.context;
-//     }
-
-// });
-

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