fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging in actions branch
[fnpeditor.git]
/
src
/
smartxml
/
smartxml.js
diff --git
a/src/smartxml/smartxml.js
b/src/smartxml/smartxml.js
index
ab4d6fb
..
3ee49b7
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 */
@@
-78,6
+79,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;
},
@@
-143,6
+152,10
@@
$.extend(DocumentNode.prototype, {
return 0;
}
return this.parent().indexOf(this);
return 0;
}
return this.parent().indexOf(this);
+ },
+
+ getNearestElementNode: function() {
+ return this.nodeType === Node.ELEMENT_NODE ? this : this.parent();
}
});
}
});
@@
-210,6
+223,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
+263,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);
@@
-291,7
+325,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,
@@
-476,6
+510,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);
+ }, {context: this});
+ }
+
if(typeof Transformation === 'function') {
transformation = new Transformation(this, this, args);
} else {
if(typeof Transformation === 'function') {
transformation = new Transformation(this, this, args);
} else {
@@
-491,13
+531,7
@@
$.extend(Document.prototype, Backbone.Events, {
},
function() {
if(this._transformationLevel === 1 && !this._undoInProgress) {
},
function() {
if(this._transformationLevel === 1 && !this._undoInProgress) {
- if(this._currentTransaction) {
- this._currentTransaction.pushTransformation(transformation);
- } else {
- this.undoStack.push(new Transaction([transformation]));
- }
- }
- if(!this._undoInProgress && this._transformationLevel === 1) {
+ this._currentTransaction.pushTransformation(transformation);
this.redoStack = [];
}
}
this.redoStack = [];
}
}
@@
-542,6
+576,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,14
+588,17
@@
$.extend(Document.prototype, Backbone.Events, {
});
this._transformationLevel--;
this.undoStack.push(transaction);
});
this._transformationLevel--;
this.undoStack.push(transaction);
+ this.trigger('operationEnd');
+
}
},
}
},
- startTransaction: function() {
+ startTransaction: function(
metadata
) {
if(this._currentTransaction) {
throw new Error('Nested transactions not supported!');
}
if(this._currentTransaction) {
throw new Error('Nested transactions not supported!');
}
- this._currentTransaction = new Transaction([]);
+ this._rollbackBackup = this.root.clone();
+ this._currentTransaction = new Transaction([], metadata);
},
endTransaction: function() {
},
endTransaction: function() {
@@
-569,15
+607,38
@@
$.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;
+ },
+
+ 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._currentTransaction = null;
+ this._transformationLevel = 0;
},
},
- transaction: function(callback,
context
) {
+ transaction: function(callback,
params
) {
var toret;
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();
this.endTransaction();
+ if(params.success) {
+ params.success(toret);
+ }
return toret;
},
return toret;
},
@@
-603,11
+664,19
@@
$.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);
}
});
}
});
-var Transaction = function(transformations) {
+var Transaction = function(transformations
, metadata
) {
this.transformations = transformations || [];
this.transformations = transformations || [];
+ this.metadata = metadata;
};
$.extend(Transaction.prototype, {
pushTransformation: function(transformation) {
};
$.extend(Transaction.prototype, {
pushTransformation: function(transformation) {