X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/a5871ab5512d87a33e7e95451d26ee7d3e789742..4e0553edaf87974f2e9565fcb0514b928cb48d8e:/runner.js

diff --git a/runner.js b/runner.js
index e03d577..8cce7d2 100644
--- a/runner.js
+++ b/runner.js
@@ -1,7 +1,9 @@
-var Runner = function($, _, app) {
+define(['libs/jquery-1.9.1.min', 'libs/underscore-min'], function($, _) {
+
+var Runner = function(app, modules) {
 
     function getModuleInstance(moduleName) {
-        var module = moduleInstances[moduleName] = (moduleInstances[moduleName] || app.modules[moduleName](new Sandbox(moduleName)));
+        var module = moduleInstances[moduleName] = (moduleInstances[moduleName] || modules[moduleName](new Sandbox(moduleName)));
         return module;
     }
 
@@ -10,7 +12,7 @@ var Runner = function($, _, app) {
         moduleInstances = {},
         eventListeners = [];
         
-    _.each(_.keys(app.modules || {}), function(moduleName) {
+    _.each(_.keys(modules || {}), function(moduleName) {
         if(_.contains(app.permissions[moduleName] || [], 'handleEvents')) {
             eventListeners.push(moduleName)
         }
@@ -31,6 +33,7 @@ var Runner = function($, _, app) {
         }
         
         this.publish = function(eventName) {
+            console.log(moduleName + ': ' + eventName);
             var eventArgs = Array.prototype.slice.call(arguments, 1)
             _.each(eventListeners, function(listenerModuleName) {
                 var listener = moduleInstances[listenerModuleName];
@@ -65,4 +68,10 @@ var Runner = function($, _, app) {
             getModuleInstance(moduleName).start();
         });
     }
-};
\ No newline at end of file
+}
+
+return {
+    Runner: Runner
+}
+
+});
\ No newline at end of file