fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
editor: return fragments from actions, set this fragment on canvas if possible
[fnpeditor.git]
/
src
/
smartxml
/
smartxml.js
diff --git
a/src/smartxml/smartxml.js
b/src/smartxml/smartxml.js
index
dcecc64
..
e2cdc9b
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,10
@@
$.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());
},
isSiblingOf: function(node) {
return node && this.parent().sameNode(node.parent());
},
@@
-242,6
+247,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);
@@
-299,7
+309,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,
@@
-550,6
+560,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() {
@@
-561,6
+572,8
@@
$.extend(Document.prototype, Backbone.Events, {
});
this._transformationLevel--;
this.undoStack.push(transaction);
});
this._transformationLevel--;
this.undoStack.push(transaction);
+ this.trigger('operationEnd');
+
}
},
}
},
@@
-578,6
+591,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;
},
@@
-634,6
+648,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);
}
});
}
});