put functions from old "ace/lib" modules directly

on "exports"

demo/demo_startup.js

@@ -41,7 +41,7 @@ define(function(require, exports, module) {
 
 exports.launch = function(env) {
 
-    var event = require("pilot/event").event;
+    var event = require("pilot/event");
     var Editor = require("ace/editor").Editor;
     var Renderer = require("ace/virtual_renderer").VirtualRenderer;
     var theme = require("ace/theme/textmate");

lib/ace/background_tokenizer.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
 var EventEmitter = require("pilot/event_emitter").EventEmitter;
 
 var BackgroundTokenizer = function(tokenizer, editor) {

lib/ace/document.js

@@ -37,8 +37,8 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
-var lang = require("pilot/lang").lang;
+var lang = require("pilot/lang");
 var EventEmitter = require("pilot/event_emitter").EventEmitter;
 var Selection = require("ace/selection").Selection;
 var TextMode = require("ace/mode/text").Mode;

lib/ace/editor.js

@@ -37,9 +37,9 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
-var event = require("pilot/event").event;
+var event = require("pilot/event");
-var lang = require("pilot/lang").lang;
+var lang = require("pilot/lang");
 var TextInput = require("ace/textinput").TextInput;
 var KeyBinding = require("ace/keybinding").KeyBinding;
 var Document = require("ace/document").Document;

lib/ace/keybinding.js

@@ -37,8 +37,8 @@
 
 define(function(require, exports, module) {
 
-var core = require("pilot/core").core;
+var core = require("pilot/core");
-var event = require("pilot/event").event;
+var event = require("pilot/event");
 var default_mac = require("ace/conf/keybindings/default_mac").bindings;
 var default_win = require("ace/conf/keybindings/default_win").bindings;
 var canon = require("pilot/canon");

lib/ace/layer/cursor.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var dom = require("pilot/dom").dom;
+var dom = require("pilot/dom");
 
 var Cursor = function(parentEl) {
     this.element = document.createElement("div");

lib/ace/layer/text.js

@@ -37,8 +37,8 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
-var dom = require("pilot/dom").dom;
+var dom = require("pilot/dom");
 var EventEmitter = require("pilot/event_emitter").EventEmitter;
 
 var Text = function(parentEl) {

lib/ace/mode/css.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
 var TextMode = require("ace/mode/text").Mode;
 var Tokenizer = require("ace/tokenizer").Tokenizer;
 var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules;

lib/ace/mode/css_highlight_rules.js

@@ -37,8 +37,8 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
-var lang = require("pilot/lang").lang;
+var lang = require("pilot/lang");
 var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 
 var CssHighlightRules = function() {

lib/ace/mode/doc_comment_highlight_rules.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
 var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 
 var DocCommentHighlightRules = function() {

lib/ace/mode/html.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
 var TextMode = require("ace/mode/text").Mode;
 var JavaScriptMode = require("ace/mode/javascript").Mode;
 var CssMode = require("ace/mode/css").Mode;

lib/ace/mode/html_highlight_rules.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
 var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules;
 var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules;
 var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;

lib/ace/mode/javascript.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
 var TextMode = require("ace/mode/text").Mode;
 var Tokenizer = require("ace/tokenizer").Tokenizer;
 var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules;

lib/ace/mode/javascript_highlight_rules.js

@@ -37,8 +37,8 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
-var lang = require("pilot/lang").lang;
+var lang = require("pilot/lang");
 var DocCommentHighlightRules = require("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules;
 var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 

lib/ace/mode/python.js

@@ -37,7 +37,7 @@
  
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
 var TextMode = require("./text").Mode;
 var Tokenizer = require("../tokenizer").Tokenizer;
 var PythonHighlightRules = require("./python_highlight_rules").PythonHighlightRules;

lib/ace/mode/python_highlight_rules.js

@@ -40,8 +40,8 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
-var lang = require("pilot/lang").lang;
+var lang = require("pilot/lang");
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 
 PythonHighlightRules = function() {

lib/ace/mode/xml.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
 var TextMode = require("ace/mode/text").Mode;
 var Tokenizer = require("ace/tokenizer").Tokenizer;
 var XmlHighlightRules = require("ace/mode/xml_highlight_rules").XmlHighlightRules;

lib/ace/mode/xml_highlight_rules.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
 var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 
 var XmlHighlightRules = function() {

lib/ace/renderloop.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var event = require("pilot/event").event;
+var event = require("pilot/event");
 
 var RenderLoop = function(onRender) {
     this.onRender = onRender;

lib/ace/scrollbar.js

@@ -37,10 +37,10 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
-var lang = require("pilot/lang").lang;
+var lang = require("pilot/lang");
-var dom = require("pilot/dom").dom;
+var dom = require("pilot/dom");
-var event = require("pilot/event").event;
+var event = require("pilot/event");
 var EventEmitter = require("pilot/event_emitter").EventEmitter;
 
 var ScrollBar = function(parent) {

lib/ace/search.js

@@ -37,8 +37,8 @@
 
 define(function(require, exports, module) {
 
-var lang = require("pilot/lang").lang;
+var lang = require("pilot/lang");
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
 var Range = require("ace/range").Range;
 
 var Search = function() {

lib/ace/selection.js

@@ -37,8 +37,8 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
-var lang = require("pilot/lang").lang;
+var lang = require("pilot/lang");
 var EventEmitter = require("pilot/event_emitter").EventEmitter;
 var Range = require("ace/range").Range;
 

lib/ace/test/event_emitter_test.js

@@ -37,7 +37,7 @@
 
 require("../../../support/paths");
 
-var oop             = require("pilot/oop").oop;
+var oop             = require("pilot/oop");
     EventEmitter   = require("pilot/event_emitter").EventEmitter,
     assert          = require("./assertions");
 

lib/ace/textinput.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var event = require("pilot/event").event;
+var event = require("pilot/event");
 
 var TextInput = function(parentNode, host) {
 

lib/ace/theme/clouds.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-    var dom = require("pilot/dom").dom;
+    var dom = require("pilot/dom");
 
     var cssText = ".ace-clouds .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\

lib/ace/theme/clouds_mignight.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-    var dom = require("pilot/dom").dom;
+    var dom = require("pilot/dom");
 
     var cssText = ".ace-clouds-midnight .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\

lib/ace/theme/cobalt.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-    var dom = require("pilot/dom").dom;
+    var dom = require("pilot/dom");
 
     var cssText = ".ace-cobalt .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\

lib/ace/theme/dawn.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-    var dom = require("pilot/dom").dom;
+    var dom = require("pilot/dom");
 
     var cssText = ".ace-dawn .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\

lib/ace/theme/eclipse.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-    var dom = require("pilot/dom").dom;
+    var dom = require("pilot/dom");
     var cssText = require("text!ace/theme/eclipse.css");
 
     // import CSS once

lib/ace/theme/idle_fingers.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-    var dom = require("pilot/dom").dom;
+    var dom = require("pilot/dom");
 
     var cssText = ".ace-idle-fingers .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\

lib/ace/theme/kr_theme.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-    var dom = require("pilot/dom").dom;
+    var dom = require("pilot/dom");
 
     var cssText = ".ace-kr-theme .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\

lib/ace/theme/mono_industrial.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-    var dom = require("pilot/dom").dom;
+    var dom = require("pilot/dom");
 
     var cssText = ".ace-mono-industrial .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\

lib/ace/theme/monokai.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-    var dom = require("pilot/dom").dom;
+    var dom = require("pilot/dom");
 
     var cssText = ".ace-monokai .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\

lib/ace/theme/textmate.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-    var dom = require("pilot/dom").dom;
+    var dom = require("pilot/dom");
     var cssText = require("text!ace/theme/tm.css");
 
     // import CSS once

lib/ace/theme/twilight.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-    var dom = require("pilot/dom").dom;
+    var dom = require("pilot/dom");
 
     var cssText = ".ace-twilight .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\

lib/ace/virtual_renderer.js

@@ -37,10 +37,10 @@
 
 define(function(require, exports, module) {
 
-var oop = require("pilot/oop").oop;
+var oop = require("pilot/oop");
-var lang = require("pilot/lang").lang;
+var lang = require("pilot/lang");
-var dom = require("pilot/dom").dom;
+var dom = require("pilot/dom");
-var event = require("pilot/event").event;
+var event = require("pilot/event");
 var GutterLayer = require("ace/layer/gutter").Gutter;
 var MarkerLayer = require("ace/layer/marker").Marker;
 var TextLayer = require("ace/layer/text").Text;

plugins/cockpit/cli.js

@@ -40,7 +40,7 @@ define(function(require, exports, module) {
 
 var console = require('pilot/console');
 var util = require('pilot/util');
-var oop = require('pilot/oop').oop;
+var oop = require('pilot/oop');
 var EventEmitter = require('pilot/event_emitter').EventEmitter;
 
 //var keyboard = require('keyboard/keyboard');

plugins/cockpit/ui/plain.js

@@ -38,7 +38,7 @@
 define(function(require, exports, module) {
 
 var editorCss = require("text!cockpit/ui/plain.css");
-var dom = require("pilot/dom").dom;
+var dom = require("pilot/dom");
 dom.importCssString(editorCss);
 
 var CliRequisition = require('cockpit/cli').CliRequisition;

plugins/pilot/canon.js

@@ -39,7 +39,7 @@ define(function(require, exports, module) {
 
 var console = require('pilot/console');
 var Trace = require('pilot/stacktrace').Trace;
-var oop = require('pilot/oop').oop;
+var oop = require('pilot/oop');
 var EventEmitter = require('pilot/event_emitter').EventEmitter;
 var catalog = require('pilot/catalog');
 var Status = require('pilot/types').Status;

plugins/pilot/core.js

@@ -37,16 +37,15 @@
 
 define(function(require, exports, module) {
 
-    var core = {};
 var os = (navigator.platform.match(/mac|win|linux/i) || ["other"])[0].toLowerCase();
 
-    core.isWin = (os == "win");
+exports.isWin = (os == "win");
-    core.isMac = (os == "mac");
+exports.isMac = (os == "mac");
-    core.isLinux = (os == "linux");
+exports.isLinux = (os == "linux");
-    core.isIE = ! + "\v1";
+exports.isIE = ! + "\v1";
-    core.isGecko = window.controllers && window.navigator.product === "Gecko";
+exports.isGecko = window.controllers && window.navigator.product === "Gecko";
 
-    core.provide = function(namespace) {
+exports.provide = function(namespace) {
     var parts = namespace.split(".");
     var obj = window;
     for (var i=0; i<parts.length; i++) {
@@ -58,6 +57,4 @@ define(function(require, exports, module) {
     }
 };
 
-    exports.core = core;
-
 });

plugins/pilot/dom.js

@@ -37,11 +37,9 @@
 
 define(function(require, exports, module) {
 
-    var lang = require("pilot/lang").lang;
+var lang = require("pilot/lang");
 
-    var dom = {};
+exports.setText = function(elem, text) {
-
-    dom.setText = function(elem, text) {
     if (elem.innerText !== undefined) {
         elem.innerText = text;
     }
@@ -50,18 +48,18 @@ define(function(require, exports, module) {
     }
 };
 
-    dom.hasCssClass = function(el, name) {
+exports.hasCssClass = function(el, name) {
     var classes = el.className.split(/\s+/g);
     return lang.arrayIndexOf(classes, name) !== -1;
 };
 
-    dom.addCssClass = function(el, name) {
+exports.addCssClass = function(el, name) {
-        if (!dom.hasCssClass(el, name)) {
+    if (!exports.hasCssClass(el, name)) {
         el.className += " " + name;
     }
 };
 
-    dom.removeCssClass = function(el, name) {
+exports.removeCssClass = function(el, name) {
     var classes = el.className.split(/\s+/g);
     while (true) {
         var index = lang.arrayIndexOf(classes, name);
@@ -73,7 +71,7 @@ define(function(require, exports, module) {
     el.className = classes.join(" ");
 };
 
-    dom.importCssString = function(cssText, doc){
+exports.importCssString = function(cssText, doc){
     doc = doc || document;        
 
     if (doc.createStyleSheet) {
@@ -87,17 +85,17 @@ define(function(require, exports, module) {
     }            
 };
 
-    dom.getInnerWidth = function(element) {
+exports.getInnerWidth = function(element) {
-        return (parseInt(dom.computedStyle(element, "paddingLeft"))
+    return (parseInt(exports.computedStyle(element, "paddingLeft"))
-                + parseInt(dom.computedStyle(element, "paddingRight")) + element.clientWidth);
+            + parseInt(exports.computedStyle(element, "paddingRight")) + element.clientWidth);
 };
 
-    dom.getInnerHeight = function(element) {
+exports.getInnerHeight = function(element) {
-        return (parseInt(dom.computedStyle(element, "paddingTop"))
+    return (parseInt(exports.computedStyle(element, "paddingTop"))
-                + parseInt(dom.computedStyle(element, "paddingBottom")) + element.clientHeight);
+            + parseInt(exports.computedStyle(element, "paddingBottom")) + element.clientHeight);
 };
 
-    dom.computedStyle = function(element, style) {
+exports.computedStyle = function(element, style) {
     if (window.getComputedStyle) {
         return (window.getComputedStyle(element, "") || {})[style] || "";
     }
@@ -106,7 +104,7 @@ define(function(require, exports, module) {
     }
 };
 
-    dom.scrollbarWidth = function() {
+exports.scrollbarWidth = function() {
 
     var inner = document.createElement('p');
     inner.style.width = "100%";
@@ -137,5 +135,4 @@ define(function(require, exports, module) {
     return noScrollbar-withScrollbar;
 };
 
-    exports.dom = dom;
 });

plugins/pilot/event.js

@@ -37,10 +37,9 @@
 
 define(function(require, exports, module) {
 
-    var core = require("pilot/core").core;
+var core = require("pilot/core");
-    var event = {};
 
-    event.addListener = function(elem, type, callback) {
+exports.addListener = function(elem, type, callback) {
     if (elem.addEventListener) {
         return elem.addEventListener(type, callback, false);
     }
@@ -53,7 +52,7 @@ define(function(require, exports, module) {
     }
 };
 
-    event.removeListener = function(elem, type, callback) {
+exports.removeListener = function(elem, type, callback) {
     if (elem.removeEventListener) {
         return elem.removeEventListener(type, callback, false);
     }
@@ -62,27 +61,27 @@ define(function(require, exports, module) {
     }
 };
 
-    event.stopEvent = function(e) {
+exports.stopEvent = function(e) {
-        event.stopPropagation(e);
+    exports.stopPropagation(e);
-        event.preventDefault(e);
+    exports.preventDefault(e);
     return false;
 };
 
-    event.stopPropagation = function(e) {
+exports.stopPropagation = function(e) {
     if (e.stopPropagation)
         e.stopPropagation();
     else
         e.cancelBubble = true;
 };
 
-    event.preventDefault = function(e) {
+exports.preventDefault = function(e) {
     if (e.preventDefault)
         e.preventDefault();
     else
         e.returnValue = false;
 };
 
-    event.getDocumentX = function(e) {
+exports.getDocumentX = function(e) {
     if (e.clientX) {
         var scrollLeft = document.documentElement.scrollLeft || document.body.scrollLeft;
         return e.clientX + scrollLeft;
@@ -91,7 +90,7 @@ define(function(require, exports, module) {
     }
 };
 
-    event.getDocumentY = function(e) {
+exports.getDocumentY = function(e) {
     if (e.clientY) {
         var scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
         return e.clientY + scrollTop;
@@ -103,7 +102,7 @@ define(function(require, exports, module) {
 /**
  * @return {Number} 0 for left button, 1 for middle button, 2 for right button
  */
-    event.getButton = function(e) {
+exports.getButton = function(e) {
     // DOM Event
     if (e.preventDefault) {
         return e.button;
@@ -115,31 +114,31 @@ define(function(require, exports, module) {
 };
 
 if (document.documentElement.setCapture) {
-        event.capture = function(el, eventHandler, releaseCaptureHandler) {
+    exports.capture = function(el, eventHandler, releaseCaptureHandler) {
         function onMouseMove(e) {
             eventHandler(e);
-                return event.stopPropagation(e);
+            return exports.stopPropagation(e);
         }
 
         function onReleaseCapture(e) {
             eventHandler && eventHandler(e);
             releaseCaptureHandler && releaseCaptureHandler();
 
-                event.removeListener(el, "mousemove", eventHandler);
+            exports.removeListener(el, "mousemove", eventHandler);
-                event.removeListener(el, "mouseup", onReleaseCapture);
+            exports.removeListener(el, "mouseup", onReleaseCapture);
-                event.removeListener(el, "losecapture", onReleaseCapture);
+            exports.removeListener(el, "losecapture", onReleaseCapture);
 
             el.releaseCapture();
         }
 
-            event.addListener(el, "mousemove", eventHandler);
+        exports.addListener(el, "mousemove", eventHandler);
-            event.addListener(el, "mouseup", onReleaseCapture);
+        exports.addListener(el, "mouseup", onReleaseCapture);
-            event.addListener(el, "losecapture", onReleaseCapture);
+        exports.addListener(el, "losecapture", onReleaseCapture);
         el.setCapture();
     };
 }
 else {
-        event.capture = function(el, eventHandler, releaseCaptureHandler) {
+    exports.capture = function(el, eventHandler, releaseCaptureHandler) {
         function onMouseMove(e) {
             eventHandler(e);
             e.stopPropagation();
@@ -149,18 +148,18 @@ define(function(require, exports, module) {
             eventHandler && eventHandler(e);
             releaseCaptureHandler && releaseCaptureHandler();
 
-                document.removeEventListener("mousemove", onMouseMove, true);
+            exports.removeEventListener("mousemove", onMouseMove, true);
-                document.removeEventListener("mouseup", onMouseUp, true);
+            exports.removeEventListener("mouseup", onMouseUp, true);
 
             e.stopPropagation();
         }
 
-            document.addEventListener("mousemove", onMouseMove, true);
+        exports.addEventListener("mousemove", onMouseMove, true);
-            document.addEventListener("mouseup", onMouseUp, true);
+        exports.addEventListener("mouseup", onMouseUp, true);
     };
 }
 
-    event.addMouseWheelListener = function(el, callback) {
+exports.addMouseWheelListener = function(el, callback) {
     var listener = function(e) {
         if (e.wheelDelta !== undefined) {
             if (e.wheelDeltaX !== undefined) {
@@ -182,11 +181,11 @@ define(function(require, exports, module) {
         }
         callback(e);
     };
-        event.addListener(el, "DOMMouseScroll", listener);
+    exports.addListener(el, "DOMMouseScroll", listener);
-        event.addListener(el, "mousewheel", listener);
+    exports.addListener(el, "mousewheel", listener);
 };
 
-    event.addMultiMouseDownListener = function(el, button, count, timeout, callback) {
+exports.addMultiMouseDownListener = function(el, button, count, timeout, callback) {
     var clicks = 0;
     var startX, startY;
 
@@ -201,7 +200,7 @@ define(function(require, exports, module) {
             }, timeout || 600);
         }
 
-            if (event.getButton(e) != button
+        if (exports.getButton(e) != button
           || Math.abs(e.clientX - startX) > 5 || Math.abs(e.clientY - startY) > 5)
             clicks = 0;
 
@@ -209,24 +208,24 @@ define(function(require, exports, module) {
             clicks = 0;
             callback(e);
         }
-            return event.preventDefault(e);
+        return exports.preventDefault(e);
     };
 
-        event.addListener(el, "mousedown", listener);
+    exports.addListener(el, "mousedown", listener);
-        core.isIE && event.addListener(el, "dblclick", listener);
+    core.isIE && exports.addListener(el, "dblclick", listener);
 };
 
-    event.addKeyListener = function(el, callback) {
+exports.addKeyListener = function(el, callback) {
     var lastDown = null;
 
-        event.addListener(el, "keydown", function(e) {
+    exports.addListener(el, "keydown", function(e) {
         lastDown = e.keyIdentifier || e.keyCode;
         return callback(e);
     });
 
     // repeated keys are fired as keypress and not keydown events
     if (core.isMac && core.isGecko) {
-            event.addListener(el, "keypress", function(e) {
+        exports.addListener(el, "keypress", function(e) {
             var keyId = e.keyIdentifier || e.keyCode;
             if (lastDown !== keyId) {
                 return callback(e);
@@ -237,6 +236,4 @@ define(function(require, exports, module) {
     }
 };
 
-    exports.event = event;
-
 });

plugins/pilot/event_emitter.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var lang = require('pilot/lang').lang;
+var lang = require('pilot/lang');
 
 var EventEmitter = {};
 

plugins/pilot/lang.js

@@ -37,24 +37,21 @@
 
 define(function(require, exports, module) {
 
-
+exports.stringReverse = function(string) {
-    var lang = {};
-
-    lang.stringReverse = function(string) {
     return string.split("").reverse().join("");
 };
 
-    lang.stringRepeat = function (string, count) {
+exports.stringRepeat = function (string, count) {
      return new Array(count + 1).join(string);
 };
 
 if (Array.prototype.indexOf) {
-        lang.arrayIndexOf = function(array, searchElement) {
+    exports.arrayIndexOf = function(array, searchElement) {
         return array.indexOf(searchElement);
     };
 }
 else {
-        lang.arrayIndexOf = function(array, searchElement) {
+    exports.arrayIndexOf = function(array, searchElement) {
         for (var i=0; i<array.length; i++) {
             if (array[i] == searchElement) {
                 return i;
@@ -64,11 +61,11 @@ define(function(require, exports, module) {
     };
 }
 
-    lang.isArray = function(value) {
+exports.isArray = function(value) {
     return Object.prototype.toString.call(value) == "[object Array]";
 };
 
-    lang.copyObject = function(obj) {
+exports.copyObject = function(obj) {
     var copy = {};
     for (var key in obj) {
         copy[key] = obj[key];
@@ -76,7 +73,7 @@ define(function(require, exports, module) {
     return copy;
 };
 
-    lang.arrayToMap = function(arr) {
+exports.arrayToMap = function(arr) {
     var map = {};
     for (var i=0; i<arr.length; i++) {
         map[arr[i]] = 1;
@@ -85,17 +82,17 @@ define(function(require, exports, module) {
 
 };
 
-    lang.escapeRegExp = function(str) {
+exports.escapeRegExp = function(str) {
     return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
 };
 
-    lang.bind = function(fcn, context) {
+exports.bind = function(fcn, context) {
     return function() {
         return fcn.apply(context, arguments);
     };
 };
 
-    lang.deferredCall = function(fcn) {
+exports.deferredCall = function(fcn) {
 
     var timer = null;
     var callback = function() {
@@ -122,5 +119,4 @@ define(function(require, exports, module) {
   };
 };
 
-    exports.lang = lang;
 });

plugins/pilot/oop.js

@@ -37,9 +37,7 @@
 
 define(function(require, exports, module) {
 
-    var oop = {};
+exports.inherits = function(ctor, superCtor) {
-
-    oop.inherits = function(ctor, superCtor) {
     var tempCtor = function() {};
     tempCtor.prototype = superCtor.prototype;
     ctor.super_ = superCtor.prototype;
@@ -47,15 +45,14 @@ define(function(require, exports, module) {
     ctor.prototype.constructor = ctor;
 };
 
-    oop.mixin = function(obj, mixin) {
+exports.mixin = function(obj, mixin) {
     for (var key in mixin) {
         obj[key] = mixin[key];
     }
 };
 
-    oop.implement = function(proto, mixin) {
+exports.implement = function(proto, mixin) {
-        oop.mixin(proto, mixin);
+    exports.mixin(proto, mixin);
 };
 
-    exports.oop = oop;
 });

plugins/pilot/settings.js

@@ -44,7 +44,7 @@ define(function(require, exports, module) {
  */
 
 var console = require('pilot/console');
-var oop = require('pilot/oop').oop;
+var oop = require('pilot/oop');
 var types = require('pilot/types');
 var EventEmitter = require('pilot/event_emitter').EventEmitter;
 var catalog = require('pilot/catalog');