Visual editor: Adapting for requirejs optimizer

[fnpeditor.git] / runner.js

diff --git a/runner.js b/runner.js
index b7b0f65..8cce7d2 100644 (file)
--- a/runner.js
+++ b/runner.js
@@ -1,7 +1,9 @@
-var Runner = function($, _, app) {\r
+define(['libs/jquery-1.9.1.min', 'libs/underscore-min'], function($, _) {\r
+\r
+var Runner = function(app, modules) {\r
 \r
     function getModuleInstance(moduleName) {\r
-        var module = moduleInstances[moduleName] = (moduleInstances[moduleName] || app.modules[moduleName](new Sandbox(moduleName)));\r
+        var module = moduleInstances[moduleName] = (moduleInstances[moduleName] || modules[moduleName](new Sandbox(moduleName)));\r
         return module;\r
     }\r
 \r
@@ -10,7 +12,7 @@ var Runner = function($, _, app) {
         moduleInstances = {},\r
         eventListeners = [];\r
         \r
-    _.each(_.keys(app.modules || {}), function(moduleName) {\r
+    _.each(_.keys(modules || {}), function(moduleName) {\r
         if(_.contains(app.permissions[moduleName] || [], 'handleEvents')) {\r
             eventListeners.push(moduleName)\r
         }\r
@@ -66,4 +68,10 @@ var Runner = function($, _, app) {
             getModuleInstance(moduleName).start();\r
         });\r
     }\r
-};
\ No newline at end of file
+}\r
+\r
+return {\r
+    Runner: Runner\r
+}\r
+\r
+});
\ No newline at end of file