fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fnpjs: Action now triggers actionExecuted event instead of using callback
[fnpeditor.git]
/
src
/
editor
/
modules
/
documentCanvas
/
documentCanvas.js
diff --git
a/src/editor/modules/documentCanvas/documentCanvas.js
b/src/editor/modules/documentCanvas/documentCanvas.js
index
651788e
..
d88e698
100644
(file)
--- a/
src/editor/modules/documentCanvas/documentCanvas.js
+++ b/
src/editor/modules/documentCanvas/documentCanvas.js
@@
-20,7
+20,9
@@
return function(sandbox) {
canvasElements = canvasElements.concat(plugin.canvasElements || []);
});
canvasElements = canvasElements.concat(plugin.canvasElements || []);
});
- var canvas = canvas3.fromXMLDocument(null, canvasElements);
+ var canvas = canvas3.fromXMLDocument(null, canvasElements, {
+ user: sandbox.getConfig().user
+ });
var canvasWrapper = $(template);
var shownAlready = false;
var scrollbarPosition = 0,
var canvasWrapper = $(template);
var shownAlready = false;
var scrollbarPosition = 0,
@@
-72,15
+74,6
@@
return function(sandbox) {
canvas.loadWlxmlDocument(wlxmlDocument);
canvasWrapper.find('#rng-module-documentCanvas-contentWrapper').empty().append(canvas.view());
},
canvas.loadWlxmlDocument(wlxmlDocument);
canvasWrapper.find('#rng-module-documentCanvas-contentWrapper').empty().append(canvas.view());
},
- highlightElement: function(node) {
- canvas.toggleElementHighlight(node, true);
- },
- dimElement: function(node) {
- canvas.toggleElementHighlight(node, false);
- },
- jumpToElement: function(node) {
- canvas.setCurrentElement(node);
- },
onAfterActionExecuted: function(action, ret) {
if(ret && ret.isValid()) {
logger.debug('The action returned a valid fragment');
onAfterActionExecuted: function(action, ret) {
if(ret && ret.isValid()) {
logger.debug('The action returned a valid fragment');