fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
editor: don't show node pane and node family tree
[fnpeditor.git]
/
src
/
smartxml
/
smartxml.js
diff --git
a/src/smartxml/smartxml.js
b/src/smartxml/smartxml.js
index
013ea9a
..
505ab85
100644
(file)
--- a/
src/smartxml/smartxml.js
+++ b/
src/smartxml/smartxml.js
@@
-273,7
+273,7
@@
var registerMethod = function(methodName, method, target) {
var Document = function(xml, extensions) {
this.undoStack = [];
this.redoStack = [];
var Document = function(xml, extensions) {
this.undoStack = [];
this.redoStack = [];
- this._
transactionStack = []
;
+ this._
currentTransaction = null
;
this._transformationLevel = 0;
this._nodeMethods = {};
this._transformationLevel = 0;
this._nodeMethods = {};
@@
-476,6
+476,12
@@
$.extend(Document.prototype, Backbone.Events, {
transform: function(Transformation, args) {
var toret, transformation;
transform: function(Transformation, args) {
var toret, transformation;
+ if(!this._currentTransaction) {
+ return this.transaction(function() {
+ return this.transform(Transformation, args);
+ }, this);
+ }
+
if(typeof Transformation === 'function') {
transformation = new Transformation(this, this, args);
} else {
if(typeof Transformation === 'function') {
transformation = new Transformation(this, this, args);
} else {
@@
-491,11
+497,7
@@
$.extend(Document.prototype, Backbone.Events, {
},
function() {
if(this._transformationLevel === 1 && !this._undoInProgress) {
},
function() {
if(this._transformationLevel === 1 && !this._undoInProgress) {
- if(this._transactionInProgress) {
- this._transactionStack.push(transformation);
- } else {
- this.undoStack.push(new Transaction([transformation]));
- }
+ this._currentTransaction.pushTransformation(transformation);
}
if(!this._undoInProgress && this._transformationLevel === 1) {
this.redoStack = [];
}
if(!this._undoInProgress && this._transformationLevel === 1) {
this.redoStack = [];
@@
-556,27
+558,26
@@
$.extend(Document.prototype, Backbone.Events, {
}
},
}
},
- startTransaction: function() {
- if(this._
transactionInProgress
) {
+ startTransaction: function(
metadata
) {
+ if(this._
currentTransaction
) {
throw new Error('Nested transactions not supported!');
}
throw new Error('Nested transactions not supported!');
}
- this._
transactionInProgress = true
;
+ this._
currentTransaction = new Transaction([], metadata)
;
},
endTransaction: function() {
},
endTransaction: function() {
- if(!this._
transactionInProgress
) {
+ if(!this._
currentTransaction
) {
throw new Error('End of transaction requested, but there is no transaction in progress!');
}
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._currentTransaction = null;
},
},
- transaction: function(callback, context) {
+ transaction: function(callback, context
, metadata
) {
var toret;
var toret;
- this.startTransaction();
+ this.startTransaction(
metadata
);
toret = callback.call(context);
this.endTransaction();
return toret;
toret = callback.call(context);
this.endTransaction();
return toret;
@@
-607,9
+608,18
@@
$.extend(Document.prototype, Backbone.Events, {
}
});
}
});
-var Transaction = function(transformations) {
+var Transaction = function(transformations
, metadata
) {
this.transformations = transformations || [];
this.transformations = transformations || [];
+ this.metadata = metadata;
};
};
+$.extend(Transaction.prototype, {
+ pushTransformation: function(transformation) {
+ this.transformations.push(transformation);
+ },
+ hasTransformations: function() {
+ return this.transformations.length > 0;
+ }
+});
return {
return {