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
/
editor
/
modules
/
documentCanvas
/
canvas
/
wlxmlListener.js
diff --git
a/src/editor/modules/documentCanvas/canvas/wlxmlListener.js
b/src/editor/modules/documentCanvas/canvas/wlxmlListener.js
index
9269ce1
..
7d19e94
100644
(file)
--- a/
src/editor/modules/documentCanvas/canvas/wlxmlListener.js
+++ b/
src/editor/modules/documentCanvas/canvas/wlxmlListener.js
@@
-23,12
+23,22
@@
$.extend(Listener.prototype, {
}
}, this);
}
}, this);
+ wlxmlDocument.on('operationEnd', function() {
+ this.canvas.triggerSelectionChanged();
+ }, this);
+
wlxmlDocument.on('contentSet', function() {
this.canvas.loadWlxmlDocument(wlxmlDocument);
}, this);
}
});
wlxmlDocument.on('contentSet', function() {
this.canvas.loadWlxmlDocument(wlxmlDocument);
}, this);
}
});
+
+var _metadataEventHandler = function(event) {
+ var canvasNode = utils.findCanvasElement(event.meta.node);
+ canvasNode.exec('updateMetadata');
+};
+
var handlers = {
nodeAttrChange: function(event) {
if(event.meta.attr === 'class') {
var handlers = {
nodeAttrChange: function(event) {
if(event.meta.attr === 'class') {
@@
-36,14
+46,14
@@
var handlers = {
canvasNode.setWlxmlClass(event.meta.newVal);
}
},
canvasNode.setWlxmlClass(event.meta.newVal);
}
},
- node
TagChange: function(event
) {
- var canvasNode = utils.findCanvasElement(event.meta.node);
-
canvasNode.setWlxmlTag(event.meta.newTagName
);
- },
- nodeAdded: function(event) {
+ node
Added: function(event, checkForExistence
) {
+ if(event.meta.node.isRoot()) {
+
this.canvas.reloadRoot(
);
+ return;
+ }
var parentElement = utils.findCanvasElement(event.meta.node.parent()),
nodeIndex = event.meta.node.getIndex(),
var parentElement = utils.findCanvasElement(event.meta.node.parent()),
nodeIndex = event.meta.node.getIndex(),
- referenceElement, referenceAction;
+ referenceElement, referenceAction
, actionArg
;
if(nodeIndex === 0) {
referenceElement = parentElement;
if(nodeIndex === 0) {
referenceElement = parentElement;
@@
-53,23
+63,31
@@
var handlers = {
referenceAction = 'after';
}
referenceAction = 'after';
}
- referenceElement[referenceAction](event.meta.node);
+ actionArg = (checkForExistence && utils.findCanvasElement(event.meta.node, event.meta.parent)) || event.meta.node;
+ referenceElement[referenceAction](actionArg);
},
nodeMoved: function(event) {
},
nodeMoved: function(event) {
- return handlers.nodeAdded
(event
);
+ return handlers.nodeAdded
.call(this, event, true
);
},
nodeDetached: function(event) {
var canvasNode = utils.findCanvasElementInParent(event.meta.node, event.meta.parent);
canvasNode.detach();
},
nodeTextChange: function(event) {
},
nodeDetached: function(event) {
var canvasNode = utils.findCanvasElementInParent(event.meta.node, event.meta.parent);
canvasNode.detach();
},
nodeTextChange: function(event) {
+ //console.log('wlxmlListener: ' + event.meta.node.getText());
var canvasElement = utils.findCanvasElement(event.meta.node),
toSet = event.meta.node.getText();
if(toSet === '') {
toSet = utils.unicode.ZWS;
}
var canvasElement = utils.findCanvasElement(event.meta.node),
toSet = event.meta.node.getText();
if(toSet === '') {
toSet = utils.unicode.ZWS;
}
- canvasElement.setText(toSet);
- }
+ if(toSet !== canvasElement.getText()) {
+ canvasElement.setText(toSet);
+ }
+ },
+
+ metadataChanged: _metadataEventHandler,
+ metadataAdded: _metadataEventHandler,
+ metadataRemoved: _metadataEventHandler
};
return {
};
return {