fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
smartxml: Stop using separate transactionStack, use Transaction object instead
[fnpeditor.git]
/
src
/
smartxml
/
smartxml.js
diff --git
a/src/smartxml/smartxml.js
b/src/smartxml/smartxml.js
index
013ea9a
..
ab4d6fb
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 = {};
@@
-491,8
+491,8
@@
$.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);
+ if(this._
currentTransaction
) {
+ this._
currentTransaction.pushTransformation
(transformation);
} else {
this.undoStack.push(new Transaction([transformation]));
}
} else {
this.undoStack.push(new Transaction([transformation]));
}
@@
-557,21
+557,20
@@
$.extend(Document.prototype, Backbone.Events, {
},
startTransaction: function() {
},
startTransaction: function() {
- if(this._
transactionInProgress
) {
+ if(this._
currentTransaction
) {
throw new Error('Nested transactions not supported!');
}
throw new Error('Nested transactions not supported!');
}
- this._
transactionInProgress = true
;
+ this._
currentTransaction = new Transaction([])
;
},
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) {
@@
-610,6
+609,14
@@
$.extend(Document.prototype, Backbone.Events, {
var Transaction = function(transformations) {
this.transformations = transformations || [];
};
var Transaction = function(transformations) {
this.transformations = transformations || [];
};
+$.extend(Transaction.prototype, {
+ pushTransformation: function(transformation) {
+ this.transformations.push(transformation);
+ },
+ hasTransformations: function() {
+ return this.transformations.length > 0;
+ }
+});
return {
return {