flightjs · csenapati12 · Jan 29, 2015 · Jan 29, 2015 · Jan 29, 2015 · Jan 30, 2015
diff --git a/ADOPTERS.md b/ADOPTERS.md
@@ -14,3 +14,5 @@ Twitter isn't the only company using Flight. We're sure the following list isn't
 * [twitter](https://blog.twitter.com/2013/introducing-flight-a-web-application-framework)
 * [goodvidio](http://www.goodvid.io)
 * [Drip](https://www.getdrip.com)
+* [Codetree](https://codetree.com)
+* [Movebubble](https://www.movebubble.com)
diff --git a/README.md b/README.md
@@ -1,202 +1,24 @@
 # Flight
 
-[![Build Status](https://travis-ci.org/flightjs/flight.png?branch=master)](http://travis-ci.org/flightjs/flight) [![Gitter](https://badges.gitter.im/Join%20chat.svg)](https://gitter.im/flightjs/flight?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Gitter](https://badges.gitter.im/Join%20chat.svg)](https://gitter.im/flightjs/flight?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[Flight](http://flightjs.github.io/) is a lightweight, component-based,
-event-driven JavaScript framework that maps behavior to DOM nodes. It was
-created at Twitter, and is used by the [twitter.com](https://twitter.com/) and
-[TweetDeck](https://tweetdeck.twitter.com/) web applications.
+[Flight](http://flightjs.github.io/) is a lightweight framework for building JavaScript components. It was created at Twitter, and is used by the [twitter.com](https://twitter.com/) and [TweetDeck](https://tweetdeck.twitter.com/) web applications.
 
-* [Website](http://flightjs.github.io/)
-* [API documentation](doc/README.md)
-* [Flight example app](http://flightjs.github.io/example-app/) ([Source](https://github.com/flightjs/example-app))
-* [Flight's Google Group](https://groups.google.com/forum/?fromgroups#!forum/twitter-flight)
-* [Flight on Twitter](https://twitter.com/flightjs)
-* [Flight on Freenode IRC](http://webchat.freenode.net/?channels=flightjs) (#flightjs)
+Work is currently ongoing for Flight v2 and beyond, which will make some backward incompatible changes.
 
-## Example
+## [v1.x][v1.x]
 
-A simple example of a Flight component.
+To see the most recent v1.x code and documentation, check out [the branch][v1.x].
 
-```js
-/* Component definition */
+## v2.x
 
-var Inbox = flight.component(inbox);
-
-function inbox() {
-  this.doSomething = function() { /* ... */ }
-  this.doSomethingElse = function() { /* ... */ }
-
-  // after initializing the component
-  this.after('initialize', function() {
-    this.on('click', this.doSomething);
-    this.on('mouseover', this.doSomethingElse);
-  });
-}
-
-/* Attach the component to a DOM node */
-
-Inbox.attachTo('#inbox');
-```
-
-## Installation
-
-Quick start using the [pre-built
-library](http://flightjs.github.io/release/latest/flight.min.js) (a
-[UMD](https://github.com/umdjs/umd) bundle). It exposes all of its modules as
-properties of a global variable, `flight`.
-
-```html
-<!-- jQuery -->
-<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-<!-- Flight release -->
-<script src="http://flightjs.github.io/release/latest/flight.min.js"></script>
-```
-
-Using [npm](https://www.npmjs.org/):
-
-```
-npm install --save flightjs
-```
-
-Using [Bower](http://bower.io/):
-
-```
-bower install --save flight
-```
-
-You will have to load [jQuery](http://jquery.com) in your application.
-
-## Why Flight?
-
-Flight is only ~5K minified and gzipped. It's built upon jQuery.
-
-Flight components are highly portable and easily testable. This is because a
-Flight component (and its API) is entirely decoupled from other components.
-Flight components communicate only by triggering and subscribing to events.
-
-Flight also includes a simple and safe
-[mixin](https://javascriptweblog.wordpress.com/2011/05/31/a-fresh-look-at-javascript-mixins/)
-infrastructure, allowing components to be easily extended with minimal
-boilerplate.
-
-## Development tools
-
-Flight has supporting projects that provide everything you need to setup,
-write, and test your application.
-
-* [Flight generator](https://github.com/flightjs/generator-flight/)
-  Recommended. One-step to setup a Flight-based web app.
-
-* [Flight package generator](https://github.com/flightjs/generator-flight-package/)
-  Recommended. One-step to setup everything you need to write and test a
-  standalone Flight component.
-
-* [Jasmine Flight](https://github.com/flightjs/jasmine-flight/)
-  Extensions for the Jasmine test framework.
-
-* [Mocha Flight](https://github.com/flightjs/mocha-flight/)
-  Extensions for the Mocha test framework.
-
-## Finding and writing components
-
-You can browse all the [Flight components](http://flight-components.jit.su)
-available at this time. They can also be found by searching the Bower registry:
-
-```
-bower search flight
-```
-
-The easiest way to write a new Flight component is to use the [Flight
-package generator](https://github.com/flightjs/generator-flight-package/):
-
-```
-yo flight-package foo
-```
-
-## Browser Support
-
-Chrome, Firefox, Safari, Opera, IE 7+ (requires [ES5-shim](https://github.com/kriskowal/es5-shim)).
-
-## Quick Overview
-
-Here's a brief introduction to Flight's key concepts and syntax. Read the [API
-documentation](doc) for a comprehensive overview.
-
-### Components ([API](doc/component_api.md))
-
-- A Component is nothing more than a constructor with properties mixed into its prototype.
-- Every Component comes with a set of basic functionality such as event handling and component registration.
-(see [Base API](doc/base_api.md))
-- Additionally, each Component definition mixes in a set of custom properties which describe its behavior.
-- When a component is attached to a DOM node, a new instance of that component is created. Each component
-instance references the DOM node via its `node` property.
-- Component instances cannot be referenced directly; they communicate with other components via events.
-
-### Interacting with the DOM
-
-Once attached, component instances have direct access to their node object via the `node` property. (There's
-also a jQuery version of the node available via the `$node` property.)
-
-### Events in Flight
-
-Events are how Flight components interact. The Component prototype supplies methods for triggering events as
-well as for subscribing to and unsubscribing from events. These Component event methods are actually just convenient
-wrappers around regular event methods on DOM nodes.
-
-### Mixins ([API](doc/mixin_api.md))
-
-- In Flight, a mixin is a function which assigns properties to a target object (represented by the `this`
-keyword).
-- A typical mixin defines a set of functionality that will be useful to more than one component.
-- One mixin can be applied to any number of [Component](#components) definitions.
-- One Component definition can have any number of mixins applied to it.
-- Each Component defines a [*core*](#core_mixin) mixin within its own module.
-- A mixin can itself have mixins applied to it.
-
-### Advice ([API](doc/advice_api.md))
-
-In Flight, advice is a mixin (`'lib/advice.js'`) that defines `before`, `after` and `around` methods.
-
-These can be used to modify existing functions by adding custom code. All Components have advice mixed in to
-their prototype so that mixins can augment existing functions without requiring knowledge
-of the original implementation. Moreover, since Component's are seeded with an empty `initialize` method,
-Component definitions will typically use `after` to define custom `initialize` behavior.
-
-### Debugging ([API](doc/debug_api.md))
-
-Flight ships with a debug module which can help you trace the sequence of event triggering and binding. By default
-console logging is turned off, but you can log `trigger`, `on` and `off` events by means of the following console
-commands.
-
-## Authors
-
-+ [@angus-c](http://github.com/angus-c)
-+ [@danwrong](http://github.com/danwrong)
-+ [@kpk](http://github.com/kennethkufluk)
-
-Thanks for assistance and contributions:
-[@sayrer](https://github.com/sayrer),
-[@shinypb](https://github.com/shinypb),
-[@kloots](https://github.com/kloots),
-[@marcelduran](https://github.com/marcelduran),
-[@tbrd](https://github.com/tbrd),
-[@necolas](https://github.com/necolas),
-[@fat](https://github.com/fat),
-[@mkuklis](https://github.com/mkuklis),
-[@jrburke](https://github.com/jrburke),
-[@garann](https://github.com/garann),
-[@WebReflection](https://github.com/WebReflection),
-[@coldhead](https://github.com/coldhead),
-[@paulirish](https://github.com/paulirish),
-[@nimbupani](https://github.com/nimbupani),
-[@mootcycle](https://github.com/mootcycle).
-
-Special thanks to the rest of the Twitter web team for their abundant
-contributions and feedback.
+This is the latest code for v2. To get involved, check out [the issues][v2-issues].
 
 ## License
 
 Copyright 2013 Twitter, Inc and other contributors.
 
 Licensed under the MIT License
+
+[v1.x]: https://github.com/flightjs/flight/tree/v1.x
+[v2-issues]: https://github.com/flightjs/flight/milestones/v2.0.0
diff --git a/doc/base_api.md b/doc/base_api.md
@@ -170,29 +170,6 @@ this.after('initialize', function() {
 });
 ```
 
-Example of `handler` being a string that maps events to other events. This is
-useful for proxying browser events to more meaningful custom events.
-
-```js
-this.on('click', 'uiComponentClick');
-```
-
-Example of `handler` being an object that maps events to other events.
-
-```js
-this.attributes({
-  menuItemSelector: '.menuItem',
-  saveButtonSelector: '#save'
-});
-
-this.after('initialize', function() {
-  this.on('click', {
-    menuItemSelector: 'uiMenuItemClick',
-    saveButtonSelector: 'uiSaveButtonClick'
-  });
-});
-```
-
 <a name="this.off"></a>
 ## this.off([selector,] eventType [, handler])
 

diff --git a/flight b/flight
diff --git a/lib/base.js b/lib/base.js
@@ -47,6 +47,10 @@ define(
     function initAttributes(attrs) {
       var definedKeys = [], incomingKeys;
 
+      if (typeof this.attrDef === 'undefined') {
+        this.attrDef = function Attributes() {};
+      }
+
       this.attr = new this.attrDef;
 
       if (debug.enabled && window.console) {
@@ -84,37 +88,6 @@ define(
 
     }
 
-    function initDeprecatedAttributes(attrs) {
-      // merge defaults with supplied options
-      // put options in attr.__proto__ to avoid merge overhead
-      var attr = Object.create(attrs);
-
-      for (var key in this.defaults) {
-        if (!attrs.hasOwnProperty(key)) {
-          attr[key] = this.defaults[key];
-          // Warn about reference types in defaultAttrs
-          if (debug.enabled && typeof this.defaults[key] === 'object') {
-            warnAboutReferenceType.call(this, key);
-          }
-        }
-      }
-
-      this.attr = attr;
-
-      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.toString() + '".');
-        }
-      }, this);
-    }
-
-    function proxyEventTo(targetEvent) {
-      return function(e, data) {
-        $(e.target).trigger(targetEvent, data);
-      };
-    }
-
     function withBase() {
 
       // delegate trigger, bind and unbind to an element
@@ -174,8 +147,6 @@ define(
           originalCb = utils.delegate(
             this.resolveDelegateRules(origin)
           );
-        } else if (typeof origin == 'string') {
-          originalCb = proxyEventTo(origin);
         } else {
           originalCb = origin;
         }
@@ -255,7 +226,7 @@ define(
           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]] = (typeof ruleInfo[r] == 'string') ? proxyEventTo(ruleInfo[r]) : ruleInfo[r];
+          rules[this.attr[r]] = ruleInfo[r];
         }, this);
 
         return rules;
@@ -265,11 +236,8 @@ define(
         return this.$node.find(this.attr[attributeKey]);
       };
 
-      // New-style attributes
-
       this.attributes = function(attrs) {
-
-        var Attributes = function() {};
+        function Attributes() {}
 
         if (this.attrDef) {
           Attributes.prototype = new this.attrDef;
@@ -282,10 +250,8 @@ define(
         this.attrDef = Attributes;
       };
 
-      // Deprecated attributes
-
-      this.defaultAttrs = function(defaults) {
-        utils.push(this.defaults, defaults, true) || (this.defaults = defaults);
+      this.defaultAttrs = function() {
+        throw new Error('defaultAttrs has been removed. Please use attributes instead.');
       };
 
       this.initialize = function(node, attrs) {
@@ -304,11 +270,7 @@ define(
           this.$node = $(node);
         }
 
-        if (this.attrDef) {
-          initAttributes.call(this, attrs);
-        } else {
-          initDeprecatedAttributes.call(this, attrs);
-        }
+        initAttributes.call(this, attrs);
 
         return this;
       };

diff --git a/lib/component.js b/lib/component.js
@@ -92,14 +92,13 @@ define(
         Component.describe = Component.prototype.describe = Component.toString();
       }
 
-      // 'options' is optional hash to be merged with 'defaults' in the component definition
       Component.attachTo = attachTo;
+
       // enables extension of existing "base" Components
       Component.mixin = function() {
         var newComponent = define(); //TODO: fix pretty print
         var newPrototype = Object.create(Component.prototype);
         newPrototype.mixedIn = [].concat(Component.prototype.mixedIn);
-        newPrototype.defaults = utils.merge(Component.prototype.defaults);
         newPrototype.attrDef = Component.prototype.attrDef;
         compose.mixin(newPrototype, arguments);
         newComponent.prototype = newPrototype;

diff --git a/lib/logger.js b/lib/logger.js
@@ -17,8 +17,9 @@ define(
 
     function elemToString(elem) {
       var tagStr = elem.tagName ? elem.tagName.toLowerCase() : elem.toString();
+      var idStr = elem.id ? '#' + (elem.id) : '';
       var classStr = elem.className ? '.' + (elem.className) : '';
-      var result = tagStr + classStr;
+      var result = tagStr + idStr + classStr;
       return elem.tagName ? ['\'', '\''].join(result) : result;
     }