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,27 +37,24 @@
 
 define(function(require, exports, module) {
 
-    var core = {};
+var os = (navigator.platform.match(/mac|win|linux/i) || ["other"])[0].toLowerCase();
-    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 parts = namespace.split(".");
-        var obj = window;
+    var obj = window;
-        for (var i=0; i<parts.length; i++) {
+    for (var i=0; i<parts.length; i++) {
-            var part = parts[i];
+        var part = parts[i];
-            if (!obj[part]) {
+        if (!obj[part]) {
-                obj[part] = {};
+            obj[part] = {};
-            }
-            obj = obj[part];
         }
-    };
+        obj = obj[part];
-
+    }
-    exports.core = core;
+};
 
 });

plugins/pilot/dom.js

@@ -37,105 +37,102 @@
 
 define(function(require, exports, module) {
 
-    var lang = require("pilot/lang").lang;
+var lang = require("pilot/lang");
 
-    var dom = {};
+exports.setText = function(elem, text) {
+    if (elem.innerText !== undefined) {
+        elem.innerText = text;
+    }
+    if (elem.textContent !== undefined) {
+        elem.textContent = text;
+    }
+};
 
-    dom.setText = function(elem, text) {
+exports.hasCssClass = function(el, name) {
-        if (elem.innerText !== undefined) {
+    var classes = el.className.split(/\s+/g);
-            elem.innerText = text;
+    return lang.arrayIndexOf(classes, name) !== -1;
+};
+
+exports.addCssClass = function(el, name) {
+    if (!exports.hasCssClass(el, name)) {
+        el.className += " " + name;
+    }
+};
+
+exports.removeCssClass = function(el, name) {
+    var classes = el.className.split(/\s+/g);
+    while (true) {
+        var index = lang.arrayIndexOf(classes, name);
+        if (index == -1) {
+            break;
         }
-        if (elem.textContent !== undefined) {
+        classes.splice(index, 1);
-            elem.textContent = text;
+    }
-        }
+    el.className = classes.join(" ");
-    };
+};
 
-    dom.hasCssClass = function(el, name) {
+exports.importCssString = function(cssText, doc){
-        var classes = el.className.split(/\s+/g);
+    doc = doc || document;        
-        return lang.arrayIndexOf(classes, name) !== -1;
-    };
 
-    dom.addCssClass = function(el, name) {
+    if (doc.createStyleSheet) {
-        if (!dom.hasCssClass(el, name)) {
+        var sheet = doc.createStyleSheet();
-            el.className += " " + name;
+        sheet.cssText = cssText;
-        }
+    }
-    };
+    else {
+        var style = doc.createElement("style");
+        style.appendChild(doc.createTextNode(cssText));
+        doc.getElementsByTagName("head")[0].appendChild(style);
+    }            
+};
 
-    dom.removeCssClass = function(el, name) {
+exports.getInnerWidth = function(element) {
-        var classes = el.className.split(/\s+/g);
+    return (parseInt(exports.computedStyle(element, "paddingLeft"))
-        while (true) {
+            + parseInt(exports.computedStyle(element, "paddingRight")) + element.clientWidth);
-            var index = lang.arrayIndexOf(classes, name);
+};
-            if (index == -1) {
-                break;
-            }
-            classes.splice(index, 1);
-        }
-        el.className = classes.join(" ");
-    };
 
-    dom.importCssString = function(cssText, doc){
+exports.getInnerHeight = function(element) {
-        doc = doc || document;        
+    return (parseInt(exports.computedStyle(element, "paddingTop"))
+            + parseInt(exports.computedStyle(element, "paddingBottom")) + element.clientHeight);
+};
 
-        if (doc.createStyleSheet) {
+exports.computedStyle = function(element, style) {
-            var sheet = doc.createStyleSheet();
+    if (window.getComputedStyle) {
-            sheet.cssText = cssText;
+        return (window.getComputedStyle(element, "") || {})[style] || "";
-        }
+    }
-        else {
+    else {
-            var style = doc.createElement("style");
+        return element.currentStyle[style];
-            style.appendChild(doc.createTextNode(cssText));
+    }
-            doc.getElementsByTagName("head")[0].appendChild(style);
+};
-        }            
-    };
-    
-    dom.getInnerWidth = function(element) {
-        return (parseInt(dom.computedStyle(element, "paddingLeft"))
-                + parseInt(dom.computedStyle(element, "paddingRight")) + element.clientWidth);
-    };
 
-    dom.getInnerHeight = function(element) {
+exports.scrollbarWidth = function() {
-        return (parseInt(dom.computedStyle(element, "paddingTop"))
-                + parseInt(dom.computedStyle(element, "paddingBottom")) + element.clientHeight);
-    };
 
-    dom.computedStyle = function(element, style) {
+    var inner = document.createElement('p');
-        if (window.getComputedStyle) {
+    inner.style.width = "100%";
-            return (window.getComputedStyle(element, "") || {})[style] || "";
+    inner.style.height = "200px";
-        }
-        else {
-            return element.currentStyle[style];
-        }
-    };
 
-    dom.scrollbarWidth = function() {
+    var outer = document.createElement("div");
+    var style = outer.style;
 
-        var inner = document.createElement('p');
+    style.position = "absolute";
-        inner.style.width = "100%";
+    style.left = "-10000px";
-        inner.style.height = "200px";
+    style.overflow = "hidden";
+    style.width = "200px";
+    style.height = "150px";
 
-        var outer = document.createElement("div");
+    outer.appendChild(inner);
-        var style = outer.style;
+    document.body.appendChild(outer);
+    var noScrollbar = inner.offsetWidth;
 
-        style.position = "absolute";
+    style.overflow = "scroll";
-        style.left = "-10000px";
+    var withScrollbar = inner.offsetWidth;
-        style.overflow = "hidden";
-        style.width = "200px";
-        style.height = "150px";
 
-        outer.appendChild(inner);
+    if (noScrollbar == withScrollbar) {
-        document.body.appendChild(outer);
+        withScrollbar = outer.clientWidth;
-        var noScrollbar = inner.offsetWidth;
+    }
 
-        style.overflow = "scroll";
+    document.body.removeChild(outer);
-        var withScrollbar = inner.offsetWidth;
 
-        if (noScrollbar == withScrollbar) {
+    return noScrollbar-withScrollbar;
-            withScrollbar = outer.clientWidth;
+};
-        }
 
-        document.body.removeChild(outer);
-
-        return noScrollbar-withScrollbar;
-    };
-
-    exports.dom = dom;
 });

plugins/pilot/event.js

@@ -37,206 +37,203 @@
 
 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) {
+    if (elem.addEventListener) {
-            return elem.addEventListener(type, callback, false);
+        return elem.addEventListener(type, callback, false);
-        }
-        if (elem.attachEvent) {
-            var wrapper = function() {
-                callback(window.event);
-            };
-            callback._wrapper = wrapper;
-            elem.attachEvent("on" + type, wrapper);
-        }
-    };
-
-    event.removeListener = function(elem, type, callback) {
-        if (elem.removeEventListener) {
-            return elem.removeEventListener(type, callback, false);
-        }
-        if (elem.detachEvent) {
-            elem.detachEvent("on" + type, callback._wrapper || callback);
-        }
-    };
-
-    event.stopEvent = function(e) {
-        event.stopPropagation(e);
-        event.preventDefault(e);
-        return false;
-    };
-
-    event.stopPropagation = function(e) {
-        if (e.stopPropagation)
-            e.stopPropagation();
-        else
-            e.cancelBubble = true;
-    };
-
-    event.preventDefault = function(e) {
-        if (e.preventDefault)
-            e.preventDefault();
-        else
-            e.returnValue = false;
-    };
-
-    event.getDocumentX = function(e) {
-        if (e.clientX) {
-            var scrollLeft = document.documentElement.scrollLeft || document.body.scrollLeft;
-            return e.clientX + scrollLeft;
-        } else {
-            return e.pageX;
-        }
-    };
-
-    event.getDocumentY = function(e) {
-        if (e.clientY) {
-            var scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
-            return e.clientY + scrollTop;
-        } else {
-            return e.pageX;
-        }
-    };
-
-    /**
-     * @return {Number} 0 for left button, 1 for middle button, 2 for right button
-     */
-    event.getButton = function(e) {
-        // DOM Event
-        if (e.preventDefault) {
-            return e.button;
-        }
-        // old IE
-        else {
-            return Math.max(e.button - 1, 2);
-        }
-    };
-
-    if (document.documentElement.setCapture) {
-        event.capture = function(el, eventHandler, releaseCaptureHandler) {
-            function onMouseMove(e) {
-                eventHandler(e);
-                return event.stopPropagation(e);
-            }
-
-            function onReleaseCapture(e) {
-                eventHandler && eventHandler(e);
-                releaseCaptureHandler && releaseCaptureHandler();
-
-                event.removeListener(el, "mousemove", eventHandler);
-                event.removeListener(el, "mouseup", onReleaseCapture);
-                event.removeListener(el, "losecapture", onReleaseCapture);
-
-                el.releaseCapture();
-            }
-
-            event.addListener(el, "mousemove", eventHandler);
-            event.addListener(el, "mouseup", onReleaseCapture);
-            event.addListener(el, "losecapture", onReleaseCapture);
-            el.setCapture();
-        };
     }
