editor: Merge key event handling refactorings

[fnpeditor.git] / src / fnpjs / actions.js

diff --git a/src/fnpjs/actions.js b/src/fnpjs/actions.js
index f380ed6..b8aa033 100644 (file)
--- a/src/fnpjs/actions.js
+++ b/src/fnpjs/actions.js
@@ -72,9 +72,13 @@ _.extend(Action.prototype, Backbone.Events, {
         }
         return this._cache;
     },
         }
         return this._cache;
     },

-    execute: function(callback) {
+    execute: function() {

         var state = this.getState();
         var state = this.getState();

-        callback = callback || function() {};
+        
+        var callback = function(ret) {
+            this.trigger('actionExecuted', ret);
+        }.bind(this);
+

         if(state.allowed) {
             return state.execute.call(this, callback, this.params, this.appObject);
         }
         if(state.allowed) {
             return state.execute.call(this, callback, this.params, this.appObject);
         }