editor: handle invalid xml sent as a wlxml document

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

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index 60ed6a0..acbe04d 100644 (file)
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -10,9 +10,6 @@ define([
 'use strict';
 /* globals Node */
 
 'use strict';
 /* globals Node */
 

-var TEXT_NODE = Node.TEXT_NODE;
-
-

 
 var DocumentNode = function(nativeNode, document) {
     if(!document) {
 
 var DocumentNode = function(nativeNode, document) {
     if(!document) {


@@ -37,17 +34,14 @@ $.extend(DocumentNode.prototype, {
 
     clone: function() {
         var clone = this._$.clone(true, true);
 
     clone: function() {
         var clone = this._$.clone(true, true);

-        // clone.find('*').addBack().each(function() {
-        //     var n = $(this);
-        //     if(n.data('canvasElement')) {
-        //         n.data('canvasElement', $.extend(true, {}, n.data('canvasElement')));
-        //         n.data('canvasElement').$element = n.data('canvasElement').$element.clone(true, true);
-        //     }
-        // });

         return this.document.createDocumentNode(clone[0]);
     },
 
     getPath: function(ancestor) {
         return this.document.createDocumentNode(clone[0]);
     },
 
     getPath: function(ancestor) {

+        if(!(this.document.containsNode(this))) {
+            return null;
+        }
+

         var nodePath = [this].concat(this.parents()),
             toret, idx;
         ancestor = ancestor || this.document.root;
         var nodePath = [this].concat(this.parents()),
             toret, idx;
         ancestor = ancestor || this.document.root;


@@ -228,18 +222,21 @@ $.extend(TextNode.prototype, {
 
 
 var parseXML = function(xml) {
 
 
 var parseXML = function(xml) {

-    return $($.trim(xml))[0];
+    var toret = $($.trim(xml));
+    if(!toret.length) {
+        throw new Error('Unable to parse XML: ' + xml);
+    }
+    return toret[0];
+

 };
 
 var registerTransformation = function(desc, name, target) {
     var Transformation = transformations.createContextTransformation(desc, name);
 };
 
 var registerTransformation = function(desc, name, target) {
     var Transformation = transformations.createContextTransformation(desc, name);

-    //+ to sie powinna nazywac registerTransformationFromDesc or sth
-    //+ ew. spr czy nie override (tylko jesli powyzej sa prototypy to trudno do nich dojsc)

     target[name] = function() {
         var instance = this,
             args = Array.prototype.slice.call(arguments, 0);
         return instance.transform(Transformation, args);
     target[name] = function() {
         var instance = this,
             args = Array.prototype.slice.call(arguments, 0);
         return instance.transform(Transformation, args);

-    }
+    };

 };
 
 var registerMethod = function(methodName, method, target) {
 };
 
 var registerMethod = function(methodName, method, target) {


@@ -257,6 +254,7 @@ var Document = function(xml) {
     this.loadXML(xml);
     this.undoStack = [];
     this.redoStack = [];
     this.loadXML(xml);
     this.undoStack = [];
     this.redoStack = [];

+    this._transactionStack = [];

     this._transformationLevel = 0;
     
     this._nodeMethods = {};
     this._transformationLevel = 0;
     
     this._nodeMethods = {};


@@ -265,6 +263,8 @@ var Document = function(xml) {
     this._nodeTransformations = {};
     this._textNodeTransformations = {};
     this._elementNodeTransformations = {};
     this._nodeTransformations = {};
     this._textNodeTransformations = {};
     this._elementNodeTransformations = {};

+    
+    this.registerExtension(coreTransformations);

 };
 
 $.extend(Document.prototype, Backbone.Events, {
 };
 
 $.extend(Document.prototype, Backbone.Events, {


@@ -273,17 +273,25 @@ $.extend(Document.prototype, Backbone.Events, {
 
     createDocumentNode: function(from) {
         if(!(from instanceof Node)) {
 
     createDocumentNode: function(from) {
         if(!(from instanceof Node)) {

-            if(from.text !== undefined) {
-                /* globals document */
-                from = document.createTextNode(from.text);
+            if(typeof from === 'string') {
+                from = parseXML(from);
+                this.normalizeXML(from);

             } else {
             } else {

-                var node = $('<' + from.tagName + '>');
-
-                _.keys(from.attrs || {}).forEach(function(key) {
-                    node.attr(key, from.attrs[key]);
-                });
+                if(from.text !== undefined) {
+                    /* globals document */
+                    from = document.createTextNode(from.text);
+                } else {
+                    if(!from.tagName) {
+                        throw new Error('tagName missing');
+                    }
+                    var node = $('<' + from.tagName + '>');
+
+                    _.keys(from.attrs || {}).forEach(function(key) {
+                        node.attr(key, from.attrs[key]);
+                    });

 
 

-                from = node[0];
+                    from = node[0];
+                }

             }
         }
         var Factory, typeMethods, typeTransformations;
             }
         }
         var Factory, typeMethods, typeTransformations;


@@ -314,11 +322,16 @@ $.extend(Document.prototype, Backbone.Events, {
     loadXML: function(xml, options) {
         options = options || {};
         this._defineDocumentProperties($(parseXML(xml)));
     loadXML: function(xml, options) {
         options = options || {};
         this._defineDocumentProperties($(parseXML(xml)));

+        this.normalizeXML(this.dom);

         if(!options.silent) {
             this.trigger('contentSet');
         }
     },
 
         if(!options.silent) {
             this.trigger('contentSet');
         }
     },
 

+    normalizeXML: function(nativeNode) {
+        void(nativeNode); // noop
+    },
+

     toXML: function() {
         return this.root.toXML();
     },
     toXML: function() {
         return this.root.toXML();
     },


@@ -347,7 +360,6 @@ $.extend(Document.prototype, Backbone.Events, {
     },
 
     trigger: function() {
     },
 
     trigger: function() {

-        //console.log('trigger: ' + arguments[0] + (arguments[1] ? ', ' + arguments[1].type : ''));

         Backbone.Events.trigger.apply(this, arguments);
     },
 
         Backbone.Events.trigger.apply(this, arguments);
     },
 


@@ -386,9 +398,7 @@ $.extend(Document.prototype, Backbone.Events, {
     },
 
     registerExtension: function(extension) {
     },
 
     registerExtension: function(extension) {

-        //debugger;
-        var doc = this,
-            existingPropertyNames = _.values(this);
+        var doc = this;

 
         ['document', 'documentNode', 'elementNode', 'textNode'].forEach(function(dstName) {
             var dstExtension = extension[dstName];
 
         ['document', 'documentNode', 'elementNode', 'textNode'].forEach(function(dstName) {
             var dstExtension = extension[dstName];


@@ -415,11 +425,8 @@ $.extend(Document.prototype, Backbone.Events, {
     },
 
     transform: function(Transformation, args) {
     },
 
     transform: function(Transformation, args) {

-        //console.log('transform');

         var toret, transformation;
 
         var toret, transformation;
 

-        // ref: odrebnie przygotowanie transformacji, odrebnie jej wykonanie (to pierwsze to analog transform z node)
-

         if(typeof Transformation === 'function') {
             transformation = new Transformation(this, this, args);
         } else {
         if(typeof Transformation === 'function') {
             transformation = new Transformation(this, this, args);
         } else {


@@ -427,30 +434,92 @@ $.extend(Document.prototype, Backbone.Events, {
         }
         if(transformation) {
             this._transformationLevel++;
         }
         if(transformation) {
             this._transformationLevel++;

-            toret = transformation.run();
-            if(this._transformationLevel === 1) {
-                this.undoStack.push(transformation);
+            toret = transformation.run({beUndoable:this._transformationLevel === 1});
+            if(this._transformationLevel === 1 && !this._undoInProgress) {
+                if(this._transactionInProgress) {
+                    this._transactionStack.push(transformation);
+                } else {
+                    this.undoStack.push(transformation);
+                }
+            }
+            if(!this._undoInProgress && this._transformationLevel === 1) {
+                this.redoStack = [];

             }
             this._transformationLevel--;
             }
             this._transformationLevel--;

-            //console.log('clearing redo stack');
-            this.redoStack = [];

             return toret;
         } else {
             throw new Error('Transformation ' + transformation + ' doesn\'t exist!');
         }
     },
     undo: function() {
             return toret;
         } else {
             throw new Error('Transformation ' + transformation + ' doesn\'t exist!');
         }
     },
     undo: function() {

-        var transformation = this.undoStack.pop();
-        if(transformation) {
-            transformation.undo();
-            this.redoStack.push(transformation);
+        var transformationObject = this.undoStack.pop(),
+            doc = this,
+            transformations, stopAt;
+
+        if(transformationObject) {
+            this._undoInProgress = true;
+
+            if(_.isArray(transformationObject)) {
+                // We will modify this array in a minute so make sure we work on a copy.
+                transformations = transformationObject.slice(0);
+            } else {
+                // Lets normalize single transformation to a transaction containing one transformation.
+                transformations = [transformationObject];
+            }
+
+            if(transformations.length > 1) {
+                // In case of real transactions we don't want to run undo on all of transformations if we don't have to.
+                stopAt = undefined;
+                transformations.some(function(t, idx) {
+                    if(!t.undo && t.getChangeRoot().sameNode(doc.root)) {
+                        stopAt = idx;
+                        return true; //break
+                    }
+                });
+                if(stopAt !== undefined) {
+                    // We will get away with undoing only this transformations as the one at stopAt reverses the whole document.
+                    transformations = transformations.slice(0, stopAt+1);
+                }
+            }
+
+            transformations.reverse();
+            transformations.forEach(function(t) {
+                t.undo();
+            });
+
+            this._undoInProgress = false;
+            this.redoStack.push(transformationObject);

         }
     },
     redo: function() {
         }
     },
     redo: function() {

-        var transformation = this.redoStack.pop();
-        if(transformation) {
-            transformation.run();
-            this.undoStack.push(transformation);
+        var transformationObject = this.redoStack.pop(),
+            transformations;
+        if(transformationObject) {
+            this._transformationLevel++;
+            transformations = _.isArray(transformationObject) ? transformationObject : [transformationObject];
+            transformations.forEach(function(t) {
+                t.run({beUndoable: true});
+            });
+            this._transformationLevel--;
+            this.undoStack.push(transformationObject);
+        }
+    },
+
+    startTransaction: function() {
+        if(this._transactionInProgress) {
+            throw new Error('Nested transactions not supported!');
+        }
+        this._transactionInProgress = true;
+    },
+
+    endTransaction: function() {
+        if(!this._transactionInProgress) {
+            throw new Error('End of transaction requested, but there is no transaction in progress!');
+        }
+        this._transactionInProgress = false;
+        if(this._transactionStack.length) {
+            this.undoStack.push(this._transactionStack);
+            this._transactionStack = [];

         }
     },
 
         }
     },
 


@@ -477,7 +546,6 @@ $.extend(Document.prototype, Backbone.Events, {
 return {
     documentFromXML: function(xml) {
         var doc = new Document(xml);
 return {
     documentFromXML: function(xml) {
         var doc = new Document(xml);

-        doc.registerExtension(coreTransformations);

         return doc;
     },
 
         return doc;
     },