+    if (elem.attachEvent) {
+        var wrapper = function() {
+            callback(window.event);
+        };
+        callback._wrapper = wrapper;
+        elem.attachEvent("on" + type, wrapper);
+    }
+};
+
+exports.removeListener = function(elem, type, callback) {
+    if (elem.removeEventListener) {
+        return elem.removeEventListener(type, callback, false);
+    }
+    if (elem.detachEvent) {
+        elem.detachEvent("on" + type, callback._wrapper || callback);
+    }
+};
+
+exports.stopEvent = function(e) {
+    exports.stopPropagation(e);
+    exports.preventDefault(e);
+    return false;
+};
+
+exports.stopPropagation = function(e) {
+    if (e.stopPropagation)
+        e.stopPropagation();
+    else
+        e.cancelBubble = true;
+};
+
+exports.preventDefault = function(e) {
+    if (e.preventDefault)
+        e.preventDefault();
+    else
+        e.returnValue = false;
+};
+
+exports.getDocumentX = function(e) {
+    if (e.clientX) {
+        var scrollLeft = document.documentElement.scrollLeft || document.body.scrollLeft;
+        return e.clientX + scrollLeft;
+    } else {
+        return e.pageX;
+    }
+};
+
+exports.getDocumentY = function(e) {
+    if (e.clientY) {
+        var scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
+        return e.clientY + scrollTop;
+    } else {
+        return e.pageX;
+    }
+};
+
+/**
+ * @return {Number} 0 for left button, 1 for middle button, 2 for right button
+ */
+exports.getButton = function(e) {
+    // DOM Event
+    if (e.preventDefault) {
+        return e.button;
+    }
+    // old IE
     else {
-        event.capture = function(el, eventHandler, releaseCaptureHandler) {
+        return Math.max(e.button - 1, 2);
-            function onMouseMove(e) {
-                eventHandler(e);
-                e.stopPropagation();
-            }
-
-            function onMouseUp(e) {
-                eventHandler && eventHandler(e);
-                releaseCaptureHandler && releaseCaptureHandler();
-
-                document.removeEventListener("mousemove", onMouseMove, true);
-                document.removeEventListener("mouseup", onMouseUp, true);
-
-                e.stopPropagation();
-            }
-
-            document.addEventListener("mousemove", onMouseMove, true);
-            document.addEventListener("mouseup", onMouseUp, true);
-        };
     }
+};
 
