prevent empty span in a new node

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

diff --git a/src/smartxml/transformations.js b/src/smartxml/transformations.js
index 0d2012e..4a8e5a8 100644 (file)
--- a/src/smartxml/transformations.js
+++ b/src/smartxml/transformations.js
@@ -5,6 +5,7 @@ define(function(require) {
 var _ = require('libs/underscore'),
     toret = {};
 
 var _ = require('libs/underscore'),
     toret = {};
 

+

 var getTransDesc = function(desc) {
     if(typeof desc === 'function') {
         desc = {impl: desc};
 var getTransDesc = function(desc) {
     if(typeof desc === 'function') {
         desc = {impl: desc};


@@ -20,28 +21,7 @@ toret.createGenericTransformation = function(desc, name) {
     
     var GenericTransformation = function(document, args) {
         this.args = args || [];
     
     var GenericTransformation = function(document, args) {
         this.args = args || [];

-

         var transformation = this;
         var transformation = this;

-        // _.keys(this.args).forEach(function(key) {
-        //     if(transformation.args[key].nodeType) { //@@ change to instanceof check, fix circular dependency
-        //         var value = transformation.args[key],
-        //             path = value.getPath();
-        //         Object.defineProperty(transformation.args, key, {
-        //             get: function() {
-        //                 if(transformation.hasRun) {
-        //                     //console.log('returning via path');
-        //                     return transformation.document.getNodeByPath(path);
-        //                 } else {
-        //                     //console.log('returning original arg');
-        //                     return value;
-
-        //                 }
-        //             }
-        //         });
-        //     }
-        // });
-
-        // potem spr na dotychczasowych undo/redo tests;

         
         var patchObject = function(obj, depth) {
             depth = _.isNumber(depth) ? depth : 1;
         
         var patchObject = function(obj, depth) {
             depth = _.isNumber(depth) ? depth : 1;


@@ -49,20 +29,10 @@ toret.createGenericTransformation = function(desc, name) {
                 return;
             }
             _.keys(obj).forEach(function(key) {
                 return;
             }
             _.keys(obj).forEach(function(key) {

-                var value = obj[key],
-                    path;
+                var value = obj[key];

                 if(value) {
                     if(value.nodeType) {
                 if(value) {
                     if(value.nodeType) {

-                        path = value.getPath();
-                        Object.defineProperty(obj, key, {
-                            get: function() {
-                                if(transformation.hasRun && path) {
-                                    return transformation.document.getNodeByPath(path);
-                                } else {
-                                    return value;
-                                }
-                            }
-                        });
+                        transformation.wrapNodeProperty(obj, key);

                     } else if(_.isObject(value)) {
                         patchObject(value, depth+1);
                     }
                     } else if(_.isObject(value)) {
                         patchObject(value, depth+1);
                     }


@@ -71,19 +41,9 @@ toret.createGenericTransformation = function(desc, name) {
         };
 
         this.args.forEach(function(arg, idx, args) {
         };
 
         this.args.forEach(function(arg, idx, args) {

-            var path;

             if(arg) {
                 if(arg.nodeType) { // ~
             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;
-                            }
-                        }
-                    });
+                    transformation.wrapNodeProperty(args, idx);

                 } else if(_.isObject(arg)) {
                     patchObject(arg);
                 }
                 } else if(_.isObject(arg)) {
                     patchObject(arg);
                 }


@@ -91,7 +51,7 @@ toret.createGenericTransformation = function(desc, name) {
         });
 
         this.document = document;
         });
 
         this.document = document;

-        this.hasRun = false;
+        this.runCount = 0;

         if(desc.init) {
             desc.init.call(this);
         }
         if(desc.init) {
             desc.init.call(this);
         }


@@ -113,18 +73,38 @@ toret.createGenericTransformation = function(desc, name) {
             }
             var argsToPass = desc.undo ? [this].concat(this.args) : this.args;
             var toret = desc.impl.apply(this.context, argsToPass);
             }
             var argsToPass = desc.undo ? [this].concat(this.args) : this.args;
             var toret = desc.impl.apply(this.context, argsToPass);

-            this.hasRun = true;
+            this.runCount++;

             return toret;
         },
         undo: function() {
             if(desc.undo) {
                 desc.undo.call(this.context, this);
             return toret;
         },
         undo: function() {
             if(desc.undo) {
                 desc.undo.call(this.context, this);

+                this.runCount++;

             } else {
                 this.document.getNodeByPath(this.changeRootPath).replaceWith(this.snapshot);
             }
         },
         getChangeRoot: desc.getChangeRoot || function() {
             return this.document.root;
             } else {
                 this.document.getNodeByPath(this.changeRootPath).replaceWith(this.snapshot);
             }
         },
         getChangeRoot: desc.getChangeRoot || function() {
             return this.document.root;

+        },
+        wrapNodeProperty: function(object, propName, value) {
+            var transformation = this,
+                lastRunNumber = 0,
+                path;
+            
+            value = value || object[propName];
+            if(value && value.nodeType) {
+                path = value.getPath();
+                Object.defineProperty(object, propName, {
+                    get: function() {
+                        if((lastRunNumber !== transformation.runCount) && path) {
+                            value = transformation.document.getNodeByPath(path);
+                            lastRunNumber = transformation.runCount;
+                        }
+                        return value;
+                    }
+                });
+            }

         }
     });
 
         }
     });
 


@@ -140,17 +120,7 @@ toret.createContextTransformation = function(desc, name) {
         if(document === object) {
             this.context = document;
         } else {
         if(document === object) {
             this.context = document;
         } else {

-            var contextPath = object.getPath(),
-                transformation = this;
-            Object.defineProperty(this, 'context', {
-                get: function() {
-                    if(transformation.hasRun) {
-                        return transformation.document.getNodeByPath(contextPath);
-                    } else {
-                        return object;
-                    }
-                }
-            });
+            this.wrapNodeProperty(this, 'context', object);

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