plotdevice
diff --git a/‎.gitmodules‎
Lines changed: 2 additions & 5 deletions b/‎.gitmodules‎
Lines changed: 2 additions & 5 deletions
diff --git a/‎Makefile.dryice.js‎
Lines changed: 2 additions & 2 deletions b/‎Makefile.dryice.js‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎build_support/boot_textarea.js‎
Lines changed: 6 additions & 13 deletions b/‎build_support/boot_textarea.js‎
Lines changed: 6 additions & 13 deletions
diff --git a/‎demo/kitchen-sink/boot.js‎
Lines changed: 0 additions & 57 deletions b/‎demo/kitchen-sink/boot.js‎
Lines changed: 0 additions & 57 deletions
@@ -5,8 +5,5 @@
 	path = node_modules/dryice
 	url = git://github.com/ajaxorg/dryice.git
 [submodule "node_modules/pilot"]
-	path = node_modules/pilot
-	url = git://github.com/ajaxorg/pilot.git
-[submodule "node_modules/cockpit"]
-	path = node_modules/cockpit
-	url = git://github.com/ajaxorg/cockpit.git
+    path = node_modules/pilot
+    url = git://github.com/ajaxorg/pilot.git
@@ -297,7 +297,7 @@ console.log('# ace worker ---------');
             aceHome + "/lib/ace/worker/worker.js",
             worker
         ],
-        filter: [ copy.filter.uglifyjs, filterTextPlugin ],
+        filter: [ filterTextPlugin, copy.filter.uglifyjs ],
         dest: "build/src/worker-" + mode + ".js"
     });
 });
@@ -349,7 +349,7 @@ function demo() {
         source: [
             copy.source.commonjs({
                 project: project,
-                require: [ "pilot/index", "ace/defaults", "demo/kitchen-sink/boot" ]
+                require: [ "demo/kitchen-sink/demo" ]
             })
         ],
         filter: [ copy.filter.moduleDefines ],
 
@@ -41,8 +41,6 @@
 var require = window.__ace_shadowed__.require;
 
 require("pilot/index");
-var catalog = require("pilot/plugin_manager").catalog;
-catalog.registerPlugins([ "pilot/index" ]);
 
 var Dom = require("pilot/dom");
 var Event = require("pilot/event");
@@ -53,9 +51,6 @@ var EditSession = require("ace/edit_session").EditSession;
 var UndoManager = require("ace/undomanager").UndoManager;
 var Renderer = require("ace/virtual_renderer").VirtualRenderer;
 
-var catalog = require("pilot/plugin_manager").catalog;
-catalog.registerPlugins([ "pilot/index" ]);
-
 window.__ace_shadowed__.edit = function(el) {
     if (typeof(el) == "string") {
         el = document.getElementById(el);
@@ -68,16 +63,14 @@ window.__ace_shadowed__.edit = function(el) {
     var editor = new Editor(new Renderer(el, "ace/theme/textmate"));
     editor.setSession(doc);
 
-    var env = require("pilot/environment").create();
-    catalog.startupPlugins({ env: env }).then(function() {
-        env.document = doc;
-        env.editor = env;
+    var env = {};
+    env.document = doc;
+    env.editor = env;
+    editor.resize();
+    Event.addListener(window, "resize", function() {
         editor.resize();
-        Event.addListener(window, "resize", function() {
-            editor.resize();
-        });
-        el.env = env;
     });
+    el.env = env;
     return editor;
 }