Merge in change to the Actions api

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

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index 663b332..a5a1abc 100644 (file)
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -4,8 +4,9 @@ define([
     'libs/backbone',
     'smartxml/events',
     'smartxml/transformations',
     'libs/backbone',
     'smartxml/events',
     'smartxml/transformations',

-    'smartxml/core'
-], function($, _, Backbone, events, transformations, coreTransformations) {
+    'smartxml/core',
+    'smartxml/fragments'
+], function($, _, Backbone, events, transformations, coreTransformations, fragments) {

     
 'use strict';
 /* globals Node */
     
 'use strict';
 /* globals Node */


@@ -16,12 +17,21 @@ var DocumentNode = function(nativeNode, document) {
         throw new Error('undefined document for a node');
     }
     this.document = document;
         throw new Error('undefined document for a node');
     }
     this.document = document;

+    this.object = {};

     this._setNativeNode(nativeNode);
 
 };
 
 $.extend(DocumentNode.prototype, {
 
     this._setNativeNode(nativeNode);
 
 };
 
 $.extend(DocumentNode.prototype, {
 

+    getProperty: function(propName) {
+        var toret = this.object[propName];
+        if(toret && _.isFunction(toret)) {
+            toret = toret.call(this);
+        }
+        return toret;
+    },
+

     transform: function(Transformation, args) {
         var transformation = new Transformation(this.document, this, args);
         return this.document.transform(transformation);
     transform: function(Transformation, args) {
         var transformation = new Transformation(this.document, this, args);
         return this.document.transform(transformation);


@@ -78,6 +88,14 @@ $.extend(DocumentNode.prototype, {
         return this.document.root.sameNode(this);
     },
 
         return this.document.root.sameNode(this);
     },
 

+    isInDocument: function() {
+        return this.document.containsNode(this);
+    },
+
+    isSiblingOf: function(node) {
+        return node && this.parent().sameNode(node.parent());
+    },
+

     sameNode: function(otherNode) {
         return !!(otherNode) && this.nativeNode === otherNode.nativeNode;
     },
     sameNode: function(otherNode) {
         return !!(otherNode) && this.nativeNode === otherNode.nativeNode;
     },


@@ -113,22 +131,27 @@ $.extend(DocumentNode.prototype, {
         return myIdx < parentContents.length - 1 ? parentContents[myIdx+1] : null;
     },
 
         return myIdx < parentContents.length - 1 ? parentContents[myIdx+1] : null;
     },
 

-    isSurroundedByTextElements: function() {
-        var prev = this.prev(),
-            next = this.next();
-        return prev && (prev.nodeType === Node.TEXT_NODE) && next && (next.nodeType === Node.TEXT_NODE);
+    isSurroundedByTextNodes: function() {
+        return this.isPrecededByTextNode() && this.isFollowedByTextNode();
+    },
+
+    isPrecededByTextNode: function() {
+        var prev = this.prev();
+        return prev && prev.nodeType === Node.TEXT_NODE;
+    },
+
+    isFollowedByTextNode: function() {
+        var next = this.next();
+        return next && next.nodeType === Node.TEXT_NODE;

     },
 
     triggerChangeEvent: function(type, metaData, origParent, nodeWasContained) {
         var node = (metaData && metaData.node) ? metaData.node : this,
             event = new events.ChangeEvent(type, $.extend({node: node}, metaData || {}));
         if(type === 'nodeDetached' || this.document.containsNode(event.meta.node)) {
     },
 
     triggerChangeEvent: function(type, metaData, origParent, nodeWasContained) {
         var node = (metaData && metaData.node) ? metaData.node : this,
             event = new events.ChangeEvent(type, $.extend({node: node}, metaData || {}));
         if(type === 'nodeDetached' || this.document.containsNode(event.meta.node)) {

-            if(type === 'nodeMoved') {
-                event.meta.parent = origParent;
-            }

             this.document.trigger('change', event);
         }
             this.document.trigger('change', event);
         }

-        if((type === 'nodeAdded' || type === 'nodeMoved') && !this.document.containsNode(this) && nodeWasContained) {
+        if(type === 'nodeAdded' && !this.document.containsNode(this) && nodeWasContained) {

              event = new events.ChangeEvent('nodeDetached', {node: node, parent: origParent});
              this.document.trigger('change', event);
         }
              event = new events.ChangeEvent('nodeDetached', {node: node, parent: origParent});
              this.document.trigger('change', event);
         }


@@ -139,10 +162,18 @@ $.extend(DocumentNode.prototype, {
     },
 
     getIndex: function() {
     },
 
     getIndex: function() {

+        var parent;
+

         if(this.isRoot()) {
             return 0;
         }
         if(this.isRoot()) {
             return 0;
         }

-        return this.parent().indexOf(this);
+
+        parent = this.parent();
+        return parent ? parent.indexOf(this) : undefined;
+    },
+
+    getNearestElementNode: function() {
+        return this.nodeType === Node.ELEMENT_NODE ? this : this.parent();

     }
 });
 
     }
 });
 


@@ -155,12 +186,16 @@ ElementNode.prototype = Object.create(DocumentNode.prototype);
 $.extend(ElementNode.prototype, {
     nodeType: Node.ELEMENT_NODE,
 
 $.extend(ElementNode.prototype, {
     nodeType: Node.ELEMENT_NODE,
 

-    setData: function(key, value) {
-        if(value !== undefined) {
-            this._$.data(key, value);
+    setData: function(arg1, arg2) {
+        if(arguments.length === 2) {
+            if(_.isUndefined(arg2)) {
+                this._$.removeData(arg1);
+            } else {
+                this._$.data(arg1, arg2);
+            }

         } else {
             this._$.removeData(_.keys(this._$.data()));
         } else {
             this._$.removeData(_.keys(this._$.data()));

-            this._$.data(key);
+            this._$.data(arg1);

         }
     },
 
         }
     },
 


@@ -210,6 +245,22 @@ $.extend(ElementNode.prototype, {
         return node && (node.nativeNode === this.nativeNode || node._$.parents().index(this._$) !== -1);
     },
 
         return node && (node.nativeNode === this.nativeNode || node._$.parents().index(this._$) !== -1);
     },
 

+    getLastTextNode: function() {
+        var contents = this.contents(),
+            toret;
+
+        contents.reverse().some(function(node) {
+            if(node.nodeType === Node.TEXT_NODE) {
+                toret = node;
+                return true;
+            }
+            toret = node.getLastTextNode();
+            return !!toret;
+        });
+
+        return toret;
+    },
+

     toXML: function() {
         var wrapper = $('<div>');
         wrapper.append(this._getXMLDOMToDump());
     toXML: function() {
         var wrapper = $('<div>');
         wrapper.append(this._getXMLDOMToDump());


@@ -234,6 +285,11 @@ $.extend(TextNode.prototype, {
         return this.nativeNode.data;
     },
 
         return this.nativeNode.data;
     },
 

+
+    containsNode: function() {
+        return false;
+    },
+

     triggerTextChangeEvent: function() {
         var event = new events.ChangeEvent('nodeTextChange', {node: this});
         this.document.trigger('change', event);
     triggerTextChangeEvent: function() {
         var event = new events.ChangeEvent('nodeTextChange', {node: this});
         this.document.trigger('change', event);


@@ -243,7 +299,7 @@ $.extend(TextNode.prototype, {
 
 var parseXML = function(xml) {
     var toret = $($.trim(xml));
 
 var parseXML = function(xml) {
     var toret = $($.trim(xml));

-    if(!toret.length) {
+    if(toret.length !== 1) {

         throw new Error('Unable to parse XML: ' + xml);
     }
     return toret[0];
         throw new Error('Unable to parse XML: ' + xml);
     }
     return toret[0];


@@ -291,7 +347,7 @@ var Document = function(xml, extensions) {
     this.loadXML(xml);
 };
 
     this.loadXML(xml);
 };
 

-$.extend(Document.prototype, Backbone.Events, {
+$.extend(Document.prototype, Backbone.Events, fragments, {

     ElementNodeFactory: ElementNode,
     TextNodeFactory: TextNode,
 
     ElementNodeFactory: ElementNode,
     TextNodeFactory: TextNode,
 


@@ -479,7 +535,7 @@ $.extend(Document.prototype, Backbone.Events, {
         if(!this._currentTransaction) {
             return this.transaction(function() {
                 return this.transform(Transformation, args);
         if(!this._currentTransaction) {
             return this.transaction(function() {
                 return this.transform(Transformation, args);

-            }, this);
+            }, {context: this});

         }
 
         if(typeof Transformation === 'function') {
         }
 
         if(typeof Transformation === 'function') {


@@ -522,7 +578,6 @@ $.extend(Document.prototype, Backbone.Events, {
 
             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.
 
             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;
                 transformations.some(function(t, idx) {
                     if(!t.undo && t.getChangeRoot().sameNode(doc.root)) {
                         stopAt = idx;


@@ -542,6 +597,7 @@ $.extend(Document.prototype, Backbone.Events, {
 
             this._undoInProgress = false;
             this.redoStack.push(transaction);
 
             this._undoInProgress = false;
             this.redoStack.push(transaction);

+            this.trigger('operationEnd');

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


@@ -553,6 +609,8 @@ $.extend(Document.prototype, Backbone.Events, {
             });
             this._transformationLevel--;
             this.undoStack.push(transaction);
             });
             this._transformationLevel--;
             this.undoStack.push(transaction);

+            this.trigger('operationEnd');
+

         }
     },
 
         }
     },
 


@@ -570,6 +628,7 @@ $.extend(Document.prototype, Backbone.Events, {
         }
         if(this._currentTransaction.hasTransformations()) {
             this.undoStack.push(this._currentTransaction);
         }
         if(this._currentTransaction.hasTransformations()) {
             this.undoStack.push(this._currentTransaction);

+            this.trigger('operationEnd');

         }
         this._currentTransaction = null;
     },
         }
         this._currentTransaction = null;
     },


@@ -581,25 +640,36 @@ $.extend(Document.prototype, Backbone.Events, {
         this.replaceRoot(this._rollbackBackup);
         this._rollbackBackup = null;
         this._currentTransaction = null;
         this.replaceRoot(this._rollbackBackup);
         this._rollbackBackup = null;
         this._currentTransaction = null;

+        this._transformationLevel = 0;

     },
 
     },
 

-    transaction: function(callback, context, metadata) {
+    transaction: function(callback, params) {

         var toret;
         var toret;

-        this.startTransaction(metadata);
+        params = params || {};
+        this.startTransaction(params.metadata);

         try {
         try {

-            toret = callback.call(context);
+            toret = callback.call(params.context || this);

         } catch(e) {
         } catch(e) {

+            if(params.error) {
+                params.error(e);
+            }

             this.rollbackTransaction();
             this.rollbackTransaction();

-            throw e;
+            return;

         }
         this.endTransaction();
         }
         this.endTransaction();

+        if(params.success) {
+            params.success(toret);
+        }

         return toret;
     },
 
     getNodeByPath: function(path) {
         var toret = this.root;
         return toret;
     },
 
     getNodeByPath: function(path) {
         var toret = this.root;

-        path.forEach(function(idx) {
+        path.some(function(idx) {

             toret = toret.contents()[idx];
             toret = toret.contents()[idx];

+            if(!toret) {
+                return true;
+            }

         });
         return toret;
     },
         });
         return toret;
     },


@@ -618,6 +688,13 @@ $.extend(Document.prototype, Backbone.Events, {
             }
             return $document[0];
         }, configurable: true});
             }
             return $document[0];
         }, configurable: true});

+    },
+
+    createFragment: function(Type, params) {
+        if(!Type.prototype instanceof fragments.Fragment) {
+            throw new Error('Can\'t create a fragment: `Type` is not a valid Fragment');
+        }
+        return new Type(this, params);

     }
 });
 
     }
 });