shuffle answers in exercise order + fix answer numbering

[fnpeditor.git] / src / editor / entrypoint.js

diff --git a/src/editor/entrypoint.js b/src/editor/entrypoint.js
index ac19d6e..f908206 100644 (file)
--- a/src/editor/entrypoint.js
+++ b/src/editor/entrypoint.js
@@ -1,16 +1,14 @@
 (function() {
     'use strict';
     
-    /* globals requirejs, RNG_BOOTSTRAP_DATA */
+    /* globals requirejs, editor_init */
 
     requirejs.config({
-        baseUrl: '/static/editor/src/editor',
-        
         paths: {
             'fnpjs': '../fnpjs',
             'libs': '../../libs',
             'smartxml': '../smartxml',
-            'wlxml': '../wlxml',
+            'wlxml': '../wlxml'
 
         },
 
@@ -21,13 +19,13 @@
                     'libs/underscore': '../../libs/underscore-min',
                     'libs/bootstrap': '../../libs/bootstrap/js/bootstrap.min',
                     'libs/backbone': '../../libs/backbone-min',
-
+                    'libs/ace/ace': '../../libs/ace/ace'
                 }
         },
 
         shim: {
             '../../libs/jquery-1.9.1.min': {
-                exports: '$',
+                exports: '$'
             },
             '../../libs/underscore-min': {
                 exports: '_'
@@ -38,9 +36,13 @@
             '../../libs/backbone-min': {
                 exports: 'Backbone',
                 deps: ['libs/jquery', 'libs/underscore']
+            },
+            '../../libs/ace/ace': {
+                exports: 'ace'
             }
         }
-
+        // DEBUGGING ONLY
+        // , urlArgs: "bust=" + (new Date()).getTime()
     });
     
     requirejs([
@@ -53,9 +55,11 @@
     ], function($, runner, rng, modules, corePlugin) {
         $(function() {
             var app = new runner.Runner(rng, modules);
-            app.setBootstrappedData('data', RNG_BOOTSTRAP_DATA);
             app.registerPlugin(corePlugin);
-            app.start({rootSelector:'#editor_root'});
+
+            if(typeof editor_init !== 'undefined') {
+                editor_init(app);
+            }
         });
     });