-    event.addMouseWheelListener = function(el, callback) {
+if (document.documentElement.setCapture) {
-        var listener = function(e) {
+    exports.capture = function(el, eventHandler, releaseCaptureHandler) {
-            if (e.wheelDelta !== undefined) {
+        function onMouseMove(e) {
-                if (e.wheelDeltaX !== undefined) {
+            eventHandler(e);
-                    e.wheelX = -e.wheelDeltaX / 8;
+            return exports.stopPropagation(e);
-                    e.wheelY = -e.wheelDeltaY / 8;
-                } else {
-                    e.wheelX = 0;
-                    e.wheelY = -e.wheelDelta / 8;
-                }
-            }
-            else {
-                if (e.axis && e.axis == e.HORIZONTAL_AXIS) {
-                    e.wheelX = (e.detail || 0) * 5;
-                    e.wheelY = 0;
-                } else {
-                    e.wheelX = 0;
-                    e.wheelY = (e.detail || 0) * 5;
-                }
-            }
-            callback(e);
-        };
-        event.addListener(el, "DOMMouseScroll", listener);
-        event.addListener(el, "mousewheel", listener);
-    };
-
-    event.addMultiMouseDownListener = function(el, button, count, timeout, callback) {
-        var clicks = 0;
-        var startX, startY;
-
-        var listener = function(e) {
-            clicks += 1;
-            if (clicks == 1) {
-                startX = e.clientX;
-                startY = e.clientY;
-
-                setTimeout(function() {
-                    clicks = 0;
-                }, timeout || 600);
-            }
-
-            if (event.getButton(e) != button
-              || Math.abs(e.clientX - startX) > 5 || Math.abs(e.clientY - startY) > 5)
-                clicks = 0;
-
-            if (clicks == count) {
-                clicks = 0;
-                callback(e);
-            }
-            return event.preventDefault(e);
-        };
-
-        event.addListener(el, "mousedown", listener);
-        core.isIE && event.addListener(el, "dblclick", listener);
-    };
-
-    event.addKeyListener = function(el, callback) {
-        var lastDown = null;
-
-        event.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) {
-                var keyId = e.keyIdentifier || e.keyCode;
-                if (lastDown !== keyId) {
-                    return callback(e);
-                } else {
-                    lastDown = null;
-                }
-            });
         }
+
+        function onReleaseCapture(e) {
+            eventHandler && eventHandler(e);
+            releaseCaptureHandler && releaseCaptureHandler();
+
+            exports.removeListener(el, "mousemove", eventHandler);
+            exports.removeListener(el, "mouseup", onReleaseCapture);
+            exports.removeListener(el, "losecapture", onReleaseCapture);
+
+            el.releaseCapture();
+        }
+
+        exports.addListener(el, "mousemove", eventHandler);
+        exports.addListener(el, "mouseup", onReleaseCapture);
+        exports.addListener(el, "losecapture", onReleaseCapture);
+        el.setCapture();
+    };
+}
+else {
+    exports.capture = function(el, eventHandler, releaseCaptureHandler) {
+        function onMouseMove(e) {
+            eventHandler(e);
+            e.stopPropagation();
+        }
+
+        function onMouseUp(e) {
+            eventHandler && eventHandler(e);
+            releaseCaptureHandler && releaseCaptureHandler();
+
+            exports.removeEventListener("mousemove", onMouseMove, true);
+            exports.removeEventListener("mouseup", onMouseUp, true);
+
+            e.stopPropagation();
+        }
+
+        exports.addEventListener("mousemove", onMouseMove, true);
+        exports.addEventListener("mouseup", onMouseUp, true);
+    };
+}
+
+exports.addMouseWheelListener = function(el, callback) {
+    var listener = function(e) {
+        if (e.wheelDelta !== undefined) {
+            if (e.wheelDeltaX !== undefined) {
+                e.wheelX = -e.wheelDeltaX / 8;
+                e.wheelY = -e.wheelDeltaY / 8;
+            } else {
+                e.wheelX = 0;
+                e.wheelY = -e.wheelDelta / 8;
+            }
+        }
+        else {
+            if (e.axis && e.axis == e.HORIZONTAL_AXIS) {
+                e.wheelX = (e.detail || 0) * 5;
+                e.wheelY = 0;
+            } else {
+                e.wheelX = 0;
+                e.wheelY = (e.detail || 0) * 5;
+            }
+        }
+        callback(e);
+    };
+    exports.addListener(el, "DOMMouseScroll", listener);
+    exports.addListener(el, "mousewheel", listener);
+};
+
+exports.addMultiMouseDownListener = function(el, button, count, timeout, callback) {
+    var clicks = 0;
+    var startX, startY;
+
+    var listener = function(e) {
+        clicks += 1;
+        if (clicks == 1) {
+            startX = e.clientX;
+            startY = e.clientY;
+
+            setTimeout(function() {
+                clicks = 0;
+            }, timeout || 600);
+        }
+
+        if (exports.getButton(e) != button
+          || Math.abs(e.clientX - startX) > 5 || Math.abs(e.clientY - startY) > 5)
+            clicks = 0;
+
+        if (clicks == count) {
+            clicks = 0;
+            callback(e);
+        }
+        return exports.preventDefault(e);
     };
 
-    exports.event = event;
+    exports.addListener(el, "mousedown", listener);
+    core.isIE && exports.addListener(el, "dblclick", listener);
+};
+
+exports.addKeyListener = function(el, callback) {
+    var lastDown = null;
+
+    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) {
+        exports.addListener(el, "keypress", function(e) {
+            var keyId = e.keyIdentifier || e.keyCode;
+            if (lastDown !== keyId) {
+                return callback(e);
+            } else {
+                lastDown = null;
+            }
+        });
+    }
+};
 
 });

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,90 +37,86 @@
 
 define(function(require, exports, module) {
 
+exports.stringReverse = function(string) {
+    return string.split("").reverse().join("");
+};
 
-    var lang = {};
+exports.stringRepeat = function (string, count) {
+     return new Array(count + 1).join(string);
+};
 
-    lang.stringReverse = function(string) {
+if (Array.prototype.indexOf) {
-        return string.split("").reverse().join("");
+    exports.arrayIndexOf = function(array, searchElement) {
+        return array.indexOf(searchElement);
     };
-
+}
-    lang.stringRepeat = function (string, count) {
+else {
-         return new Array(count + 1).join(string);
+    exports.arrayIndexOf = function(array, searchElement) {
-    };
+        for (var i=0; i<array.length; i++) {
-
+            if (array[i] == searchElement) {
-    if (Array.prototype.indexOf) {
+                return i;
-        lang.arrayIndexOf = function(array, searchElement) {
-            return array.indexOf(searchElement);
-        };
-    }
-    else {
-        lang.arrayIndexOf = function(array, searchElement) {
-            for (var i=0; i<array.length; i++) {
-                if (array[i] == searchElement) {
-                    return i;
-                }
             }
-            return -1;
+        }
-        };
+        return -1;
+    };
+}
+
+exports.isArray = function(value) {
+    return Object.prototype.toString.call(value) == "[object Array]";
+};
+
+exports.copyObject = function(obj) {
+    var copy = {};
+    for (var key in obj) {
+        copy[key] = obj[key];
     }
+    return copy;
+};
 
-    lang.isArray = function(value) {
+exports.arrayToMap = function(arr) {
-        return Object.prototype.toString.call(value) == "[object Array]";
+    var map = {};
+    for (var i=0; i<arr.length; i++) {
+        map[arr[i]] = 1;
+    }
+    return map;
+
+};
+
+exports.escapeRegExp = function(str) {
+    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
+};
+
+exports.bind = function(fcn, context) {
+    return function() {
+        return fcn.apply(context, arguments);
+    };
+};
+
+exports.deferredCall = function(fcn) {
+
+    var timer = null;
+    var callback = function() {
+        timer = null;
+        fcn();
     };
 
-    lang.copyObject = function(obj) {
+    return {
-        var copy = {};
+      schedule: function() {
-        for (var key in obj) {
+        if (!timer) {
-            copy[key] = obj[key];
+            timer = setTimeout(callback, 0);
         }
-        return copy;
+      },
-    };
 
-    lang.arrayToMap = function(arr) {
+      call: function() {
-        var map = {};
+          this.cancel();
-        for (var i=0; i<arr.length; i++) {
+          fcn();
-            map[arr[i]] = 1;
+      },
-        }
-        return map;
 
-    };
+      cancel: function() {
+          clearTimeout(timer);
+          timer = null;
+      }
+  };
+};
 
-    lang.escapeRegExp = function(str) {
-        return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
-    };
-
-    lang.bind = function(fcn, context) {
-        return function() {
-            return fcn.apply(context, arguments);
-        };
-    };
-
-    lang.deferredCall = function(fcn) {
-
-        var timer = null;
-        var callback = function() {
-            timer = null;
-            fcn();
-        };
-
-        return {
-          schedule: function() {
-            if (!timer) {
-                timer = setTimeout(callback, 0);
-            }
-          },
-
-          call: function() {
-              this.cancel();
-              fcn();
-          },
-
-          cancel: function() {
-              clearTimeout(timer);
-              timer = null;
-          }
-      };
-    };
-
-    exports.lang = lang;
 });

plugins/pilot/oop.js

@@ -37,25 +37,22 @@
 
 define(function(require, exports, module) {
 
-    var oop = {};
+exports.inherits = function(ctor, superCtor) {
+    var tempCtor = function() {};
+    tempCtor.prototype = superCtor.prototype;
+    ctor.super_ = superCtor.prototype;
+    ctor.prototype = new tempCtor();
+    ctor.prototype.constructor = ctor;
+};
 
-    oop.inherits = function(ctor, superCtor) {
+exports.mixin = function(obj, mixin) {
-        var tempCtor = function() {};
+    for (var key in mixin) {
-        tempCtor.prototype = superCtor.prototype;
+        obj[key] = mixin[key];
-        ctor.super_ = superCtor.prototype;
+    }
-        ctor.prototype = new tempCtor();
+};
-        ctor.prototype.constructor = ctor;
-    };
 
-    oop.mixin = function(obj, mixin) {
+exports.implement = function(proto, mixin) {
-        for (var key in mixin) {
+    exports.mixin(proto, mixin);
-            obj[key] = mixin[key];
+};
-        }
-    };
 
-    oop.implement = function(proto, mixin) {
-        oop.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');