X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/cd6dc510f609585737898d9c6e74c7df51c00889..b9715b04ece107e8febac4105c4720461cf66c9c:/src/smartxml/smartxml.js?ds=sidebyside
diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index 013ea9a..749d4f4 100644
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -4,8 +4,9 @@ define([
'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 */
@@ -78,6 +79,14 @@ $.extend(DocumentNode.prototype, {
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;
},
@@ -113,10 +122,18 @@ $.extend(DocumentNode.prototype, {
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) {
@@ -143,6 +160,10 @@ $.extend(DocumentNode.prototype, {
return 0;
}
return this.parent().indexOf(this);
+ },
+
+ getNearestElementNode: function() {
+ return this.nodeType === Node.ELEMENT_NODE ? this : this.parent();
}
});
@@ -210,6 +231,22 @@ $.extend(ElementNode.prototype, {
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 = $('
');
wrapper.append(this._getXMLDOMToDump());
@@ -234,6 +271,11 @@ $.extend(TextNode.prototype, {
return this.nativeNode.data;
},
+
+ containsNode: function() {
+ return false;
+ },
+
triggerTextChangeEvent: function() {
var event = new events.ChangeEvent('nodeTextChange', {node: this});
this.document.trigger('change', event);
@@ -273,7 +315,7 @@ var registerMethod = function(methodName, method, target) {
var Document = function(xml, extensions) {
this.undoStack = [];
this.redoStack = [];
- this._transactionStack = [];
+ this._currentTransaction = null;
this._transformationLevel = 0;
this._nodeMethods = {};
@@ -291,7 +333,7 @@ var Document = function(xml, extensions) {
this.loadXML(xml);
};
-$.extend(Document.prototype, Backbone.Events, {
+$.extend(Document.prototype, Backbone.Events, fragments, {
ElementNodeFactory: ElementNode,
TextNodeFactory: TextNode,
@@ -476,6 +518,12 @@ $.extend(Document.prototype, Backbone.Events, {
transform: function(Transformation, args) {
var toret, transformation;
+ if(!this._currentTransaction) {
+ return this.transaction(function() {
+ return this.transform(Transformation, args);
+ }, {context: this});
+ }
+
if(typeof Transformation === 'function') {
transformation = new Transformation(this, this, args);
} else {
@@ -491,13 +539,7 @@ $.extend(Document.prototype, Backbone.Events, {
},
function() {
if(this._transformationLevel === 1 && !this._undoInProgress) {
- if(this._transactionInProgress) {
- this._transactionStack.push(transformation);
- } else {
- this.undoStack.push(new Transaction([transformation]));
- }
- }
- if(!this._undoInProgress && this._transformationLevel === 1) {
+ this._currentTransaction.pushTransformation(transformation);
this.redoStack = [];
}
}
@@ -542,6 +584,7 @@ $.extend(Document.prototype, Backbone.Events, {
this._undoInProgress = false;
this.redoStack.push(transaction);
+ this.trigger('operationEnd');
}
},
redo: function() {
@@ -553,32 +596,57 @@ $.extend(Document.prototype, Backbone.Events, {
});
this._transformationLevel--;
this.undoStack.push(transaction);
+ this.trigger('operationEnd');
+
}
},
- startTransaction: function() {
- if(this._transactionInProgress) {
+ startTransaction: function(metadata) {
+ if(this._currentTransaction) {
throw new Error('Nested transactions not supported!');
}
- this._transactionInProgress = true;
+ this._rollbackBackup = this.root.clone();
+ this._currentTransaction = new Transaction([], metadata);
},
endTransaction: function() {
- if(!this._transactionInProgress) {
+ if(!this._currentTransaction) {
throw new Error('End of transaction requested, but there is no transaction in progress!');
}
- this._transactionInProgress = false;
- if(this._transactionStack.length) {
- this.undoStack.push(new Transaction(this._transactionStack));
- this._transactionStack = [];
+ if(this._currentTransaction.hasTransformations()) {
+ this.undoStack.push(this._currentTransaction);
+ this.trigger('operationEnd');
+ }
+ this._currentTransaction = null;
+ },
+
+ rollbackTransaction: function() {
+ if(!this._currentTransaction) {
+ throw new Error('Transaction rollback requested, but there is no transaction in progress!');
}
+ this.replaceRoot(this._rollbackBackup);
+ this._rollbackBackup = null;
+ this._currentTransaction = null;
+ this._transformationLevel = 0;
},
- transaction: function(callback, context) {
+ transaction: function(callback, params) {
var toret;
- this.startTransaction();
- toret = callback.call(context);
+ params = params || {};
+ this.startTransaction(params.metadata);
+ try {
+ toret = callback.call(params.context || this);
+ } catch(e) {
+ if(params.error) {
+ params.error(e);
+ }
+ this.rollbackTransaction();
+ return;
+ }
this.endTransaction();
+ if(params.success) {
+ params.success(toret);
+ }
return toret;
},
@@ -604,12 +672,28 @@ $.extend(Document.prototype, Backbone.Events, {
}
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);
}
});
-var Transaction = function(transformations) {
+var Transaction = function(transformations, metadata) {
this.transformations = transformations || [];
+ this.metadata = metadata;
};
+$.extend(Transaction.prototype, {
+ pushTransformation: function(transformation) {
+ this.transformations.push(transformation);
+ },
+ hasTransformations: function() {
+ return this.transformations.length > 0;
+ }
+});
return {