X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/9831076c8f7385dffb533e0327cc7dd7c9f1ef92..a49547b7a4bef633bb92bee9cf97fdcfe67c76aa:/src/editor/modules/documentToolbar/documentToolbar.js?ds=inline

diff --git a/src/editor/modules/documentToolbar/documentToolbar.js b/src/editor/modules/documentToolbar/documentToolbar.js
index 82b6dca..4cc43fb 100644
--- a/src/editor/modules/documentToolbar/documentToolbar.js
+++ b/src/editor/modules/documentToolbar/documentToolbar.js
@@ -7,8 +7,6 @@ return function(sandbox) {
     
     var addedActions = [],
         contextParams = {},
-        contextDefer = {},
-        duringClick = false,
         document, canvas;
 
     var view = {
@@ -20,7 +18,7 @@ return function(sandbox) {
             var action = sandbox.createAction(actionDescription.actionName, actionDescription.actionConfig),
                 view;
             addedActions.push(action);
-            view = actionView.create(action);
+            view = actionView.create(action, sandbox.getTutorialItem(action.definition.name));
             
             _.pairs(contextParams).forEach(function(pair) {
                 var name = pair[0],
@@ -29,19 +27,8 @@ return function(sandbox) {
             });
 
             group.append(view.dom);
-            view.on('actionExecuted', function(action, ret) {
+            action.on('actionExecuted', function(ret) {
                 sandbox.publish('actionExecuted', action, ret);
-                duringClick = false;
-                _.pairs(contextDefer).forEach(function(pair) {
-                    var what = pair[0],
-                        deferred = pair[1];
-                    if(deferred) {
-                        refreshContextParam(what);
-                    }
-                });
-            });
-            view.on('mousedown', function() {
-                duringClick = true;
             });
 
             view.on('hover', function() {
@@ -61,14 +48,6 @@ return function(sandbox) {
     
     var setContextParam = function(what, ctx) {
         contextParams[what] = ctx;
-        if(duringClick) {
-            contextDefer[what] = true;
-        } else {
-            refreshContextParam(what);
-        }
-    };
-
-    var refreshContextParam = function(what) {
         addedActions.forEach(function(action) {
             action.updateContextParam(what, contextParams[what]);
         });
@@ -110,6 +89,7 @@ return function(sandbox) {
                 document.on('operationEnd', function() {
                     setContextParam('document', document);
                 });
+                setContextParam('document', document);
             }
             setContextParam('fragment', fragment);