Visual editor: Adapting for requirejs optimizer

[fnpeditor.git] / entrypoint.js

diff --git a/entrypoint.js b/entrypoint.js
index 30052c2..70659e9 100644 (file)
--- a/entrypoint.js
+++ b/entrypoint.js
@@ -1,63 +1,35 @@
 (function() {
 
     requirejs.config({\r
-        baseUrl: '/static',
+        baseUrl: '/static/editor',
         
         shim: {
-            'jquery-1.9.1.min': {
+            'libs/jquery-1.9.1.min': {
                 exports: '$',
             },
-            'underscore-min': {
+            'libs/underscore-min': {
                 exports: '_'
             },
-            'bootstrap/js/bootstrap.min': {
-                deps: ['jquery-1.9.1.min']
+            'libs/bootstrap/js/bootstrap.min': {
+                deps: ['libs/jquery-1.9.1.min']
             }
-        },
-        
-        paths: {
-            modules: '/static/editor/modules'
-        }\r
-    });\r
-
-    
-    var dependenciesList = [
-        'jquery-1.9.1.min',
-        'editor/runner',
-        'editor/rng',
-        
-        'modules/data',
-        'modules/rng',
-        'modules/skelton',
-        'modules/sourceEditor',
-        'modules/tabsManager',
-        'modules/visualEditor',
-        'modules/sourceEditor',
-        
-        'bootstrap/js/bootstrap.min'
-    ];
-    \r
-    requirejs(dependenciesList, function ($, runner, rng) {\r
-        var args = arguments;
-        
-        var getModulesFromArguments = function() {
-            var toret = {};
-            var isModule = function(idx) {return dependenciesList[idx].substr(0, 'modules/'.length) === 'modules/';};
-            var moduleName = function(idx) {return dependenciesList[idx].split('/')[1]};
-            
-            for(var i = 0; i < args.length; i++) {
-                if(isModule(i))
-                    toret[moduleName(i)] = args[i];
-            }
-            return toret;
         }
-        
+\r
+    });
+    
+    requirejs([
+        'libs/jquery-1.9.1.min',
+        'runner',
+        'rng',
+        './modules',
+        'libs/bootstrap/js/bootstrap.min'
+    ], function($, runner, rng, modules) {
         $(function() {
-            var app = new runner.Runner(rng, getModulesFromArguments());
+            var app = new runner.Runner(rng, modules);
             app.setBootstrappedData('data', RNG_BOOTSTRAP_DATA);
             app.start({rootSelector:'#editor_root'});
         });
-        \r
     });
 
+
 })();
\ No newline at end of file