editor: canvas fix - check for the case when mutation concerns already detached text...

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

diff --git a/src/smartxml/transformations.js b/src/smartxml/transformations.js
index 3b1073f..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;


@@ -71,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);
         }


@@ -93,12 +73,13 @@ 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);
             }
             } else {
                 this.document.getNodeByPath(this.changeRootPath).replaceWith(this.snapshot);
             }


@@ -108,6 +89,7 @@ toret.createGenericTransformation = function(desc, name) {
         },
         wrapNodeProperty: function(object, propName, value) {
             var transformation = this,
         },
         wrapNodeProperty: function(object, propName, value) {
             var transformation = this,

+                lastRunNumber = 0,

                 path;
             
             value = value || object[propName];
                 path;
             
             value = value || object[propName];


@@ -115,11 +97,11 @@ toret.createGenericTransformation = function(desc, name) {
                 path = value.getPath();
                 Object.defineProperty(object, propName, {
                     get: function() {
                 path = value.getPath();
                 Object.defineProperty(object, propName, {
                     get: function() {

-                        if(transformation.hasRun && path) {
-                            return transformation.document.getNodeByPath(path);
-                        } else {
-                            return value;
+                        if((lastRunNumber !== transformation.runCount) && path) {
+                            value = transformation.document.getNodeByPath(path);
+                            lastRunNumber = transformation.runCount;

                         }
                         }

+                        return value;

                     }
                 });
             }
                     }
                 });
             }