fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
even more tutorial in editor (status bar)
[fnpeditor.git]
/
src
/
editor
/
modules
/
documentToolbar
/
actionView.js
diff --git
a/src/editor/modules/documentToolbar/actionView.js
b/src/editor/modules/documentToolbar/actionView.js
index
74db332
..
8ac81b9
100644
(file)
--- a/
src/editor/modules/documentToolbar/actionView.js
+++ b/
src/editor/modules/documentToolbar/actionView.js
@@
-38,7
+38,7
@@
var ActionView = Backbone.View.extend({
this.action.on('paramsChanged', function() {
this.render();
}, this);
this.action.on('paramsChanged', function() {
this.render();
}, this);
- this.setElement(viewTemplate());
+ this.setElement(viewTemplate(
{tutorial: this.options.tutorial}
));
},
render: function() {
/* globals document */
},
render: function() {
/* globals document */
@@
-108,9
+108,7
@@
var ActionView = Backbone.View.extend({
this.trigger('mousedown');
},
onExecute: function() {
this.trigger('mousedown');
},
onExecute: function() {
- this.action.execute(function(ret) {
- this.trigger('actionExecuted', this.action, ret);
- }.bind(this));
+ this.action.execute();
},
onSelectionChange: function(e) {
var select = $(e.target),
},
onSelectionChange: function(e) {
var select = $(e.target),
@@
-128,8
+126,8
@@
var ActionView = Backbone.View.extend({
}
});
}
});
-var create = function(action) {
- var view = new ActionView({action:
action
});
+var create = function(action
, tutorial
) {
+ var view = new ActionView({action:
action, tutorial: tutorial
});
view.render();
return {
view.render();
return {