flight: upgrade libraries

Upgraded to flight 1.0.4 which removed `Component#bind` in favor of the native
or polyfilled `Function#bind` and used the new require.js bower format.

Waiting for @phuu to upgrade to Flight 1.1. :)

dependency-examples/flight/app/js/main.js

@@ -6,7 +6,7 @@ require.config({
 		jquery: 'bower_components/jquery/jquery',
 		es5shim: 'bower_components/es5-shim/es5-shim',
 		es5sham: 'bower_components/es5-shim/es5-sham',
-		text: 'bower_components/requirejs/plugins/text'
+		text: 'bower_components/requirejs-text/text'
 	},
 	map: {
 		'*': {

dependency-examples/flight/app/js/ui/todo_list.js

@@ -93,8 +93,8 @@ define([
 			this.on('click', { 'toggleSelector': this.toggle });
 			this.on('dblclick', { 'labelSelector': this.edit });
 
-			this.$node.on('blur', '.edit', this.bind(this.requestUpdate));
-			this.$node.on('keydown', '.edit', this.bind(this.requestUpdateOnEnter));
+			this.$node.on('blur', '.edit', this.requestUpdate.bind(this));
+			this.$node.on('keydown', '.edit', this.requestUpdateOnEnter.bind(this));
 
 			// these don't work
 			// this.on(this.attr.editSelector, 'blur', this.requestUpdate);

dependency-examples/flight/bower.json

@@ -4,9 +4,10 @@
   "dependencies": {
     "depot": "~0.1.4",
     "es5-shim": "git://github.com/kriskowal/es5-shim.git#2.0.0",
-    "flight": "~1.0.3",
+    "flight": "~1.0.4",
     "jquery": "1.8.3",
     "requirejs": "~2.1.5",
-    "todomvc-common": "~0.1.4"
+    "todomvc-common": "~0.1.4",
+    "requirejs-text": "~2.0.10"
   }
 }

dependency-examples/flight/bower_components/depot/depot.js

-/* ----------------------------------
- * depot.js v0.1.0
- * Licensed under The MIT License
- * http://opensource.org/licenses/MIT
- * ---------------------------------- */
+// depot.js v0.1.6
+
+// (c) 2013 Michal Kuklis
+// Licensed under The MIT License
+// http://opensource.org/licenses/MIT
 
-// commonjs, amd, global
 (function (name, root, factory) {
-  if (typeof exports === 'object') {
+  if (typeof exports == 'object') {
     module.exports = factory();
-  } else if (typeof define === 'function' && define.amd) {
+  } else if (typeof define == 'function' && define.amd) {
     define(factory);
   } else {
     root[name] = factory();
   }
 }("depot", this, function () {
-  
+
   "use strict";
 
   // depot api
@@ -28,17 +27,30 @@
         record[this.idAttribute] = guid();
       }
 
-      id = record[this.idAttribute];
+      id = record[this.idAttribute] + '';
 
-      if (this.ids.indexOf(id) >= 0) {
-        record = extend(this.get(id), record);
-      }
-      else {
+      if (this.ids.indexOf(id) < 0) {
         this.ids.push(id);
-        localStorage.setItem(this.name, this.ids.join(","));
+        this.storageAdaptor.setItem(this.name, this.ids.join(","));
       }
 
-      localStorage.setItem(getKey(this.name, id), JSON.stringify(record));
+      this.storageAdaptor.setItem(getKey(this.name, id), JSON.stringify(record));
+
+      return record;
+    },
+
+    update: function (id, data) {
+      if (typeof data == 'undefined') {
+        data = id;
+        id = data[this.idAttribute];
+      }
+
+      var record = this.get(id);
+
+      if (record) {
+        record = extend(record, data);
+        this.save(record);
+      }
 
       return record;
     },
@@ -57,11 +69,12 @@
     find: function (criteria) {
       var key, match, record;
       var name = this.name;
+      var self = this;
 
       if (!criteria) return this.all();
 
       return this.ids.reduce(function (memo, id) {
-        record = jsonData(localStorage.getItem(getKey(name, id)));
+        record = jsonData(self.storageAdaptor.getItem(getKey(name, id)));
         match = findMatch(criteria, record);
 
         if (match) {
@@ -73,14 +86,14 @@
     },
 
     get: function (id) {
-      return jsonData(localStorage.getItem(getKey(this.name, id))); 
+      return jsonData(this.storageAdaptor.getItem(getKey(this.name, id)));
     },
 
     all: function () {
-      var record, name = this.name;
+      var record, self = this, name = this.name;
 
       return this.ids.reduce(function (memo, id) {
-        record = localStorage.getItem(getKey(name, id));
+        record = self.storageAdaptor.getItem(getKey(name, id));
 
         if (record) {
           memo.push(jsonData(record));
@@ -95,12 +108,12 @@
       var id = (record[this.idAttribute]) ? record[this.idAttribute] : record;
       var key = getKey(this.name, id);
 
-      record = jsonData(localStorage.getItem(key));
-      localStorage.removeItem(key);
+      record = jsonData(this.storageAdaptor.getItem(key));
+      this.storageAdaptor.removeItem(key);
 
       index = this.ids.indexOf(id);
-      if (index != -1) this.ids.splice(index, 1); 
-      localStorage.setItem(this.name, this.ids.join(","));
+      if (index != -1) this.ids.splice(index, 1);
+      this.storageAdaptor.setItem(this.name, this.ids.join(","));
 
       return record;
     },
@@ -114,27 +127,31 @@
 
         if (criteria) {
 
-          record = jsonData(localStorage.getItem(key));
+          record = jsonData(this.storageAdaptor.getItem(key));
           match = findMatch(criteria, record);
 
           if (match) {
-            localStorage.removeItem(key);
+            this.storageAdaptor.removeItem(key);
             this.ids.splice(i, 1);
           }
 
         }
         else {
-          localStorage.removeItem(key);
+          this.storageAdaptor.removeItem(key);
         }
       }
 
       if (criteria) {
-        localStorage.setItem(this.name, this.ids.join(","));
+        this.storageAdaptor.setItem(this.name, this.ids.join(","));
       }
       else {
-        localStorage.removeItem(this.name);
+        this.storageAdaptor.removeItem(this.name);
         this.ids = [];
       }
+    },
+
+    size: function () {
+      return this.ids.length;
     }
   };
 
@@ -170,7 +187,7 @@
   }
 
   function guid() {
-    return s4() + s4() + '-' + s4() + '-' + s4() + 
+    return s4() + s4() + '-' + s4() + '-' + s4() +
       '-' +s4() + '-' + s4() + s4() + s4();
   }
 
@@ -187,17 +204,22 @@
   function depot(name, options) {
     var store, ids;
 
-    if (!localStorage) throw new Error("localStorage not found");
+    options = extend({
+      idAttribute: '_id',
+      storageAdaptor: localStorage
+    }, options);
+
+    if (!options.storageAdaptor) throw new Error("No storage adaptor was found");
 
-    store = localStorage.getItem(name);
+    store = options.storageAdaptor.getItem(name);
     ids = (store && store.split(",")) || [];
-    options = options || {};
 
-    return Object.create(api, { 
+    return Object.create(api, {
       name: { value: name },
       store: { value: store },
       ids: { value: ids, writable: true },
-      idAttribute: { value: options.idAttribute || '_id' }
+      idAttribute: { value: options.idAttribute },
+      storageAdaptor: { value: options.storageAdaptor }
     });
   }
 

dependency-examples/flight/bower_components/es5-shim/es5-sham.js

 // Copyright 2009-2012 by contributors, MIT License
 // vim: ts=4 sts=4 sw=4 expandtab
+
 // Module systems magic dance
 (function (definition) {
     // RequireJS
@@ -95,63 +96,15 @@ if (!Object.getOwnPropertyNames) {
 // ES5 15.2.3.5
 // http://es5.github.com/#x15.2.3.5
 if (!Object.create) {
-
-    // Contributed by Brandon Benvie, October, 2012
-    var createEmpty;
-    var supportsProto = Object.prototype.__proto__ === null;
-    if (supportsProto || typeof document == 'undefined') {
-        createEmpty = function () {
-            return { "__proto__": null };
-        };
-    } else {
-        // In old IE __proto__ can't be used to manually set `null`, nor does
-        // any other method exist to make an object that inherits from nothing,
-        // aside from Object.prototype itself. Instead, create a new global
-        // object and *steal* its Object.prototype and strip it bare. This is
-        // used as the prototype to create nullary objects.
-        createEmpty = (function () {
-            var iframe = document.createElement('iframe');
-            var parent = document.body || document.documentElement;
-            iframe.style.display = 'none';
-            parent.appendChild(iframe);
-            iframe.src = 'javascript:';
-            var empty = iframe.contentWindow.Object.prototype;
-            parent.removeChild(iframe);
-            iframe = null;
-            delete empty.constructor;
-            delete empty.hasOwnProperty;
-            delete empty.propertyIsEnumerable;
-            delete empty.isPrototypeOf;
-            delete empty.toLocaleString;
-            delete empty.toString;
-            delete empty.valueOf;
-            empty.__proto__ = null;
-
-            function Empty() {}
-            Empty.prototype = empty;
-
-            return function () {
-                return new Empty();
-            };
-        })();
-    }
-
     Object.create = function create(prototype, properties) {
-
         var object;
-        function Type() {}  // An empty constructor.
-
         if (prototype === null) {
-            object = createEmpty();
+            object = { "__proto__": null };
         } else {
-            if (typeof prototype !== "object" && typeof prototype !== "function") {
-                // In the native implementation `parent` can be `null`
-                // OR *any* `instanceof Object`  (Object|Function|Array|RegExp|etc)
-                // Use `typeof` tho, b/c in old IE, DOM elements are not `instanceof Object`
-                // like they are in modern browsers. Using `Object.create` on DOM elements
-                // is...err...probably inappropriate, but the native version allows for it.
-                throw new TypeError("Object prototype may only be an Object or null"); // same msg as Chrome
+            if (typeof prototype != "object") {
+                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
             }
+            var Type = function () {};
             Type.prototype = prototype;
             object = new Type();
             // IE has no built-in implementation of `Object.getPrototypeOf`
@@ -160,11 +113,9 @@ if (!Object.create) {
             // objects created using `Object.create`
             object.__proto__ = prototype;
         }
-
         if (properties !== void 0) {
             Object.defineProperties(object, properties);
         }
-
         return object;
     };
 }
@@ -197,8 +148,7 @@ if (Object.defineProperty) {
     var definePropertyWorksOnDom = typeof document == "undefined" ||
         doesDefinePropertyWork(document.createElement("div"));
     if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty,
-            definePropertiesFallback = Object.defineProperties;
+        var definePropertyFallback = Object.defineProperty;
     }
 }
 
@@ -278,17 +228,8 @@ if (!Object.defineProperty || definePropertyFallback) {
 
 // ES5 15.2.3.7
 // http://es5.github.com/#x15.2.3.7
-if (!Object.defineProperties || definePropertiesFallback) {
+if (!Object.defineProperties) {
     Object.defineProperties = function defineProperties(object, properties) {
-        // make a valiant attempt to use the real defineProperties
-        if (definePropertiesFallback) {
-            try {
-                return definePropertiesFallback.call(Object, object, properties);
-            } catch (exception) {
-                // try the shim if the real one doesn't work
-            }
-        }
-        
         for (var property in properties) {
             if (owns(properties, property) && property != "__proto__") {
                 Object.defineProperty(object, property, properties[property]);

dependency-examples/flight/bower_components/es5-shim/es5-shim.js

@@ -32,8 +32,6 @@
 // ES-5 15.3.4.5
 // http://es5.github.com/#x15.3.4.5
 
-function Empty() {}
-
 if (!Function.prototype.bind) {
     Function.prototype.bind = function bind(that) { // .length is 1
         // 1. Let Target be the this value.
@@ -74,14 +72,18 @@ if (!Function.prototype.bind) {
                 // 5. Return the result of calling the [[Construct]] internal
                 //   method of target providing args as the arguments.
 
+                var F = function(){};
+                F.prototype = target.prototype;
+                var self = new F;
+
                 var result = target.apply(
-                    this,
+                    self,
                     args.concat(slice.call(arguments))
                 );
                 if (Object(result) === result) {
                     return result;
                 }
-                return this;
+                return self;
 
             } else {
                 // 15.3.4.5.1 [[Call]]
@@ -111,12 +113,6 @@ if (!Function.prototype.bind) {
             }
 
         };
-        if(target.prototype) {
-            Empty.prototype = target.prototype;
-            bound.prototype = new Empty();
-            // Clean up dangling references.
-            Empty.prototype = null;
-        }
         // XXX bound.length is never writable, so don't even try
         //
         // 15. If the [[Class]] internal property of Target is "Function", then
@@ -182,38 +178,6 @@ if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
 // =====
 //
 
-// ES5 15.4.4.12
-// http://es5.github.com/#x15.4.4.12
-// Default value for second param
-// [bugfix, ielt9, old browsers]
-// IE < 9 bug: [1,2].splice(0).join("") == "" but should be "12"
-if ([1,2].splice(0).length != 2) {
-    var array_splice = Array.prototype.splice;
-    Array.prototype.splice = function(start, deleteCount) {
-        if (!arguments.length) {
-            return [];
-        } else {
-            return array_splice.apply(this, [
-                start === void 0 ? 0 : start,
-                deleteCount === void 0 ? (this.length - start) : deleteCount
-            ].concat(slice.call(arguments, 2)))
-        }
-    };
-}
-
-// ES5 15.4.4.12
-// http://es5.github.com/#x15.4.4.13
-// Return len+argCount.
-// [bugfix, ielt8]
-// IE < 8 bug: [].unshift(0) == undefined but should be "1"
-if ([].unshift(0) != 1) {
-    var array_unshift = Array.prototype.unshift;
-    Array.prototype.unshift = function() {
-        array_unshift.apply(this, arguments);
-        return this.length;
-    };
-}
-
 // ES5 15.4.3.2
 // http://es5.github.com/#x15.4.3.2
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
@@ -238,18 +202,9 @@ if (!Array.isArray) {
 // ES5 15.4.4.18
 // http://es5.github.com/#x15.4.4.18
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
-
-// Check failure of by-index access of string characters (IE < 9)
-// and failure of `0 in boxedString` (Rhino)
-var boxedString = Object("a"),
-    splitString = boxedString[0] != "a" || !(0 in boxedString);
-
 if (!Array.prototype.forEach) {
     Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
+        var self = toObject(this),
             thisp = arguments[1],
             i = -1,
             length = self.length >>> 0;
@@ -262,9 +217,8 @@ if (!Array.prototype.forEach) {
         while (++i < length) {
             if (i in self) {
                 // Invoke the callback function with call, passing arguments:
-                // context, property value, property key, thisArg object
-                // context
-                fun.call(thisp, self[i], i, object);
+                // context, property value, property key, thisArg object context
+                fun.call(thisp, self[i], i, self);
             }
         }
     };
@@ -275,10 +229,7 @@ if (!Array.prototype.forEach) {
 // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
 if (!Array.prototype.map) {
     Array.prototype.map = function map(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
+        var self = toObject(this),
             length = self.length >>> 0,
             result = Array(length),
             thisp = arguments[1];
@@ -290,7 +241,7 @@ if (!Array.prototype.map) {
 
         for (var i = 0; i < length; i++) {
             if (i in self)
-                result[i] = fun.call(thisp, self[i], i, object);
+                result[i] = fun.call(thisp, self[i], i, self);
         }
         return result;
     };
@@ -301,10 +252,7 @@ if (!Array.prototype.map) {
 // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
 if (!Array.prototype.filter) {
     Array.prototype.filter = function filter(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                    object,
+        var self = toObject(this),
             length = self.length >>> 0,
             result = [],
             value,
@@ -318,7 +266,7 @@ if (!Array.prototype.filter) {
         for (var i = 0; i < length; i++) {
             if (i in self) {
                 value = self[i];
-                if (fun.call(thisp, value, i, object)) {
+                if (fun.call(thisp, value, i, self)) {
                     result.push(value);
                 }
             }
@@ -332,10 +280,7 @@ if (!Array.prototype.filter) {
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
 if (!Array.prototype.every) {
     Array.prototype.every = function every(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
+        var self = toObject(this),
             length = self.length >>> 0,
             thisp = arguments[1];
 
@@ -345,7 +290,7 @@ if (!Array.prototype.every) {
         }
 
         for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, object)) {
+            if (i in self && !fun.call(thisp, self[i], i, self)) {
                 return false;
             }
         }
@@ -358,10 +303,7 @@ if (!Array.prototype.every) {
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
 if (!Array.prototype.some) {
     Array.prototype.some = function some(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
+        var self = toObject(this),
             length = self.length >>> 0,
             thisp = arguments[1];
 
@@ -371,7 +313,7 @@ if (!Array.prototype.some) {
         }
 
         for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, object)) {
+            if (i in self && fun.call(thisp, self[i], i, self)) {
                 return true;
             }
         }
@@ -384,10 +326,7 @@ if (!Array.prototype.some) {
 // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
 if (!Array.prototype.reduce) {
     Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
+        var self = toObject(this),
             length = self.length >>> 0;
 
         // If no callback function or if callback is not a callable function
@@ -397,7 +336,7 @@ if (!Array.prototype.reduce) {
 
         // no value to return if no initial value and an empty array
         if (!length && arguments.length == 1) {
-            throw new TypeError("reduce of empty array with no initial value");
+            throw new TypeError('reduce of empty array with no initial value');
         }
 
         var i = 0;
@@ -413,14 +352,14 @@ if (!Array.prototype.reduce) {
 
                 // if array contains no values, no initial value to return
                 if (++i >= length) {
-                    throw new TypeError("reduce of empty array with no initial value");
+                    throw new TypeError('reduce of empty array with no initial value');
                 }
             } while (true);
         }
 
         for (; i < length; i++) {
             if (i in self) {
-                result = fun.call(void 0, result, self[i], i, object);
+                result = fun.call(void 0, result, self[i], i, self);
             }
         }
 
@@ -433,10 +372,7 @@ if (!Array.prototype.reduce) {
 // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
 if (!Array.prototype.reduceRight) {
     Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
+        var self = toObject(this),
             length = self.length >>> 0;
 
         // If no callback function or if callback is not a callable function
@@ -446,7 +382,7 @@ if (!Array.prototype.reduceRight) {
 
         // no value to return if no initial value, empty array
         if (!length && arguments.length == 1) {
-            throw new TypeError("reduceRight of empty array with no initial value");
+            throw new TypeError('reduceRight of empty array with no initial value');
         }
 
         var result, i = length - 1;
@@ -461,14 +397,14 @@ if (!Array.prototype.reduceRight) {
 
                 // if array contains no values, no initial value to return
                 if (--i < 0) {
-                    throw new TypeError("reduceRight of empty array with no initial value");
+                    throw new TypeError('reduceRight of empty array with no initial value');
                 }
             } while (true);
         }
 
         do {
             if (i in this) {
-                result = fun.call(void 0, result, self[i], i, object);
+                result = fun.call(void 0, result, self[i], i, self);
             }
         } while (i--);
 
@@ -479,11 +415,9 @@ if (!Array.prototype.reduceRight) {
 // ES5 15.4.4.14
 // http://es5.github.com/#x15.4.4.14
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) != -1)) {
+if (!Array.prototype.indexOf) {
     Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
+        var self = toObject(this),
             length = self.length >>> 0;
 
         if (!length) {
@@ -509,11 +443,9 @@ if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) != -1)) {
 // ES5 15.4.4.15
 // http://es5.github.com/#x15.4.4.15
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) != -1)) {
+if (!Array.prototype.lastIndexOf) {
     Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
+        var self = toObject(this),
             length = self.length >>> 0;
 
         if (!length) {
@@ -561,10 +493,7 @@ if (!Object.keys) {
 
     Object.keys = function keys(object) {
 
-        if (
-            (typeof object != "object" && typeof object != "function") ||
-            object === null
-        ) {
+        if ((typeof object != "object" && typeof object != "function") || object === null) {
             throw new TypeError("Object.keys called on a non-object");
         }
 
@@ -600,96 +529,64 @@ if (!Object.keys) {
 // string format defined in 15.9.1.15. All fields are present in the String.
 // The time zone is always UTC, denoted by the suffix Z. If the time value of
 // this object is not a finite Number a RangeError exception is thrown.
-var negativeDate = -62198755200000,
-    negativeYearString = "-000001";
-if (
-    !Date.prototype.toISOString ||
-    (new Date(negativeDate).toISOString().indexOf(negativeYearString) === -1)
-) {
+if (!Date.prototype.toISOString || (new Date(-62198755200000).toISOString().indexOf('-000001') === -1)) {
     Date.prototype.toISOString = function toISOString() {
-        var result, length, value, year, month;
+        var result, length, value, year;
         if (!isFinite(this)) {
             throw new RangeError("Date.prototype.toISOString called on non-finite value.");
         }
 
-        year = this.getUTCFullYear();
-
-        month = this.getUTCMonth();
-        // see https://github.com/kriskowal/es5-shim/issues/111
-        year += Math.floor(month / 12);
-        month = (month % 12 + 12) % 12;
-
         // the date time string format is specified in 15.9.1.15.
-        result = [month + 1, this.getUTCDate(),
+        result = [this.getUTCMonth() + 1, this.getUTCDate(),
             this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
-        year = (
-            (year < 0 ? "-" : (year > 9999 ? "+" : "")) +
-            ("00000" + Math.abs(year))
-            .slice(0 <= year && year <= 9999 ? -4 : -6)
-        );
+        year = this.getUTCFullYear();
+        year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6);
 
         length = result.length;
         while (length--) {
             value = result[length];
-            // pad months, days, hours, minutes, and seconds to have two
-            // digits.
+            // pad months, days, hours, minutes, and seconds to have two digits.
             if (value < 10) {
                 result[length] = "0" + value;
             }
         }
         // pad milliseconds to have three digits.
-        return (
-            year + "-" + result.slice(0, 2).join("-") +
-            "T" + result.slice(2).join(":") + "." +
-            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z"
-        );
-    };
+        return year + "-" + result.slice(0, 2).join("-") + "T" + result.slice(2).join(":") + "." +
+            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z";
+    }
 }
 
+// ES5 15.9.4.4
+// http://es5.github.com/#x15.9.4.4
+if (!Date.now) {
+    Date.now = function now() {
+        return new Date().getTime();
+    };
+}
 
 // ES5 15.9.5.44
 // http://es5.github.com/#x15.9.5.44
 // This function provides a String representation of a Date object for use by
 // JSON.stringify (15.12.3).
-var dateToJSONIsSupported = false;
-try {
-    dateToJSONIsSupported = (
-        Date.prototype.toJSON &&
-        new Date(NaN).toJSON() === null &&
-        new Date(negativeDate).toJSON().indexOf(negativeYearString) !== -1 &&
-        Date.prototype.toJSON.call({ // generic
-            toISOString: function () {
-                return true;
-            }
-        })
-    );
-} catch (e) {
-}
-if (!dateToJSONIsSupported) {
+if (!Date.prototype.toJSON) {
     Date.prototype.toJSON = function toJSON(key) {
         // When the toJSON method is called with argument key, the following
         // steps are taken:
 
         // 1.  Let O be the result of calling ToObject, giving it the this
         // value as its argument.
-        // 2. Let tv be toPrimitive(O, hint Number).
-        var o = Object(this),
-            tv = toPrimitive(o),
-            toISO;
+        // 2. Let tv be ToPrimitive(O, hint Number).
         // 3. If tv is a Number and is not finite, return null.
-        if (typeof tv === "number" && !isFinite(tv)) {
-            return null;
-        }
+        // XXX
         // 4. Let toISO be the result of calling the [[Get]] internal method of
         // O with argument "toISOString".
-        toISO = o.toISOString;
         // 5. If IsCallable(toISO) is false, throw a TypeError exception.
-        if (typeof toISO != "function") {
-            throw new TypeError("toISOString property is not callable");
+        if (typeof this.toISOString != "function") {
+            throw new TypeError('toISOString property is not callable');
         }
         // 6. Return the result of calling the [[Call]] internal method of
         //  toISO with O as the this value and an empty argument list.
-        return toISO.call(o);
+        return this.toISOString();
 
         // NOTE 1 The argument is ignored.
 
@@ -706,13 +603,13 @@ if (!dateToJSONIsSupported) {
 // http://es5.github.com/#x15.9.4.2
 // based on work shared by Daniel Friesen (dantman)
 // http://gist.github.com/303249
-if (!Date.parse || "Date.parse is buggy") {
+if (!Date.parse || Date.parse("+275760-09-13T00:00:00.000Z") !== 8.64e15) {
     // XXX global assignment won't work in embeddings that use
     // an alternate object for the context.
     Date = (function(NativeDate) {
 
         // Date.length === 7
-        function Date(Y, M, D, h, m, s, ms) {
+        var Date = function Date(Y, M, D, h, m, s, ms) {
             var length = arguments.length;
             if (this instanceof NativeDate) {
                 var date = length == 1 && String(Y) === Y ? // isString(Y)
@@ -737,8 +634,7 @@ if (!Date.parse || "Date.parse is buggy") {
 
         // 15.9.1.15 Date Time String Format.
         var isoDateExpression = new RegExp("^" +
-            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign +
-                                      // 6-digit extended year
+            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign + 6-digit extended year
             "(?:-(\\d{2})" + // optional month capture
             "(?:-(\\d{2})" + // optional day capture
             "(?:" + // capture hours:minutes:seconds.milliseconds
@@ -748,7 +644,7 @@ if (!Date.parse || "Date.parse is buggy") {
                     ":(\\d{2})" + // seconds capture
                     "(?:\\.(\\d{3}))?" + // milliseconds capture
                 ")?" +
-            "(" + // capture UTC offset component
+            "(?:" + // capture UTC offset component
                 "Z|" + // UTC capture
                 "(?:" + // offset specifier +/-hours:minutes
                     "([-+])" + // sign capture
@@ -758,21 +654,6 @@ if (!Date.parse || "Date.parse is buggy") {
             ")?)?)?)?" +
         "$");
 
-        var months = [
-            0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365
-        ];
-
-        function dayFromMonth(year, month) {
-            var t = month > 1 ? 1 : 0;
-            return (
-                months[month] +
-                Math.floor((year - 1969 + t) / 4) -
-                Math.floor((year - 1901 + t) / 100) +
-                Math.floor((year - 1601 + t) / 400) +
-                365 * (year - 1970)
-            );
-        }
-
         // Copy any custom methods a 3rd party library may have added
         for (var key in NativeDate) {
             Date[key] = NativeDate[key];
@@ -788,53 +669,47 @@ if (!Date.parse || "Date.parse is buggy") {
         Date.parse = function parse(string) {
             var match = isoDateExpression.exec(string);
             if (match) {
+                match.shift(); // kill match[0], the full match
                 // parse months, days, hours, minutes, seconds, and milliseconds
-                // provide default values if necessary
+                for (var i = 1; i < 7; i++) {
+                    // provide default values if necessary
+                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
+                    // match[1] is the month. Months are 0-11 in JavaScript
+                    // `Date` objects, but 1-12 in ISO notation, so we
+                    // decrement.
+                    if (i == 1) {
+                        match[i]--;
+                    }
+                }
+
                 // parse the UTC offset component
-                var year = Number(match[1]),
-                    month = Number(match[2] || 1) - 1,
-                    day = Number(match[3] || 1) - 1,
-                    hour = Number(match[4] || 0),
-                    minute = Number(match[5] || 0),
-                    second = Number(match[6] || 0),
-                    millisecond = Number(match[7] || 0),
-                    // When time zone is missed, local offset should be used
-                    // (ES 5.1 bug)
-                    // see https://bugs.ecmascript.org/show_bug.cgi?id=112
-                    offset = !match[4] || match[8] ?
-                        0 : Number(new NativeDate(1970, 0)),
-                    signOffset = match[9] === "-" ? 1 : -1,
-                    hourOffset = Number(match[10] || 0),
-                    minuteOffset = Number(match[11] || 0),
-                    result;
-                if (
-                    hour < (
-                        minute > 0 || second > 0 || millisecond > 0 ?
-                        24 : 25
-                    ) &&
-                    minute < 60 && second < 60 && millisecond < 1000 &&
-                    month > -1 && month < 12 && hourOffset < 24 &&
-                    minuteOffset < 60 && // detect invalid offsets
-                    day > -1 &&
-                    day < (
-                        dayFromMonth(year, month + 1) -
-                        dayFromMonth(year, month)
-                    )
-                ) {
-                    result = (
-                        (dayFromMonth(year, month) + day) * 24 +
-                        hour +
-                        hourOffset * signOffset
-                    ) * 60;
-                    result = (
-                        (result + minute + minuteOffset * signOffset) * 60 +
-                        second
-                    ) * 1000 + millisecond + offset;
-                    if (-8.64e15 <= result && result <= 8.64e15) {
-                        return result;
+                var minuteOffset = +match.pop(), hourOffset = +match.pop(), sign = match.pop();
+
+                // compute the explicit time zone offset if specified
+                var offset = 0;
+                if (sign) {
+                    // detect invalid offsets and return early
+                    if (hourOffset > 23 || minuteOffset > 59) {
+                        return NaN;
                     }
+
+                    // express the provided time zone offset in minutes. The offset is
+                    // negative for time zones west of UTC; positive otherwise.
+                    offset = (hourOffset * 60 + minuteOffset) * 6e4 * (sign == "+" ? -1 : 1);
                 }
-                return NaN;
+
+                // Date.UTC for years between 0 and 99 converts year to 1900 + year
+                // The Gregorian calendar has a 400-year cycle, so
+                // to Date.UTC(year + 400, .... ) - 12622780800000 == Date.UTC(year, ...),
+                // where 12622780800000 - number of milliseconds in Gregorian calendar 400 years
+                var year = +match[0];
+                if (0 <= year && year <= 99) {
+                    match[0] = year + 400;
+                    return NativeDate.UTC.apply(this, match) + offset - 12622780800000;
+                }
+
+                // compute a new UTC date value, accounting for the optional offset
+                return NativeDate.UTC.apply(this, match) + offset;
             }
             return NativeDate.parse.apply(this, arguments);
         };
@@ -843,59 +718,11 @@ if (!Date.parse || "Date.parse is buggy") {
     })(Date);
 }
 
-// ES5 15.9.4.4
-// http://es5.github.com/#x15.9.4.4
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-
-
 //
 // String
 // ======
 //
 
-
-// ES5 15.5.4.14
-// http://es5.github.com/#x15.5.4.14
-// [bugfix, chrome]
-// If separator is undefined, then the result array contains just one String,
-// which is the this value (converted to a String). If limit is not undefined,
-// then the output array is truncated so that it contains no more than limit
-// elements.
-// "0".split(undefined, 0) -> []
-if("0".split(void 0, 0).length) {
-    var string_split = String.prototype.split;
-    String.prototype.split = function(separator, limit) {
-        if(separator === void 0 && limit === 0)return [];
-        return string_split.apply(this, arguments);
-    }
-}
-
-// ECMA-262, 3rd B.2.3
-// Note an ECMAScript standart, although ECMAScript 3rd Edition has a
-// non-normative section suggesting uniform semantics and it should be
-// normalized across all browsers
-// [bugfix, IE lt 9] IE < 9 substr() with negative value not working in IE
-if("".substr && "0b".substr(-1) !== "b") {
-    var string_substr = String.prototype.substr;
-    /**
-     *  Get the substring of a string
-     *  @param  {integer}  start   where to start the substring
-     *  @param  {integer}  length  how many characters to return
-     *  @return {string}
-     */
-    String.prototype.substr = function(start, length) {
-        return string_substr.call(
-            this,
-            start < 0 ? ((start = this.length + start) < 0 ? 0 : start) : start,
-            length
-        );
-    }
-}
-
 // ES5 15.5.4.20
 // http://es5.github.com/#x15.5.4.20
 var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
@@ -911,9 +738,7 @@ if (!String.prototype.trim || ws.trim()) {
         if (this === undefined || this === null) {
             throw new TypeError("can't convert "+this+" to object");
         }
-        return String(this)
-            .replace(trimBeginRegexp, "")
-            .replace(trimEndRegexp, "");
+        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
     };
 }
 
@@ -925,8 +750,7 @@ if (!String.prototype.trim || ws.trim()) {
 // ES5 9.4
 // http://es5.github.com/#x9.4
 // http://jsperf.com/to-integer
-
-function toInteger(n) {
+var toInteger = function (n) {
     n = +n;
     if (n !== n) { // isNaN
         n = 0;
@@ -934,47 +758,20 @@ function toInteger(n) {
         n = (n > 0 || -1) * Math.floor(Math.abs(n));
     }
     return n;
-}
-
-function isPrimitive(input) {
-    var type = typeof input;
-    return (
-        input === null ||
-        type === "undefined" ||
-        type === "boolean" ||
-        type === "number" ||
-        type === "string"
-    );
-}
-
-function toPrimitive(input) {
-    var val, valueOf, toString;
-    if (isPrimitive(input)) {
-        return input;
-    }
-    valueOf = input.valueOf;
-    if (typeof valueOf === "function") {
-        val = valueOf.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    toString = input.toString;
-    if (typeof toString === "function") {
-        val = toString.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    throw new TypeError();
-}
+};
 
-// ES5 9.9
-// http://es5.github.com/#x9.9
+var prepareString = "a"[0] != "a";
+    // ES5 9.9
+    // http://es5.github.com/#x9.9
 var toObject = function (o) {
     if (o == null) { // this matches both null and undefined
         throw new TypeError("can't convert "+o+" to object");
     }
+    // If the implementation doesn't support by-index access of
+    // string characters (ex. IE < 9), split the string
+    if (prepareString && typeof o == "string" && o) {
+        return o.split("");
+    }
     return Object(o);
 };
 

dependency-examples/flight/bower_components/flight/lib/advice.js

@@ -18,37 +18,31 @@ define(
     var advice = {
 
       around: function(base, wrapped) {
-        return function() {
-          var args = util.toArray(arguments);
-          return wrapped.apply(this, [base.bind(this)].concat(args));
+        return function composedAround() {
+          // unpacking arguments by hand benchmarked faster
+          var i = 0, l = arguments.length, args = new Array(l + 1);
+          args[0] = base.bind(this);
+          for (; i < l; i++) args[i + 1] = arguments[i];
+
+          return wrapped.apply(this, args);
         }
       },
 
       before: function(base, before) {
-        return this.around(base, function() {
-          var args = util.toArray(arguments),
-              orig = args.shift(),
-              beforeFn;
-
-          beforeFn = (typeof before == 'function') ? before : before.obj[before.fnName];
-          beforeFn.apply(this, args);
-          return (orig).apply(this, args);
-        });
+        var beforeFn = (typeof before == 'function') ? before : before.obj[before.fnName];
+        return function composedBefore() {
+          beforeFn.apply(this, arguments);
+          return base.apply(this, arguments);
+        }
       },
 
       after: function(base, after) {
-        return this.around(base, function() {
-          var args = util.toArray(arguments),
-              orig = args.shift(),
-              afterFn;
-
-          // this is a separate statement for debugging purposes.
-          var res = (orig.unbound || orig).apply(this, args);
-
-          afterFn = (typeof after == 'function') ? after : after.obj[after.fnName];
-          afterFn.apply(this, args);
+        var afterFn = (typeof after == 'function') ? after : after.obj[after.fnName];
+        return function composedAfter() {
+          var res = (base.unbound || base).apply(this, arguments);
+          afterFn.apply(this, arguments);
           return res;
-        });
+        }
       },
 
       // a mixin that allows other mixins to augment existing functions by adding additional

dependency-examples/flight/bower_components/flight/lib/component.js

@@ -12,13 +12,15 @@ define(
     './advice',
     './utils',
     './compose',
-    './registry'
+    './registry',
+    './logger',
+    '../tools/debug/debug'
   ],
 
-  function(advice, utils, compose, registry) {
+  function(advice, utils, compose, registry, withLogging, debug) {
 
     var functionNameRegEx = /function (.*?)\s?\(/;
-    var spaceCommaRegEx = /\s\,/g;
+    var componentId = 0;
 
     function teardownInstance(instanceInfo){
       instanceInfo.events.slice().forEach(function(event) {
@@ -33,7 +35,6 @@ define(
 
 
     function teardown() {
-      this.trigger("componentTearDown");
       teardownInstance(registry.findInstanceInfo(this));
     }
 
@@ -41,11 +42,23 @@ define(
     function teardownAll() {
       var componentInfo = registry.findComponentInfo(this);
 
-      componentInfo && componentInfo.instances.slice().forEach(function(info) {
+      componentInfo && Object.keys(componentInfo.instances).forEach(function(k) {
+        var info = componentInfo.instances[k];
         info.instance.teardown();
       });
     }
 
+    function checkSerializable(type, data) {
+      try {
+        window.postMessage(data, '*');
+      } catch(e) {
+        console.log('unserializable data for event',type,':',data);
+        throw new Error(
+          ["The event", type, "on component", this.toString(), "was triggered with non-serializable data"].join(" ")
+        );
+      }
+    }
+
     //common mixin allocates basic functionality - used by all component prototypes
     //callback context is bound to component
     function withBaseComponent() {
@@ -53,50 +66,70 @@ define(
       // delegate trigger, bind and unbind to an element
       // if $element not supplied, use component's node
       // other arguments are passed on
+      // event can be either a string specifying the type
+      // of the event, or a hash specifying both the type
+      // and a default function to be called.
       this.trigger = function() {
-        var $element, type, data;
-        var args = utils.toArray(arguments);
+        var $element, type, data, event, defaultFn;
+        var lastIndex = arguments.length - 1, lastArg = arguments[lastIndex];
 
-        if (typeof args[args.length - 1] != "string") {
-          data = args.pop();
+        if (typeof lastArg != "string" && !(lastArg && lastArg.defaultBehavior)) {
+          lastIndex--;
+          data = lastArg;
         }
 
-        $element = (args.length == 2) ? $(args.shift()) : this.$node;
-        type = args[0];
-
-        if (window.DEBUG && window.postMessage) {
-          try {
-            window.postMessage(data, '*');
-          } catch(e) {
-            console.log('unserializable data for event',type,':',data);
-            throw new Error(
-              ["The event", event.type, "on component", this.describe, "was triggered with non-serializable data"].join(" ")
-            );
-          }
+        if (lastIndex == 1) {
+          $element = $(arguments[0]);
+          event = arguments[1];
+        } else {
+          $element = this.$node;
+          event = arguments[0];
+        }
+
+        if (event.defaultBehavior) {
+          defaultFn = event.defaultBehavior;
+          event = $.Event(event.type);
+        }
+
+        type = event.type || event;
+
+        if (debug.enabled && window.postMessage) {
+          checkSerializable.call(this, type, data);
         }
 
         if (typeof this.attr.eventData === 'object') {
           data = $.extend(true, {}, this.attr.eventData, data);
         }
 
-        return $element.trigger(type, data);
+        $element.trigger((event || type), data);
+
+        if (defaultFn && !event.isDefaultPrevented()) {
+          (this[defaultFn] || defaultFn).call(this);
+        }
+
+        return $element;
       };
 
       this.on = function() {
         var $element, type, callback, originalCb;
-        var args = utils.toArray(arguments);
+        var lastIndex = arguments.length - 1, origin = arguments[lastIndex];
 
-        if (typeof args[args.length - 1] == "object") {
+        if (typeof origin == "object") {
           //delegate callback
           originalCb = utils.delegate(
-            this.resolveDelegateRules(args.pop())
+            this.resolveDelegateRules(origin)
           );
         } else {
-          originalCb = args.pop();
+          originalCb = origin;
         }
 
-        $element = (args.length == 2) ? $(args.shift()) : this.$node;
-        type = args[0];
+        if (lastIndex == 2) {
+          $element = $(arguments[0]);
+          type = arguments[1];
+        } else {
+          $element = this.$node;
+          type = arguments[0];
+        }
 
         if (typeof originalCb != 'function' && typeof originalCb != 'object') {
           throw new Error("Unable to bind to '" + type + "' because the given callback is not a function or an object");
@@ -120,14 +153,20 @@ define(
 
       this.off = function() {
         var $element, type, callback;
-        var args = utils.toArray(arguments);
+        var lastIndex = arguments.length - 1;
 
-        if (typeof args[args.length - 1] == "function") {
-          callback = args.pop();
+        if (typeof arguments[lastIndex] == "function") {
+          callback = arguments[lastIndex];
+          lastIndex -= 1;
         }
 
-        $element = (args.length == 2) ? $(args.shift()) : this.$node;
-        type = args[0];
+        if (lastIndex == 1) {
+          $element = $(arguments[0]);
+          type = arguments[1];
+        } else {
+          $element = this.$node;
+          type = arguments[0];
+        }
 
         return $element.off(type, callback);
       };
@@ -135,15 +174,12 @@ define(
       this.resolveDelegateRules = function(ruleInfo) {
         var rules = {};
 
-        Object.keys(ruleInfo).forEach(
-          function(r) {
-            if (!this.attr.hasOwnProperty(r)) {
-              throw new Error('Component "' + this.describe + '" wants to listen on "' + r + '" but no such attribute was defined.');
-            }
-            rules[this.attr[r]] = ruleInfo[r];
-          },
-          this
-        );
+        Object.keys(ruleInfo).forEach(function(r) {
+          if (!r in this.attr) {
+            throw new Error('Component "' + this.toString() + '" wants to listen on "' + r + '" but no such attribute was defined.');
+          }
+          rules[this.attr[r]] = ruleInfo[r];
+        }, this);
 
         return rules;
       };
@@ -161,13 +197,25 @@ define(
     }
 
     function attachTo(selector/*, options args */) {
+      // unpacking arguments by hand benchmarked faster
+      var l = arguments.length;
+      var args = new Array(l - 1);
+      for (var i = 1; i < l; i++) args[i - 1] = arguments[i];
+
       if (!selector) {
         throw new Error("Component needs to be attachTo'd a jQuery object, native node or selector string");
       }
 
-      var options = utils.merge.apply(utils, utils.toArray(arguments, 1));
+      var options = utils.merge.apply(utils, args);
 
       $(selector).each(function(i, node) {
+        var rawNode = node.jQuery ? node[0] : node;
+        var componentInfo = registry.findComponentInfo(this)
+        if (componentInfo && componentInfo.isAttachedTo(rawNode)) {
+          //already attached
+          return;
+        }
+
         new this(node, options);
       }.bind(this));
     }
@@ -176,26 +224,32 @@ define(
     // takes an unlimited number of mixin functions as arguments
     // typical api call with 3 mixins: define(timeline, withTweetCapability, withScrollCapability);
     function define(/*mixins*/) {
-      var mixins = utils.toArray(arguments);
+      // unpacking arguments by hand benchmarked faster
+      var l = arguments.length;
+      var mixins = new Array(l + 3); //add three for common mixins
+      for (var i = 0; i < l; i++) mixins[i] = arguments[i];
 
       Component.toString = function() {
         var prettyPrintMixins = mixins.map(function(mixin) {
-          if ($.browser.msie) {
+          if (mixin.name == null) {
+            //function name property not supported by this browser, use regex
             var m = mixin.toString().match(functionNameRegEx);
             return (m && m[1]) ? m[1] : "";
           } else {
-            return mixin.name;
+            return (mixin.name != "withBaseComponent") ? mixin.name : "";
           }
-        }).join(', ').replace(spaceCommaRegEx,'');//weed out no-named mixins
-
+        }).filter(Boolean).join(', ');
         return prettyPrintMixins;
       };
 
-      Component.describe = Component.toString();
+      if (debug.enabled) {
+        Component.describe = Component.toString();
+      }
 
       //'options' is optional hash to be merged with 'defaults' in the component definition
       function Component(node, options) {
-        var fnCache = {}, uuid = 0;
+        options = options || {};
+        this.identity = componentId++;
 
         if (!node) {
           throw new Error("Component needs a node");
@@ -209,45 +263,38 @@ define(
           this.$node = $(node);
         }
 
-        this.describe = this.constructor.describe;
-
-        this.bind = function(func) {
-          var bound;
+        this.toString = Component.toString;
+        if (debug.enabled) {
+          this.describe = this.toString();
+        }
 
-          if (func.uuid && (bound = fnCache[func.uuid])) {
-            return bound;
+        //merge defaults with supplied options
+        //put options in attr.__proto__ to avoid merge overhead
+        var attr = Object.create(options);
+        for (var key in this.defaults) {
+          if (!options.hasOwnProperty(key)) {
+            attr[key] = this.defaults[key];
           }
+        }
+        this.attr = attr;
 
-          var bindArgs = utils.toArray(arguments, 1);
-          bindArgs.unshift(this); //prepend context
-
-          bound = func.bind.apply(func, bindArgs);
-          bound.target = func;
-          func.uuid = uuid++;
-          fnCache[func.uuid] = bound;
-
-          return bound;
-        };
-
-        //merge defaults with supplied options
-        this.attr = utils.merge(this.defaults, options);
-        this.defaults && Object.keys(this.defaults).forEach(function(key) {
+        Object.keys(this.defaults || {}).forEach(function(key) {
           if (this.defaults[key] === null && this.attr[key] === null) {
-            throw new Error('Required attribute "' + key + '" not specified in attachTo for component "' + this.describe + '".');
+            throw new Error('Required attribute "' + key + '" not specified in attachTo for component "' + this.toString() + '".');
           }
         }, this);
 
-        this.initialize.call(this, options || {});
-
-        this.trigger('componentInitialized');
+        this.initialize.call(this, options);
       }
 
       Component.attachTo = attachTo;
       Component.teardownAll = teardownAll;
 
       // prepend common mixins to supplied list, then mixin all flavors
+      if (debug.enabled) {
+        mixins.unshift(withLogging);
+      }
       mixins.unshift(withBaseComponent, advice.withAdvice, registry.withRegistration);
-
       compose.mixin(Component.prototype, mixins);
 
       return Component;

dependency-examples/flight/bower_components/flight/lib/logger.js

@@ -49,7 +49,7 @@ define(
         name = eventArgs[0];
       }
 
-      if (window.DEBUG) {
+      if (window.DEBUG && window.DEBUG.enabled) {
         logFilter = DEBUG.events.logFilter;
 
         // no regex for you, actions...
@@ -68,14 +68,12 @@ define(
             action,
             '[' + name + ']',
             elemToString(elem),
-            component.constructor.describe,
-            fn && (fnName = fn.name || fn.displayName) && '->  ' + fnName
+            component.constructor.describe.split(' ').slice(0,3).join(' ') //two mixins only
           );
         }
       }
     }
 
-
     function withLogging() {
       this.before('trigger', function() {
         log('trigger', this, util.toArray(arguments));

dependency-examples/flight/bower_components/flight/lib/registry.js

@@ -16,18 +16,18 @@ define(
 
     function parseEventArgs(instance, args) {
       var element, type, callback;
+      var end = args.length;
 
-      args = util.toArray(args);
-
-      if (typeof args[args.length-1] === 'function') {
-        callback = args.pop();
+      if (typeof args[end - 1] === 'function') {
+        end -= 1;
+        callback = args[end];
       }
 
-      if (typeof args[args.length-1] === 'object') {
-        args.pop();
+      if (typeof args[end - 1] === 'object') {
+        end -= 1;
       }
 
-      if (args.length == 2) {
+      if (end == 2) {
         element = args[0];
         type = args[1];
       } else {
@@ -56,53 +56,43 @@ define(
 
       (this.reset = function() {
         this.components = [];
-        this.allInstances = [];
+        this.allInstances = {};
         this.events = [];
       }).call(this);
 
       function ComponentInfo(component) {
         this.component = component;
-        this.instances = [];
+        this.attachedTo = [];
+        this.instances = {};
 
         this.addInstance = function(instance) {
-          this.throwIfInstanceExistsOnNode(instance);
-
           var instanceInfo = new InstanceInfo(instance);
-          this.instances.push(instanceInfo);
+          this.instances[instance.identity] = instanceInfo;
+          this.attachedTo.push(instance.node);
 
           return instanceInfo;
         }
 
-        this.throwIfInstanceExistsOnNode = function(instance) {
-          this.instances.forEach(function (instanceInfo) {
-            if (instanceInfo.instance.$node[0] === instance.$node[0]) {
-              throw new Error('Instance of ' + instance.constructor + ' already exists on node ' + instance.$node[0]);
-            }
-          });
-        }
-
         this.removeInstance = function(instance) {
-          var instanceInfo = this.instances.filter(function(instanceInfo) {
-            return instanceInfo.instance == instance;
-          })[0];
-
-          var index = this.instances.indexOf(instanceInfo);
-
-          (index > -1)  && this.instances.splice(index, 1);
+          delete this.instances[instance.identity];
+          var indexOfNode = this.attachedTo.indexOf(instance.node);
+          (indexOfNode > -1) && this.attachedTo.splice(indexOfNode, 1);
 
-          if (!this.instances.length) {
+          if (!Object.keys(this.instances).length) {
             //if I hold no more instances remove me from registry
             registry.removeComponentInfo(this);
           }
         }
+
+        this.isAttachedTo = function(node) {
+          return this.attachedTo.indexOf(node) > -1;
+        }
       }
 
       function InstanceInfo(instance) {
         this.instance = instance;
         this.events = [];
 
-        this.addTrigger = function() {};
-
         this.addBind = function(event) {
           this.events.push(event);
           registry.events.push(event);
@@ -127,7 +117,7 @@ define(
 
         var inst = component.addInstance(instance);
 
-        this.allInstances.push(inst);
+        this.allInstances[instance.identity] = inst;
 
         return component;
       };
@@ -137,11 +127,10 @@ define(
 
         //remove from component info
         var componentInfo = this.findComponentInfo(instance);
-        componentInfo.removeInstance(instance);
+        componentInfo && componentInfo.removeInstance(instance);
 
         //remove from registry
-        var index = this.allInstances.indexOf(instInfo);
-        (index > -1)  && this.allInstances.splice(index, 1);
+        delete this.allInstances[instance.identity];
       };
 
       this.removeComponentInfo = function(componentInfo) {
@@ -161,41 +150,32 @@ define(
         return null;
       };
 
-      this.findInstanceInfo = function(which) {
-        var testFn;
-
-        if (which.node) {
-          //by instance (returns matched instance)
-          testFn = function(inst) {return inst.instance === which};
-        } else {
-          //by node (returns array of matches)
-          testFn = function(inst) {return inst.instance.node === which};
-        }
-
-        var matches = this.allInstances.filter(testFn);
-        if (!matches.length) {
-          return which.node ? null : [];
-        }
-        return which.node ? matches[0] : matches;
+      this.findInstanceInfo = function(instance) {
+          return this.allInstances[instance.identity] || null;
       };
 
-      this.trigger = function() {
-        var event = parseEventArgs(this, arguments),
-            instance = registry.findInstanceInfo(this);
-
-        if (instance) {
-          instance.addTrigger(event);
-        }
+      this.findInstanceInfoByNode = function(node) {
+          var result = [];
+          Object.keys(this.allInstances).forEach(function(k) {
+            var thisInstanceInfo = this.allInstances[k];
+            if(thisInstanceInfo.instance.node === node) {
+              result.push(thisInstanceInfo);
+            }
+          }, this);
+          return result;
       };
 
       this.on = function(componentOn) {
-        var otherArgs = util.toArray(arguments, 1);
-        var instance = registry.findInstanceInfo(this);
-        var boundCallback;
+        var instance = registry.findInstanceInfo(this), boundCallback;
+
+        // unpacking arguments by hand benchmarked faster
+        var l = arguments.length, i = 1;
+        var otherArgs = new Array(l - 1);
+        for (; i < l; i++) otherArgs[i - 1] = arguments[i];
 
         if (instance) {
           boundCallback = componentOn.apply(null, otherArgs);
-          if(boundCallback) {
+          if (boundCallback) {
             otherArgs[otherArgs.length-1] = boundCallback;
           }
           var event = parseEventArgs(this, otherArgs);
@@ -210,8 +190,18 @@ define(
         if (instance) {
           instance.removeBind(event);
         }
+
+        //remove from global event registry
+        for (var i = 0, e; e = registry.events[i]; i++) {
+          if (matchEvent(e, event)) {
+            registry.events.splice(i, 1);
+          }
+        }
       };
 
+      //debug tools may want to add advice to trigger
+      registry.trigger = new Function;
+
       this.teardown = function() {
         registry.removeInstance(this);
       };
@@ -221,9 +211,10 @@ define(
           registry.addInstance(this);
         });
 
-        this.after('trigger', registry.trigger);
         this.around('on', registry.on);
         this.after('off', registry.off);
+        //debug tools may want to add advice to trigger
+        window.DEBUG && DEBUG.enabled && this.after('trigger', registry.trigger);
         this.after('teardown', {obj:registry, fnName:'teardown'});
       };
 

dependency-examples/flight/bower_components/flight/lib/utils.js

@@ -47,10 +47,18 @@ define(
       //   base; //{a:2, b:6}
 
       merge: function(/*obj1, obj2,....deepCopy*/) {
-        var args = this.toArray(arguments);
+        // unpacking arguments by hand benchmarked faster
+        var l = arguments.length,
+            i = 0,
+            args = new Array(l + 1);
+        for (; i < l; i++) args[i + 1] = arguments[i];
+
+        if (l === 0) {
+          return {};
+        }
 
         //start with empty object so a copy is created
-        args.unshift({});
+        args[0] = {};
 
         if (args[args.length - 1] === true) {
           //jquery extend requires deep copy as first arg

dependency-examples/flight/bower_components/flight/tools/debug/debug.js

@@ -56,31 +56,63 @@ define(
     //******************************************************************************************
     // Event logging
     //******************************************************************************************
-    var logLevel = 'all';
-    logFilter = {actions: logLevel, eventNames: logLevel}; //no filter by default
+
+    var ALL = 'all'; //no filter
+
+    //no logging by default
+    var defaultEventNamesFilter = [];
+    var defaultActionsFilter = [];
+
+    var logFilter = retrieveLogFilter();
 
     function filterEventLogsByAction(/*actions*/) {
-      var actions = [].slice.call(arguments, 0);
+      var actions = [].slice.call(arguments);
 
-      logFilter.eventNames.length || (logFilter.eventNames = 'all');
-      logFilter.actions = actions.length ? actions : 'all';
+      logFilter.eventNames.length || (logFilter.eventNames = ALL);
+      logFilter.actions = actions.length ? actions : ALL;
+      saveLogFilter();
     }
 
     function filterEventLogsByName(/*eventNames*/) {
-      var eventNames = [].slice.call(arguments, 0);
+      var eventNames = [].slice.call(arguments);
 
-      logFilter.actions.length || (logFilter.actions = 'all');
-      logFilter.eventNames = eventNames.length ? eventNames : 'all';
+      logFilter.actions.length || (logFilter.actions = ALL);
+      logFilter.eventNames = eventNames.length ? eventNames : ALL;
+      saveLogFilter();
     }
 
     function hideAllEventLogs() {
       logFilter.actions = [];
       logFilter.eventNames = [];
+      saveLogFilter();
     }
 
     function showAllEventLogs() {
-      logFilter.actions = 'all';
-      logFilter.eventNames = 'all';
+      logFilter.actions = ALL;
+      logFilter.eventNames = ALL;
+      saveLogFilter();
+    }
+
+    function saveLogFilter() {
+      if (window.localStorage) {
+        localStorage.setItem('logFilter_eventNames', logFilter.eventNames);
+        localStorage.setItem('logFilter_actions', logFilter.actions);
+      }
+    }
+
+    function retrieveLogFilter() {
+      var result = {
+        eventNames: (window.localStorage && localStorage.getItem('logFilter_eventNames')) || defaultEventNamesFilter,
+        actions: (window.localStorage && localStorage.getItem('logFilter_actions')) || defaultActionsFilter
+      };
+      //reconstitute arrays
+      Object.keys(result).forEach(function(k) {
+        var thisProp = result[k];
+        if (typeof thisProp == 'string' && thisProp !== ALL) {
+          result[k] = thisProp.split(',');
+        }
+      });
+      return result;
     }
 
     return {
@@ -90,7 +122,7 @@ define(
 
         if (enable && window.console) {
           console.info('Booting in DEBUG mode');
-          console.info('You can filter event logging with DEBUG.events.logAll/logNone/logByName/logByAction');
+          console.info('You can configure event logging with DEBUG.events.logAll()/logNone()/logByName()/logByAction()');
         }
 
         window.DEBUG = this;

dependency-examples/flight/bower_components/requirejs/plugins/text.js → dependency-examples/flight/bower_components/requirejs-text/text.js

 /**
- * @license RequireJS text 2.0.3 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS text 2.0.10 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/requirejs/text for details
  */
 /*jslint regexp: true */
-/*global require: false, XMLHttpRequest: false, ActiveXObject: false,
-  define: false, window: false, process: false, Packages: false,
-  java: false, location: false */
+/*global require, XMLHttpRequest, ActiveXObject,
+  define, window, process, Packages,
+  java, location, Components, FileUtils */
 
 define(['module'], function (module) {
     'use strict';
 
-    var text, fs,
+    var text, fs, Cc, Ci, xpcIsWindows,
         progIds = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'],
         xmlRegExp = /^\s*<\?xml(\s)+version=[\'\"](\d)*.(\d)*[\'\"](\s)*\?>/im,
         bodyRegExp = /<body[^>]*>\s*([\s\S]+)\s*<\/body>/im,
@@ -19,11 +19,11 @@ define(['module'], function (module) {
         defaultProtocol = hasLocation && location.protocol && location.protocol.replace(/\:/, ''),
         defaultHostName = hasLocation && location.hostname,
         defaultPort = hasLocation && (location.port || undefined),
-        buildMap = [],
+        buildMap = {},
         masterConfig = (module.config && module.config()) || {};
 
     text = {
-        version: '2.0.3',
+        version: '2.0.10',
 
         strip: function (content) {
             //Strips <?xml ...?> declarations so that external SVG and XML
@@ -83,16 +83,30 @@ define(['module'], function (module) {
          * where strip is a boolean.
          */
         parseName: function (name) {
-            var strip = false, index = name.indexOf("."),
-                modName = name.substring(0, index),
+            var modName, ext, temp,
+                strip = false,
+                index = name.indexOf("."),
+                isRelative = name.indexOf('./') === 0 ||
+                             name.indexOf('../') === 0;
+
+            if (index !== -1 && (!isRelative || index > 1)) {
+                modName = name.substring(0, index);
                 ext = name.substring(index + 1, name.length);
+            } else {
+                modName = name;
+            }
 
-            index = ext.indexOf("!");
+            temp = ext || modName;
+            index = temp.indexOf("!");
             if (index !== -1) {
                 //Pull off the strip arg.
-                strip = ext.substring(index + 1, ext.length);
-                strip = strip === "strip";
-                ext = ext.substring(0, index);
+                strip = temp.substring(index + 1) === "strip";
+                temp = temp.substring(0, index);
+                if (ext) {
+                    ext = temp;
+                } else {
+                    modName = temp;
+                }
             }
 
             return {
@@ -156,11 +170,18 @@ define(['module'], function (module) {
             masterConfig.isBuild = config.isBuild;
 
             var parsed = text.parseName(name),
-                nonStripName = parsed.moduleName + '.' + parsed.ext,
+                nonStripName = parsed.moduleName +
+                    (parsed.ext ? '.' + parsed.ext : ''),
                 url = req.toUrl(nonStripName),
                 useXhr = (masterConfig.useXhr) ||
                          text.useXhr;
 
+            // Do not load if it is an empty: url
+            if (url.indexOf('empty:') === 0) {
+                onLoad();
+                return;
+            }
+
             //Load the text. Use XHR if possible and in a browser.
             if (!hasLocation || useXhr(url, defaultProtocol, defaultHostName, defaultPort)) {
                 text.get(url, function (content) {
@@ -194,11 +215,11 @@ define(['module'], function (module) {
 
         writeFile: function (pluginName, moduleName, req, write, config) {
             var parsed = text.parseName(moduleName),
-                nonStripName = parsed.moduleName + '.' + parsed.ext,
+                extPart = parsed.ext ? '.' + parsed.ext : '',
+                nonStripName = parsed.moduleName + extPart,
                 //Use a '.js' file name so that it indicates it is a
                 //script that can be loaded across domains.
-                fileName = req.toUrl(parsed.moduleName + '.' +
-                                     parsed.ext) + '.js';
+                fileName = req.toUrl(parsed.moduleName + extPart) + '.js';
 
             //Leverage own load() method to load plugin value, but only
             //write out values that do not have the strip argument,
@@ -222,24 +243,38 @@ define(['module'], function (module) {
     if (masterConfig.env === 'node' || (!masterConfig.env &&
             typeof process !== "undefined" &&
             process.versions &&
-            !!process.versions.node)) {
+            !!process.versions.node &&
+            !process.versions['node-webkit'])) {
         //Using special require.nodeRequire, something added by r.js.
         fs = require.nodeRequire('fs');
 
-        text.get = function (url, callback) {
-            var file = fs.readFileSync(url, 'utf8');
-            //Remove BOM (Byte Mark Order) from utf8 files if it is there.
-            if (file.indexOf('\uFEFF') === 0) {
-                file = file.substring(1);
+        text.get = function (url, callback, errback) {
+            try {
+                var file = fs.readFileSync(url, 'utf8');
+                //Remove BOM (Byte Mark Order) from utf8 files if it is there.
+                if (file.indexOf('\uFEFF') === 0) {
+                    file = file.substring(1);
+                }
+                callback(file);
+            } catch (e) {
+                errback(e);
             }
-            callback(file);
         };
     } else if (masterConfig.env === 'xhr' || (!masterConfig.env &&
             text.createXhr())) {
-        text.get = function (url, callback, errback) {
-            var xhr = text.createXhr();
+        text.get = function (url, callback, errback, headers) {
+            var xhr = text.createXhr(), header;
             xhr.open('GET', url, true);
 
+            //Allow plugins direct access to xhr headers
+            if (headers) {
+                for (header in headers) {
+                    if (headers.hasOwnProperty(header)) {
+                        xhr.setRequestHeader(header.toLowerCase(), headers[header]);
+                    }
+                }
+            }
+
             //Allow overrides specified in config
             if (masterConfig.onXhr) {
                 masterConfig.onXhr(xhr, url);
@@ -259,6 +294,10 @@ define(['module'], function (module) {
                     } else {
                         callback(xhr.responseText);
                     }
+
+                    if (masterConfig.onXhrComplete) {
+                        masterConfig.onXhrComplete(xhr, url);
+                    }
                 }
             };
             xhr.send(null);
@@ -289,7 +328,9 @@ define(['module'], function (module) {
                     line = line.substring(1);
                 }
 
-                stringBuffer.append(line);
+                if (line !== null) {
+                    stringBuffer.append(line);
+                }
 
                 while ((line = input.readLine()) !== null) {
                     stringBuffer.append(lineSeparator);
@@ -302,7 +343,44 @@ define(['module'], function (module) {
             }
             callback(content);
         };
-    }
+    } else if (masterConfig.env === 'xpconnect' || (!masterConfig.env &&
+            typeof Components !== 'undefined' && Components.classes &&
+            Components.interfaces)) {
+        //Avert your gaze!
+        Cc = Components.classes,
+        Ci = Components.interfaces;
+        Components.utils['import']('resource://gre/modules/FileUtils.jsm');
+        xpcIsWindows = ('@mozilla.org/windows-registry-key;1' in Cc);
+
+        text.get = function (url, callback) {
+            var inStream, convertStream, fileObj,
+                readData = {};
 
+            if (xpcIsWindows) {
+                url = url.replace(/\//g, '\\');
+            }
+
+            fileObj = new FileUtils.File(url);
+
+            //XPCOM, you so crazy
+            try {
+                inStream = Cc['@mozilla.org/network/file-input-stream;1']
+                           .createInstance(Ci.nsIFileInputStream);
+                inStream.init(fileObj, 1, 0, false);
+
+                convertStream = Cc['@mozilla.org/intl/converter-input-stream;1']
+                                .createInstance(Ci.nsIConverterInputStream);
+                convertStream.init(inStream, "utf-8", inStream.available(),
+                Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
+
+                convertStream.readString(inStream.available(), readData);
+                convertStream.close();
+                inStream.close();
+                callback(readData.value);
+            } catch (e) {
+                throw new Error((fileObj && fileObj.path || '') + ': ' + e);
+            }
+        };
+    }
     return text;
 });

dependency-examples/flight/bower_components/requirejs/requirejs.js → dependency-examples/flight/bower_components/requirejs/require.js

 /** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.2 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.8 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 //Not using strict: uneven strict support in browsers, #392, and causes
 //problems with requirejs.exec()/transpiler plugins that may not be strict.
 /*jslint regexp: true, nomen: true, sloppy: true */
-/*global window, navigator, document, importScripts, jQuery, setTimeout, opera */
+/*global window, navigator, document, importScripts, setTimeout, opera */
 
 var requirejs, require, define;
 (function (global) {
     var req, s, head, baseElement, dataMain, src,
         interactiveScript, currentlyAddingScript, mainScript, subPath,
-        version = '2.1.2',
+        version = '2.1.8',
         commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
         cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
         jsSuffixRegExp = /\.js$/,
@@ -21,9 +21,8 @@ var requirejs, require, define;
         ostring = op.toString,
         hasOwn = op.hasOwnProperty,
         ap = Array.prototype,
-        aps = ap.slice,
         apsp = ap.splice,
-        isBrowser = !!(typeof window !== 'undefined' && navigator && document),
+        isBrowser = !!(typeof window !== 'undefined' && navigator && window.document),
         isWebWorker = !isBrowser && typeof importScripts !== 'undefined',
         //PS3 indicates loaded and complete, but need to wait for complete
         //specifically. Sequence is 'loading', 'loaded', execution,
@@ -135,6 +134,10 @@ var requirejs, require, define;
         return document.getElementsByTagName('script');
     }
 
+    function defaultOnError(err) {
+        throw err;
+    }
+
     //Allow getting a global that expressed in
     //dot notation, like 'a.b.c'.
     function getGlobal(value) {
@@ -192,15 +195,21 @@ var requirejs, require, define;
         var inCheckLoaded, Module, context, handlers,
             checkLoadedTimeoutId,
             config = {
+                //Defaults. Do not set a default for map
+                //config to speed up normalize(), which
+                //will run faster if there is no default.
                 waitSeconds: 7,
                 baseUrl: './',
                 paths: {},
                 pkgs: {},
                 shim: {},
-                map: {},
                 config: {}
             },
             registry = {},
+            //registry of just enabled modules, to speed
+            //cycle breaking code when lots of modules
+            //are registered, but not activated.
+            enabledRegistry = {},
             undefEvents = {},
             defQueue = [],
             defined = {},
@@ -296,7 +305,7 @@ var requirejs, require, define;
             }
 
             //Apply map config if available.
-            if (applyMap && (baseParts || starMap) && map) {
+            if (applyMap && map && (baseParts || starMap)) {
                 nameParts = name.split('/');
 
                 for (i = nameParts.length; i > 0; i -= 1) {
@@ -495,7 +504,12 @@ var requirejs, require, define;
                     fn(defined[id]);
                 }
             } else {
-                getModule(depMap).on(name, fn);
+                mod = getModule(depMap);
+                if (mod.error && name === 'error') {
+                    fn(mod.error);
+                } else {
+                    mod.on(name, fn);
+                }
             }
         }
 
@@ -566,7 +580,13 @@ var requirejs, require, define;
                         id: mod.map.id,
                         uri: mod.map.url,
                         config: function () {
-                            return (config.config && getOwn(config.config, mod.map.id)) || {};
+                            var c,
+                                pkg = getOwn(config.pkgs, mod.map.id);
+                            // For packages, only support config targeted
+                            // at the main module.
+                            c = pkg ? getOwn(config.config, mod.map.id + '/' + pkg.main) :
+                                      getOwn(config.config, mod.map.id);
+                            return  c || {};
                         },
                         exports: defined[mod.map.id]
                     });
@@ -577,6 +597,7 @@ var requirejs, require, define;
         function cleanRegistry(id) {
             //Clean up machinery used for waiting modules.
             delete registry[id];
+            delete enabledRegistry[id];
         }
 
         function breakCycle(mod, traced, processed) {
@@ -625,7 +646,7 @@ var requirejs, require, define;
             inCheckLoaded = true;
 
             //Figure out the state of all the modules.
-            eachProp(registry, function (mod) {
+            eachProp(enabledRegistry, function (mod) {
                 map = mod.map;
                 modId = map.id;
 
@@ -806,7 +827,7 @@ var requirejs, require, define;
             },
 
             /**
-             * Checks is the module is ready to define itself, and if so,
+             * Checks if the module is ready to define itself, and if so,
              * define it.
              */
             check: function () {
@@ -834,8 +855,13 @@ var requirejs, require, define;
                     if (this.depCount < 1 && !this.defined) {
                         if (isFunction(factory)) {
                             //If there is an error listener, favor passing
-                            //to that instead of throwing an error.
-                            if (this.events.error) {
+                            //to that instead of throwing an error. However,
+                            //only do it for define()'d  modules. require
+                            //errbacks should not be called for failures in
+                            //their callbacks (#699). However if a global
+                            //onError is set, use that.
+                            if ((this.events.error && this.map.isDefine) ||
+                                req.onError !== defaultOnError) {
                                 try {
                                     exports = context.execCb(id, factory, depExports, exports);
                                 } catch (e) {
@@ -863,8 +889,8 @@ var requirejs, require, define;
 
                             if (err) {
                                 err.requireMap = this.map;
-                                err.requireModules = [this.map.id];
-                                err.requireType = 'define';
+                                err.requireModules = this.map.isDefine ? [this.map.id] : null;
+                                err.requireType = this.map.isDefine ? 'define' : 'require';
                                 return onError((this.error = err));
                             }
 
@@ -884,7 +910,7 @@ var requirejs, require, define;
                         }
 
                         //Clean up
-                        delete registry[id];
+                        cleanRegistry(id);
 
                         this.defined = true;
                     }
@@ -918,8 +944,7 @@ var requirejs, require, define;
                         name = this.map.name,
                         parentName = this.map.parentMap ? this.map.parentMap.name : null,
                         localRequire = context.makeRequire(map.parentMap, {
-                            enableBuildCallback: true,
-                            skipMap: true
+                            enableBuildCallback: true
                         });
 
                     //If current map is not normalized, wait for that
@@ -1017,8 +1042,11 @@ var requirejs, require, define;
                         try {
                             req.exec(text);
                         } catch (e) {
-                            throw new Error('fromText eval for ' + moduleName +
-                                            ' failed: ' + e);
+                            return onError(makeError('fromtexteval',
+                                             'fromText eval for ' + id +
+                                            ' failed: ' + e,
+                                             e,
+                                             [id]));
                         }
 
                         if (hasInteractive) {
@@ -1048,6 +1076,7 @@ var requirejs, require, define;
             },
 
             enable: function () {
+                enabledRegistry[this.map.id] = this;
                 this.enabled = true;
 
                 //Set flag mentioning that the module is enabling,
@@ -1084,7 +1113,7 @@ var requirejs, require, define;
                         }));
 
                         if (this.errback) {
-                            on(depMap, 'error', this.errback);
+                            on(depMap, 'error', bind(this, this.errback));
                         }
                     }
 
@@ -1207,6 +1236,7 @@ var requirejs, require, define;
             Module: Module,
             makeModuleMap: makeModuleMap,
             nextTick: req.nextTick,
+            onError: onError,
 
             /**
              * Set a configuration for the context.
@@ -1233,6 +1263,9 @@ var requirejs, require, define;
                 eachProp(cfg, function (value, prop) {
                     if (objs[prop]) {
                         if (prop === 'map') {
+                            if (!config.map) {
+                                config.map = {};
+                            }
                             mixin(config[prop], value, true, true);
                         } else {
                             mixin(config[prop], value, true);
@@ -1344,7 +1377,7 @@ var requirejs, require, define;
                         //Synchronous access to one module. If require.get is
                         //available (as in the Node adapter), prefer that.
                         if (req.get) {
-                            return req.get(context, deps, relMap);
+                            return req.get(context, deps, relMap, localRequire);
                         }
 
                         //Normalize module name, if it contains . or ..
@@ -1395,16 +1428,20 @@ var requirejs, require, define;
                      * plain URLs like nameToUrl.
                      */
                     toUrl: function (moduleNamePlusExt) {
-                        var index = moduleNamePlusExt.lastIndexOf('.'),
-                            ext = null;
-
-                        if (index !== -1) {
+                        var ext,
+                            index = moduleNamePlusExt.lastIndexOf('.'),
+                            segment = moduleNamePlusExt.split('/')[0],
+                            isRelative = segment === '.' || segment === '..';
+
+                        //Have a file extension alias, and it is not the
+                        //dots from a relative path.
+                        if (index !== -1 && (!isRelative || index > 1)) {
                             ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length);
                             moduleNamePlusExt = moduleNamePlusExt.substring(0, index);
                         }
 
                         return context.nameToUrl(normalize(moduleNamePlusExt,
-                                                relMap && relMap.id, true), ext);
+                                                relMap && relMap.id, true), ext,  true);
                     },
 
                     defined: function (id) {
@@ -1449,10 +1486,11 @@ var requirejs, require, define;
 
             /**
              * Called to enable a module if it is still in the registry
-             * awaiting enablement. parent module is passed in for context,
-             * used by the optimizer.
+             * awaiting enablement. A second arg, parent, the parent module,
+             * is passed in for context, when this method is overriden by
+             * the optimizer. Not shown here to keep code compact.
              */
-            enable: function (depMap, parent) {
+            enable: function (depMap) {
                 var mod = getOwn(registry, depMap.id);
                 if (mod) {
                     getModule(depMap).enable();
@@ -1522,7 +1560,7 @@ var requirejs, require, define;
              * it is assumed to have already been normalized. This is an
              * internal API, not a public one. Use toUrl for the public API.
              */
-            nameToUrl: function (moduleName, ext) {
+            nameToUrl: function (moduleName, ext, skipExt) {
                 var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url,
                     parentPath;
 
@@ -1571,7 +1609,7 @@ var requirejs, require, define;
 
                     //Join the path parts together, then figure out if baseUrl is needed.
                     url = syms.join('/');
-                    url += (ext || (/\?/.test(url) ? '' : '.js'));
+                    url += (ext || (/\?/.test(url) || skipExt ? '' : '.js'));
                     url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
                 }
 
@@ -1587,7 +1625,7 @@ var requirejs, require, define;
             },
 
             /**
-             * Executes a module callack function. Broken out as a separate function
+             * Executes a module callback function. Broken out as a separate function
              * solely to allow the build system to sequence the files in the built
              * layer in the right sequence.
              *
@@ -1625,7 +1663,7 @@ var requirejs, require, define;
             onScriptError: function (evt) {
                 var data = getScriptData(evt);
                 if (!hasPathFallback(data.id)) {
-                    return onError(makeError('scripterror', 'Script error', evt, [data.id]));
+                    return onError(makeError('scripterror', 'Script error for: ' + data.id, evt, [data.id]));
                 }
             }
         };
@@ -1754,8 +1792,19 @@ var requirejs, require, define;
      * function. Intercept/override it if you want custom error handling.
      * @param {Error} err the error object.
      */
-    req.onError = function (err) {
-        throw err;
+    req.onError = defaultOnError;
+
+    /**
+     * Creates the node for the load command. Only used in browser envs.
+     */
+    req.createNode = function (config, moduleName, url) {
+        var node = config.xhtml ?
+                document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
+                document.createElement('script');
+        node.type = config.scriptType || 'text/javascript';
+        node.charset = 'utf-8';
+        node.async = true;
+        return node;
     };
 
     /**
@@ -1772,12 +1821,7 @@ var requirejs, require, define;
             node;
         if (isBrowser) {
             //In the browser so use a script tag
-            node = config.xhtml ?
-                    document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
-                    document.createElement('script');
-            node.type = config.scriptType || 'text/javascript';
-            node.charset = 'utf-8';
-            node.async = true;
+            node = req.createNode(config, moduleName, url);
 
             node.setAttribute('data-requirecontext', context.contextName);
             node.setAttribute('data-requiremodule', moduleName);
@@ -1810,7 +1854,7 @@ var requirejs, require, define;
                 node.attachEvent('onreadystatechange', context.onScriptLoad);
                 //It would be great to add an error handler here to catch
                 //404s in IE9+. However, onreadystatechange will fire before
-                //the error handler, so that does not help. If addEvenListener
+                //the error handler, so that does not help. If addEventListener
                 //is used, then IE will fire error before load, but we cannot
                 //use that pathway given the connect.microsoft.com issue
                 //mentioned above about not doing the 'script execute,
@@ -1839,16 +1883,24 @@ var requirejs, require, define;
 
             return node;
         } else if (isWebWorker) {
-            //In a web worker, use importScripts. This is not a very
-            //efficient use of importScripts, importScripts will block until
-            //its script is downloaded and evaluated. However, if web workers
-            //are in play, the expectation that a build has been done so that
-            //only one script needs to be loaded anyway. This may need to be
-            //reevaluated if other use cases become common.
-            importScripts(url);
-
-            //Account for anonymous modules
-            context.completeLoad(moduleName);
+            try {
+                //In a web worker, use importScripts. This is not a very
+                //efficient use of importScripts, importScripts will block until
+                //its script is downloaded and evaluated. However, if web workers
+                //are in play, the expectation that a build has been done so that
+                //only one script needs to be loaded anyway. This may need to be
+                //reevaluated if other use cases become common.
+                importScripts(url);
+
+                //Account for anonymous modules
+                context.completeLoad(moduleName);
+            } catch (e) {
+                context.onError(makeError('importscripts',
+                                'importScripts failed for ' +
+                                    moduleName + ' at ' + url,
+                                e,
+                                [moduleName]));
+            }
         }
     };
 
@@ -1880,24 +1932,31 @@ var requirejs, require, define;
             //baseUrl, if it is not already set.
             dataMain = script.getAttribute('data-main');
             if (dataMain) {
+                //Preserve dataMain in case it is a path (i.e. contains '?')
+                mainScript = dataMain;
+
                 //Set final baseUrl if there is not already an explicit one.
                 if (!cfg.baseUrl) {
                     //Pull off the directory of data-main for use as the
                     //baseUrl.
-                    src = dataMain.split('/');
+                    src = mainScript.split('/');
                     mainScript = src.pop();
                     subPath = src.length ? src.join('/')  + '/' : './';
 
                     cfg.baseUrl = subPath;
-                    dataMain = mainScript;
                 }
 
-                //Strip off any trailing .js since dataMain is now
+                //Strip off any trailing .js since mainScript is now
                 //like a module name.
-                dataMain = dataMain.replace(jsSuffixRegExp, '');
+                mainScript = mainScript.replace(jsSuffixRegExp, '');
+
+                 //If mainScript is still a path, fall back to dataMain
+                if (req.jsExtRegExp.test(mainScript)) {
+                    mainScript = dataMain;
+                }
 
                 //Put the data-main script in the files to load.
-                cfg.deps = cfg.deps ? cfg.deps.concat(dataMain) : [dataMain];
+                cfg.deps = cfg.deps ? cfg.deps.concat(mainScript) : [mainScript];
 
                 return true;
             }
@@ -1925,12 +1984,13 @@ var requirejs, require, define;
         //This module may not have dependencies
         if (!isArray(deps)) {
             callback = deps;
-            deps = [];
+            deps = null;
         }
 
         //If no name, and callback is a function, then figure out if it a
         //CommonJS thing with dependencies.
-        if (!deps.length && isFunction(callback)) {
+        if (!deps && isFunction(callback)) {
+            deps = [];
             //Remove comments from the callback string,
             //look for require calls, and pull them into the dependencies,
             //but only if there are function args.

dependency-examples/flight/index.html

@@ -25,6 +25,6 @@
 			<p>Part of <a href="http://todomvc.com">TodoMVC</a></p>
 		</footer>
 		<script src="bower_components/todomvc-common/base.js"></script>
-		<script data-main="app/js/main" src="bower_components/requirejs/requirejs.js"></script>
+		<script data-main="app/js/main" src="bower_components/requirejs/require.js"></script>
 	</body>
 </html>