Merge branch 'master' of https://github.com/ajaxorg/ace

demo/boot.js

@@ -35,27 +35,25 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var config = {
+require({
     paths: {
         demo: "../demo",
         ace: "../lib/ace",
         cockpit: "../support/cockpit/lib/cockpit",
         pilot: "../support/pilot/lib/pilot"
     }
-};
+});
 
 var deps = [ "pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings",
-             "pilot/environment", "demo/startup" ];
+             "pilot/environment", "demo/demo" ];
 
 var plugins = [ "pilot/index", "cockpit/index", "ace/defaults" ];
-
-require(config);
 require(deps, function() {
     var catalog = require("pilot/plugin_manager").catalog;
     catalog.registerPlugins(plugins).then(function() {
         var env = require("pilot/environment").create();
         catalog.startupPlugins({ env: env }).then(function() {
-            require("demo/startup").launch(env);
+            require("demo/demo").launch(env);
         });
     });
-});
+});

demo/demo.js

@@ -180,7 +180,7 @@ exports.launch = function(env) {
     });
 
     bindDropdown("fontsize", function(value) {
-        document.getElementById("editor").style["font-size"] = value;
+        document.getElementById("editor").style.fontSize = value;
     });
 
     bindDropdown("soft_wrap", function(value) {
@@ -294,6 +294,8 @@ exports.launch = function(env) {
 
         return event.preventDefault(e);
     });
+
+    window.env = env;
 };
 
 });