ember-source 1.11.0.beta.1 → 1.11.0.beta.2

data/dist/ember.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   1.11.0-beta.1
+ * @version   1.11.0-beta.2
  */
 
 (function() {
@@ -1489,6 +1489,8 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
 
   var VALID_FULL_NAME_REGEXP = /^[^:]+.+:[^:]+$/;
 
+  var instanceInitializersFeatureEnabled;
+  
   /**
    A lightweight registry used to store factory and option information keyed
    by type.
@@ -1656,7 +1658,7 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
     lookup: function(fullName, options) {
       Ember['default'].assert('Create a container on the registry (with `registry.container()`) before calling `lookup`.', this._defaultContainer);
 
-      if (Ember['default'].FEATURES.isEnabled('ember-application-instance-initializers')) {
+      if (instanceInitializersFeatureEnabled) {
         Ember['default'].deprecate('`lookup` was called on a Registry. The `initializer` API no longer receives a container, and you should use an `instanceInitializer` to look up objects from the container.', { url: "http://emberjs.com/guides/deprecations#toc_deprecate-access-to-instances-in-initializers" });
       }
 
@@ -1666,7 +1668,7 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
     lookupFactory: function(fullName) {
       Ember['default'].assert('Create a container on the registry (with `registry.container()`) before calling `lookupFactory`.', this._defaultContainer);
 
-      if (Ember['default'].FEATURES.isEnabled('ember-application-instance-initializers')) {
+      if (instanceInitializersFeatureEnabled) {
         Ember['default'].deprecate('`lookupFactory` was called on a Registry. The `initializer` API no longer receives a container, and you should use an `instanceInitializer` to look up objects from the container.', { url: "http://emberjs.com/guides/deprecations#toc_deprecate-access-to-instances-in-initializers" });
       }
 
@@ -2789,51 +2791,65 @@ enifed("dom-helper",
     };
 
     prototype.createMorph = function(parent, start, end, contextualElement){
+      if (contextualElement && contextualElement.nodeType === 11) {
+        throw new Error("Cannot pass a fragment as the contextual element to createMorph");
+      }
+
       if (!contextualElement && parent.nodeType === 1) {
         contextualElement = parent;
       }
-      return new Morph(parent, start, end, this, contextualElement);
+      var morph = new Morph(this, contextualElement);
+      morph.firstNode = start;
+      morph.lastNode = end;
+      morph.state = {};
+      morph.isDirty = true;
+      return morph;
     };
 
     prototype.createUnsafeMorph = function(parent, start, end, contextualElement){
       var morph = this.createMorph(parent, start, end, contextualElement);
-      morph.escaped = false;
+      morph.parseTextAsHTML = true;
       return morph;
     };
 
     // This helper is just to keep the templates good looking,
     // passing integers instead of element references.
     prototype.createMorphAt = function(parent, startIndex, endIndex, contextualElement){
-      var start = startIndex === -1 ? null : this.childAtIndex(parent, startIndex),
-          end = endIndex === -1 ? null : this.childAtIndex(parent, endIndex);
+      var single = startIndex === endIndex;
+      var start = this.childAtIndex(parent, startIndex);
+      var end = single ? start : this.childAtIndex(parent, endIndex);
       return this.createMorph(parent, start, end, contextualElement);
     };
 
     prototype.createUnsafeMorphAt = function(parent, startIndex, endIndex, contextualElement) {
       var morph = this.createMorphAt(parent, startIndex, endIndex, contextualElement);
-      morph.escaped = false;
+      morph.parseTextAsHTML = true;
       return morph;
     };
 
     prototype.insertMorphBefore = function(element, referenceChild, contextualElement) {
-      var start = this.document.createTextNode('');
-      var end = this.document.createTextNode('');
-      element.insertBefore(start, referenceChild);
-      element.insertBefore(end, referenceChild);
-      return this.createMorph(element, start, end, contextualElement);
+      var insertion = this.document.createComment('');
+      element.insertBefore(insertion, referenceChild);
+      return this.createMorph(element, insertion, insertion, contextualElement);
     };
 
     prototype.appendMorph = function(element, contextualElement) {
-      var start = this.document.createTextNode('');
-      var end = this.document.createTextNode('');
-      element.appendChild(start);
-      element.appendChild(end);
-      return this.createMorph(element, start, end, contextualElement);
+      var insertion = this.document.createComment('');
+      element.appendChild(insertion);
+      return this.createMorph(element, insertion, insertion, contextualElement);
+    };
+
+    prototype.insertBoundary = function(fragment, index) {
+      // this will always be null or firstChild
+      var child = index === null ? null : this.childAtIndex(fragment, index);
+      this.insertBefore(fragment, this.createTextNode(''), child);
     };
 
     prototype.parseHTML = function(html, contextualElement) {
+      var childNodes;
+
       if (interiorNamespace(contextualElement) === svgNamespace) {
-        return buildSVGDOM(html, this);
+        childNodes = buildSVGDOM(html, this);
       } else {
         var nodes = buildHTMLDOM(html, contextualElement, this);
         if (detectOmittedStartTag(html, contextualElement)) {
@@ -2841,11 +2857,33 @@ enifed("dom-helper",
           while (node && node.nodeType !== 1) {
             node = node.nextSibling;
           }
-          return node.childNodes;
+          childNodes = node.childNodes;
         } else {
-          return nodes;
+          childNodes = nodes;
+        }
+      }
+
+      // Copy node list to a fragment.
+      var fragment = this.document.createDocumentFragment();
+
+      if (childNodes && childNodes.length > 0) {
+        var currentNode = childNodes[0];
+
+        // We prepend an <option> to <select> boxes to absorb any browser bugs
+        // related to auto-select behavior. Skip past it.
+        if (contextualElement.tagName === 'SELECT') {
+          currentNode = currentNode.nextSibling;
+        }
+
+        while (currentNode) {
+          var tempNode = currentNode;
+          currentNode = currentNode.nextSibling;
+
+          fragment.appendChild(tempNode);
         }
       }
+
+      return fragment;
     };
 
     var parsingNode;
@@ -2904,33 +2942,6 @@ enifed("dom-helper/build-html-dom",
               testEl.childNodes[2].nodeValue === ' Value';
     })(doc);
 
-    // IE8 create a selected attribute where they should only
-    // create a property
-    var createsSelectedAttribute = doc && (function(document) {
-      var testEl = document.createElement('div');
-      testEl.innerHTML = "<select><option></option></select>";
-      return testEl.childNodes[0].childNodes[0].getAttribute('selected') === 'selected';
-    })(doc);
-
-    var detectAutoSelectedOption;
-    if (createsSelectedAttribute) {
-      detectAutoSelectedOption = (function(){
-        var detectAutoSelectedOptionRegex = /<option[^>]*selected/;
-        return function detectAutoSelectedOption(select, option, html) { //jshint ignore:line
-          return select.selectedIndex === 0 &&
-                 !detectAutoSelectedOptionRegex.test(html);
-        };
-      })();
-    } else {
-      detectAutoSelectedOption = function detectAutoSelectedOption(select, option, html) { //jshint ignore:line
-        var selectedAttribute = option.getAttribute('selected');
-        return select.selectedIndex === 0 && (
-                 selectedAttribute === null ||
-                 ( selectedAttribute !== '' && selectedAttribute.toLowerCase() !== 'selected' )
-                );
-      };
-    }
-
     var tagNamesRequiringInnerHTMLFix = doc && (function(document) {
       var tagNamesRequiringInnerHTMLFix;
       // IE 9 and earlier don't allow us to set innerHTML on col, colgroup, frameset,
@@ -3005,7 +3016,10 @@ enifed("dom-helper/build-html-dom",
         throw "Can't set innerHTML on "+tagName+" in this browser";
       }
 
+      html = fixSelect(html, contextualElement);
+
       var wrappingTags = tagNamesRequiringInnerHTMLFix[tagName.toLowerCase()];
+
       var startTag = outerHTML.match(new RegExp("<"+tagName+"([^>]*)>", 'i'))[0];
       var endTag = '</'+tagName+'>';
 
@@ -3036,18 +3050,30 @@ enifed("dom-helper/build-html-dom",
     var buildDOM;
     if (needsShy) {
       buildDOM = function buildDOM(html, contextualElement, dom){
+        html = fixSelect(html, contextualElement);
+
         contextualElement = dom.cloneNode(contextualElement, false);
         scriptSafeInnerHTML(contextualElement, html);
         return contextualElement.childNodes;
       };
     } else {
       buildDOM = function buildDOM(html, contextualElement, dom){
+        html = fixSelect(html, contextualElement);
+
         contextualElement = dom.cloneNode(contextualElement, false);
         contextualElement.innerHTML = html;
         return contextualElement.childNodes;
       };
     }
 
+    function fixSelect(html, contextualElement) {
+      if (contextualElement.tagName === 'SELECT') {
+        html = "<option></option>" + html;
+      }
+
+      return html;
+    }
+
     var buildIESafeDOM;
     if (tagNamesRequiringInnerHTMLFix || movesWhitespace) {
       buildIESafeDOM = function buildIESafeDOM(html, contextualElement, dom) {
@@ -3118,45 +3144,17 @@ enifed("dom-helper/build-html-dom",
       buildIESafeDOM = buildDOM;
     }
 
-    // When parsing innerHTML, the browser may set up DOM with some things
-    // not desired. For example, with a select element context and option
-    // innerHTML the first option will be marked selected.
-    //
-    // This method cleans up some of that, resetting those values back to
-    // their defaults.
-    //
-    function buildSafeDOM(html, contextualElement, dom) {
-      var childNodes = buildIESafeDOM(html, contextualElement, dom);
-
-      if (contextualElement.tagName === 'SELECT') {
-        // Walk child nodes
-        for (var i = 0; childNodes[i]; i++) {
-          // Find and process the first option child node
-          if (childNodes[i].tagName === 'OPTION') {
-            if (detectAutoSelectedOption(childNodes[i].parentNode, childNodes[i], html)) {
-              // If the first node is selected but does not have an attribute,
-              // presume it is not really selected.
-              childNodes[i].parentNode.selectedIndex = -1;
-            }
-            break;
-          }
-        }
-      }
-
-      return childNodes;
-    }
-
     var buildHTMLDOM;
     if (needsIntegrationPointFix) {
       buildHTMLDOM = function buildHTMLDOM(html, contextualElement, dom){
         if (svgHTMLIntegrationPoints[contextualElement.tagName]) {
-          return buildSafeDOM(html, document.createElement('div'), dom);
+          return buildIESafeDOM(html, document.createElement('div'), dom);
         } else {
-          return buildSafeDOM(html, contextualElement, dom);
+          return buildIESafeDOM(html, contextualElement, dom);
         }
       };
     } else {
-      buildHTMLDOM = buildSafeDOM;
+      buildHTMLDOM = buildIESafeDOM;
     }
 
     __exports__.buildHTMLDOM = buildHTMLDOM;
@@ -3668,7 +3666,7 @@ enifed('ember-application/system/application-instance', ['exports', 'ember-metal
   });
 
 });
-enifed('ember-application/system/application', ['exports', 'dag-map', 'container/registry', 'ember-metal', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-runtime/system/lazy_load', 'ember-runtime/system/namespace', 'ember-runtime/mixins/deferred', 'ember-application/system/resolver', 'ember-metal/platform/create', 'ember-metal/run_loop', 'ember-metal/utils', 'ember-runtime/controllers/controller', 'ember-metal/enumerable_utils', 'ember-runtime/controllers/object_controller', 'ember-runtime/controllers/array_controller', 'ember-views/system/renderer', 'dom-helper', 'ember-views/views/select', 'ember-views/views/view', 'ember-views/views/metamorph_view', 'ember-views/system/event_dispatcher', 'ember-views/system/jquery', 'ember-routing/system/route', 'ember-routing/system/router', 'ember-routing/location/hash_location', 'ember-routing/location/history_location', 'ember-routing/location/auto_location', 'ember-routing/location/none_location', 'ember-routing/system/cache', 'ember-application/system/application-instance', 'ember-extension-support/container_debug_adapter', 'ember-metal/environment'], function (exports, DAG, Registry, Ember, property_get, property_set, lazy_load, Namespace, DeferredMixin, DefaultResolver, create, run, utils, Controller, EnumerableUtils, ObjectController, ArrayController, Renderer, DOMHelper, SelectView, EmberView, _MetamorphView, EventDispatcher, jQuery, Route, Router, HashLocation, HistoryLocation, AutoLocation, NoneLocation, BucketCache, ApplicationInstance, ContainerDebugAdapter, environment) {
+enifed('ember-application/system/application', ['exports', 'dag-map', 'container/registry', 'ember-metal', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-runtime/system/lazy_load', 'ember-runtime/system/namespace', 'ember-runtime/mixins/deferred', 'ember-application/system/resolver', 'ember-metal/platform/create', 'ember-metal/run_loop', 'ember-metal/utils', 'ember-runtime/controllers/controller', 'ember-metal/enumerable_utils', 'ember-runtime/controllers/object_controller', 'ember-runtime/controllers/array_controller', 'ember-views/system/renderer', 'dom-helper', 'ember-views/views/select', 'ember-routing-views/views/outlet', 'ember-views/views/view', 'ember-views/views/metamorph_view', 'ember-views/system/event_dispatcher', 'ember-views/system/jquery', 'ember-routing/system/route', 'ember-routing/system/router', 'ember-routing/location/hash_location', 'ember-routing/location/history_location', 'ember-routing/location/auto_location', 'ember-routing/location/none_location', 'ember-routing/system/cache', 'ember-application/system/application-instance', 'ember-extension-support/container_debug_adapter', 'ember-metal/environment'], function (exports, DAG, Registry, Ember, property_get, property_set, lazy_load, Namespace, DeferredMixin, DefaultResolver, create, run, utils, Controller, EnumerableUtils, ObjectController, ArrayController, Renderer, DOMHelper, SelectView, outlet, EmberView, _MetamorphView, EventDispatcher, jQuery, Route, Router, HashLocation, HistoryLocation, AutoLocation, NoneLocation, BucketCache, ApplicationInstance, ContainerDebugAdapter, environment) {
 
   'use strict';
 
@@ -3921,19 +3919,10 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
       // decremented by the Application's own `initialize` method.
       this._readinessDeferrals = 1;
 
-      if (Ember['default'].FEATURES.isEnabled('ember-application-visit')) {
-        if (this.autoboot) {
-          // Create subclass of Ember.Router for this Application instance.
-          // This is to ensure that someone reopening `App.Router` does not
-          // tamper with the default `Ember.Router`.
-          // 2.0TODO: Can we move this into a globals-mode-only library?
-          this.Router = Router['default'].extend();
-          this.waitForDOMReady(this.buildDefaultInstance());
-        }
-      } else {
+      
         this.Router = Router['default'].extend();
         this.waitForDOMReady(this.buildDefaultInstance());
-      }
+      
     },
 
     /**
@@ -4308,12 +4297,10 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
       this._runInitializer('initializers', function(name, initializer) {
         Ember['default'].assert("No application initializer named '" + name + "'", !!initializer);
 
-        if (Ember['default'].FEATURES.isEnabled("ember-application-initializer-context")) {
-          initializer.initialize(registry, App);
-        } else {
+        
           var ref = initializer.initialize;
           ref(registry, App);
-        }
+        
       });
     },
 
@@ -4413,55 +4400,8 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
     }
   });
 
-  if (Ember['default'].FEATURES.isEnabled('ember-application-instance-initializers')) {
-    Application.reopen({
-      instanceInitializer: function(options) {
-        this.constructor.instanceInitializer(options);
-      }
-    });
-
-    Application.reopenClass({
-      instanceInitializer: buildInitializerMethod('instanceInitializers', 'instance initializer')
-    });
-  }
-
-  if (Ember['default'].FEATURES.isEnabled('ember-application-visit')) {
-    Application.reopen({
-      /**
-        Creates a new instance of the application and instructs it to route to the
-        specified initial URL. This method returns a promise that will be resolved
-        once rendering is complete. That promise is resolved with the instance.
-
-        ```js
-        App.visit('/users').then(function(instance) {
-          var view = instance.view;
-          view.appendTo('#qunit-test-fixtures');
-        });
-       ```
-
-        @method visit
-        @private
-      */
-      visit: function(url) {
-        var instance = this.buildInstance();
-        this.runInstanceInitializers(instance);
-
-        var renderPromise = new Ember['default'].RSVP.Promise(function(res, rej) {
-          instance.didCreateRootView = function(view) {
-            instance.view = view;
-            res(instance);
-          };
-        });
-
-        instance.setupRouter({ location: 'none' });
-
-        return instance.handleURL(url).then(function() {
-          return renderPromise;
-        });
-      }
-    });
-  }
-
+  
+  
   Application.reopenClass({
     initializers: create['default'](null),
     instanceInitializers: create['default'](null),
@@ -4640,6 +4580,7 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
 
       registry.injection('view', 'renderer', 'renderer:-dom');
       registry.register('view:select', SelectView['default']);
+      registry.register('view:-outlet', outlet.OutletView);
 
       registry.register('view:default', _MetamorphView['default']);
       registry.register('view:toplevel', EmberView['default'].extend());
@@ -4648,6 +4589,7 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
       registry.register('event_dispatcher:main', EventDispatcher['default']);
 
       registry.injection('router:main', 'namespace', 'application:main');
+      registry.injection('view:-outlet', 'namespace', 'application:main');
 
       registry.register('location:auto', AutoLocation['default']);
       registry.register('location:hash', HashLocation['default']);
@@ -5372,10 +5314,7 @@ enifed('ember-debug', ['exports', 'ember-metal/core', 'ember-metal/error', 'embe
     Ember['default'].FEATURES['features-stripped-test'] = true;
     var featuresWereStripped = true;
 
-    if (Ember['default'].FEATURES.isEnabled('features-stripped-test')) {
-      featuresWereStripped = false;
-    }
-
+    
     delete Ember['default'].FEATURES['features-stripped-test'];
     _warnIfUsingStrippedFeatureFlags(Ember['default'].ENV.FEATURES, featuresWereStripped);
 
@@ -5974,40 +5913,34 @@ enifed('ember-htmlbars', ['ember-metal/core', 'ember-template-compiler', 'ember-
   helpers.registerHelper('each', each.eachHelper);
   helpers.registerHelper('unbound', unbound.unboundHelper);
 
-  
-    Ember['default'].HTMLBars = {
-      _registerHelper: helpers.registerHelper,
-      template: ember_template_compiler.template,
-      compile: ember_template_compiler.compile,
-      precompile: ember_template_compiler.precompile,
-      makeViewHelper: makeViewHelper['default'],
-      makeBoundHelper: makeBoundHelper['default'],
-      registerPlugin: ember_template_compiler.registerPlugin
-    };
-
-  
+  Ember['default'].HTMLBars = {
+    _registerHelper: helpers.registerHelper,
+    template: ember_template_compiler.template,
+    compile: ember_template_compiler.compile,
+    precompile: ember_template_compiler.precompile,
+    makeViewHelper: makeViewHelper['default'],
+    makeBoundHelper: makeBoundHelper['default'],
+    registerPlugin: ember_template_compiler.registerPlugin
+  };
 
 });
 enifed('ember-htmlbars/compat', ['exports', 'ember-metal/core', 'ember-htmlbars/helpers', 'ember-htmlbars/compat/helper', 'ember-htmlbars/compat/handlebars-get', 'ember-htmlbars/compat/make-bound-helper', 'ember-htmlbars/compat/register-bound-helper', 'ember-htmlbars/system/make-view-helper', 'ember-htmlbars/utils/string'], function (exports, Ember, helpers, helper, compatHandlebarsGet, compatMakeBoundHelper, compatRegisterBoundHelper, makeViewHelper, string) {
 
   'use strict';
 
-  var EmberHandlebars;
-  
-    EmberHandlebars = Ember['default'].Handlebars = Ember['default'].Handlebars || {};
-    EmberHandlebars.helpers = helpers['default'];
-    EmberHandlebars.helper = helper.handlebarsHelper;
-    EmberHandlebars.registerHelper = helper.registerHandlebarsCompatibleHelper;
-    EmberHandlebars.registerBoundHelper = compatRegisterBoundHelper['default'];
-    EmberHandlebars.makeBoundHelper = compatMakeBoundHelper['default'];
-    EmberHandlebars.get = compatHandlebarsGet['default'];
-    EmberHandlebars.makeViewHelper = makeViewHelper['default'];
-
-    EmberHandlebars.SafeString = string.SafeString;
-    EmberHandlebars.Utils =  {
-      escapeExpression: string.escapeExpression
-    };
-  
+  var EmberHandlebars = Ember['default'].Handlebars = Ember['default'].Handlebars || {};
+  EmberHandlebars.helpers = helpers['default'];
+  EmberHandlebars.helper = helper.handlebarsHelper;
+  EmberHandlebars.registerHelper = helper.registerHandlebarsCompatibleHelper;
+  EmberHandlebars.registerBoundHelper = compatRegisterBoundHelper['default'];
+  EmberHandlebars.makeBoundHelper = compatMakeBoundHelper['default'];
+  EmberHandlebars.get = compatHandlebarsGet['default'];
+  EmberHandlebars.makeViewHelper = makeViewHelper['default'];
+
+  EmberHandlebars.SafeString = string.SafeString;
+  EmberHandlebars.Utils =  {
+    escapeExpression: string.escapeExpression
+  };
 
   exports['default'] = EmberHandlebars;
 
@@ -6539,9 +6472,8 @@ enifed('ember-htmlbars/helpers/bind-attr', ['exports', 'ember-metal/core', 'embe
   function bindAttrHelperDeprecated() {
     Ember['default'].deprecate("The 'bindAttr' view helper is deprecated in favor of 'bind-attr'");
 
-    
-      return helpers['default']['bind-attr'].helperFunction.apply(this, arguments);
-      }
+    return helpers['default']['bind-attr'].helperFunction.apply(this, arguments);
+  }
 
   exports['default'] = bindAttrHelper;
 
@@ -7389,7 +7321,7 @@ enifed('ember-htmlbars/hooks/inline', ['exports', 'ember-views/views/simple_boun
   exports['default'] = inline;
 
 });
-enifed('ember-htmlbars/hooks/set', ['exports', 'ember-metal/core', 'ember-metal/error'], function (exports, Ember, EmberError) {
+enifed('ember-htmlbars/hooks/set', ['exports'], function (exports) {
 
   'use strict';
 
@@ -7399,9 +7331,8 @@ enifed('ember-htmlbars/hooks/set', ['exports', 'ember-metal/core', 'ember-metal/
   */
 
   function set(env, view, name, value) {
-    
-      view._keywords[name] = value;
-      }
+    view._keywords[name] = value;
+  }
   exports['default'] = set;
 
 });
@@ -7529,9 +7460,6 @@ enifed('ember-htmlbars/system/bootstrap', ['exports', 'ember-metal/core', 'ember
   */
 
   lazy_load.onLoad('Ember.Application', function(Application) {
-    
-      // jscs:disable validateIndentation
-
     Application.initializer({
       name: 'domTemplates',
       initialize: environment['default'].hasDOM ? _bootstrap : function() { }
@@ -7542,9 +7470,6 @@ enifed('ember-htmlbars/system/bootstrap', ['exports', 'ember-metal/core', 'ember
       after: 'domTemplates',
       initialize: registerComponentLookup
     });
-
-      // jscs:enable validateIndentation
-    
   });
 
   exports['default'] = bootstrap;
@@ -7835,6 +7760,12 @@ enifed('ember-htmlbars/system/render-view', ['exports', 'ember-metal/core', 'emb
   exports['default'] = renderView;
 
   function renderHTMLBarsTemplate(view, buffer, template) {
+    Ember['default'].assert(
+      'The template being rendered by `' + view + '` was compiled with `' + template.revision +
+      '` which does not match `Ember@1.11.0-beta.2` (this revision).',
+      template.revision === 'Ember@1.11.0-beta.2'
+    );
+
     var contextualElement = buffer.innerContextualElement();
     var args = view._blockArguments;
     var env = {
@@ -7869,17 +7800,16 @@ enifed('ember-htmlbars/templates/component', ['exports', 'ember-template-compile
 
   'use strict';
 
-  var t = (function() {
+  exports['default'] = template['default']((function() {
     return {
       isHTMLBars: true,
+      revision: "Ember@v1.11.0-beta.2",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
       build: function build(dom) {
         var el0 = dom.createDocumentFragment();
-        var el1 = dom.createTextNode("");
-        dom.appendChild(el0, el1);
-        var el1 = dom.createTextNode("");
+        var el1 = dom.createComment("");
         dom.appendChild(el0, el1);
         return el0;
       },
@@ -7903,23 +7833,24 @@ enifed('ember-htmlbars/templates/component', ['exports', 'ember-template-compile
         } else {
           fragment = this.build(dom);
         }
-        if (this.cachedFragment) { dom.repairClonedNode(fragment,[0,1]); }
-        var morph0 = dom.createMorphAt(fragment,0,1,contextualElement);
+        var morph0 = dom.createMorphAt(fragment,0,0,contextualElement);
+        dom.insertBoundary(fragment, null);
+        dom.insertBoundary(fragment, 0);
         content(env, morph0, context, "yield");
         return fragment;
       }
     };
-  }());
-   exports['default'] = template['default'](t);
+  }()));
 
 });
 enifed('ember-htmlbars/templates/empty', ['exports', 'ember-template-compiler/system/template'], function (exports, template) {
 
   'use strict';
 
-  var t = (function() {
+  exports['default'] = template['default']((function() {
     return {
       isHTMLBars: true,
+      revision: "Ember@v1.11.0-beta.2",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -7949,24 +7880,28 @@ enifed('ember-htmlbars/templates/empty', ['exports', 'ember-template-compiler/sy
         return fragment;
       }
     };
-  }());
-   exports['default'] = template['default'](t);
+  }()));
 
 });
 enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/system/template'], function (exports, template) {
 
   'use strict';
 
-  var t = (function() {
+  exports['default'] = template['default']((function() {
     var child0 = (function() {
       return {
         isHTMLBars: true,
+        revision: "Ember@v1.11.0-beta.2",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
         build: function build(dom) {
-          var el0 = dom.createElement("option");
-          dom.setAttribute(el0,"value","");
+          var el0 = dom.createDocumentFragment();
+          var el1 = dom.createElement("option");
+          dom.setAttribute(el1,"value","");
+          var el2 = dom.createComment("");
+          dom.appendChild(el1, el2);
+          dom.appendChild(el0, el1);
           return el0;
         },
         render: function render(context, env, contextualElement) {
@@ -7989,7 +7924,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
           } else {
             fragment = this.build(dom);
           }
-          var morph0 = dom.createMorphAt(fragment,-1,-1);
+          var morph0 = dom.createMorphAt(dom.childAt(fragment, [0]),0,0);
           content(env, morph0, context, "view.prompt");
           return fragment;
         }
@@ -7999,14 +7934,13 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       var child0 = (function() {
         return {
           isHTMLBars: true,
+          revision: "Ember@v1.11.0-beta.2",
           blockParams: 0,
           cachedFragment: null,
           hasRendered: false,
           build: function build(dom) {
             var el0 = dom.createDocumentFragment();
-            var el1 = dom.createTextNode("");
-            dom.appendChild(el0, el1);
-            var el1 = dom.createTextNode("");
+            var el1 = dom.createComment("");
             dom.appendChild(el0, el1);
             return el0;
           },
@@ -8030,8 +7964,9 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
             } else {
               fragment = this.build(dom);
             }
-            if (this.cachedFragment) { dom.repairClonedNode(fragment,[0,1]); }
-            var morph0 = dom.createMorphAt(fragment,0,1,contextualElement);
+            var morph0 = dom.createMorphAt(fragment,0,0,contextualElement);
+            dom.insertBoundary(fragment, null);
+            dom.insertBoundary(fragment, 0);
             inline(env, morph0, context, "view", [get(env, context, "view.groupView")], {"content": get(env, context, "group.content"), "label": get(env, context, "group.label")});
             return fragment;
           }
@@ -8039,14 +7974,13 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       }());
       return {
         isHTMLBars: true,
+        revision: "Ember@v1.11.0-beta.2",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
         build: function build(dom) {
           var el0 = dom.createDocumentFragment();
-          var el1 = dom.createTextNode("");
-          dom.appendChild(el0, el1);
-          var el1 = dom.createTextNode("");
+          var el1 = dom.createComment("");
           dom.appendChild(el0, el1);
           return el0;
         },
@@ -8070,8 +8004,9 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
           } else {
             fragment = this.build(dom);
           }
-          if (this.cachedFragment) { dom.repairClonedNode(fragment,[0,1]); }
-          var morph0 = dom.createMorphAt(fragment,0,1,contextualElement);
+          var morph0 = dom.createMorphAt(fragment,0,0,contextualElement);
+          dom.insertBoundary(fragment, null);
+          dom.insertBoundary(fragment, 0);
           block(env, morph0, context, "each", [get(env, context, "view.groupedContent")], {"keyword": "group"}, child0, null);
           return fragment;
         }
@@ -8081,14 +8016,13 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       var child0 = (function() {
         return {
           isHTMLBars: true,
+          revision: "Ember@v1.11.0-beta.2",
           blockParams: 0,
           cachedFragment: null,
           hasRendered: false,
           build: function build(dom) {
             var el0 = dom.createDocumentFragment();
-            var el1 = dom.createTextNode("");
-            dom.appendChild(el0, el1);
-            var el1 = dom.createTextNode("");
+            var el1 = dom.createComment("");
             dom.appendChild(el0, el1);
             return el0;
           },
@@ -8112,8 +8046,9 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
             } else {
               fragment = this.build(dom);
             }
-            if (this.cachedFragment) { dom.repairClonedNode(fragment,[0,1]); }
-            var morph0 = dom.createMorphAt(fragment,0,1,contextualElement);
+            var morph0 = dom.createMorphAt(fragment,0,0,contextualElement);
+            dom.insertBoundary(fragment, null);
+            dom.insertBoundary(fragment, 0);
             inline(env, morph0, context, "view", [get(env, context, "view.optionView")], {"content": get(env, context, "item")});
             return fragment;
           }
@@ -8121,14 +8056,13 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       }());
       return {
         isHTMLBars: true,
+        revision: "Ember@v1.11.0-beta.2",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
         build: function build(dom) {
           var el0 = dom.createDocumentFragment();
-          var el1 = dom.createTextNode("");
-          dom.appendChild(el0, el1);
-          var el1 = dom.createTextNode("");
+          var el1 = dom.createComment("");
           dom.appendChild(el0, el1);
           return el0;
         },
@@ -8152,8 +8086,9 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
           } else {
             fragment = this.build(dom);
           }
-          if (this.cachedFragment) { dom.repairClonedNode(fragment,[0,1]); }
-          var morph0 = dom.createMorphAt(fragment,0,1,contextualElement);
+          var morph0 = dom.createMorphAt(fragment,0,0,contextualElement);
+          dom.insertBoundary(fragment, null);
+          dom.insertBoundary(fragment, 0);
           block(env, morph0, context, "each", [get(env, context, "view.content")], {"keyword": "item"}, child0, null);
           return fragment;
         }
@@ -8161,14 +8096,15 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
     }());
     return {
       isHTMLBars: true,
+      revision: "Ember@v1.11.0-beta.2",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
       build: function build(dom) {
         var el0 = dom.createDocumentFragment();
-        var el1 = dom.createTextNode("");
+        var el1 = dom.createComment("");
         dom.appendChild(el0, el1);
-        var el1 = dom.createTextNode("");
+        var el1 = dom.createComment("");
         dom.appendChild(el0, el1);
         var el1 = dom.createTextNode("\n");
         dom.appendChild(el0, el1);
@@ -8194,16 +8130,15 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
         } else {
           fragment = this.build(dom);
         }
-        if (this.cachedFragment) { dom.repairClonedNode(fragment,[0,1]); }
-        var morph0 = dom.createMorphAt(fragment,0,1,contextualElement);
-        var morph1 = dom.createMorphAt(fragment,1,2,contextualElement);
+        var morph0 = dom.createMorphAt(fragment,0,0,contextualElement);
+        var morph1 = dom.createMorphAt(fragment,1,1,contextualElement);
+        dom.insertBoundary(fragment, 0);
         block(env, morph0, context, "if", [get(env, context, "view.prompt")], {}, child0, null);
         block(env, morph1, context, "if", [get(env, context, "view.optionGroupPath")], {}, child1, child2);
         return fragment;
       }
     };
-  }());
-   exports['default'] = template['default'](t);
+  }()));
 
 });
 enifed('ember-htmlbars/utils/string', ['exports', 'htmlbars-util', 'ember-runtime/system/string'], function (exports, htmlbars_util, EmberStringUtils) {
@@ -8283,10 +8218,9 @@ enifed('ember-metal-views/renderer', ['exports', 'dom-helper', 'ember-metal/envi
     this._destinedForDOM = _destinedForDOM === undefined ? true : _destinedForDOM;
   }
 
-  function Renderer_renderTree(_view, _parentView, _insertAt) {
+  function Renderer_renderTree(_view, _parentView, _refMorph) {
     var views = this._views;
     views[0] = _view;
-    var insertAt = _insertAt === undefined ? -1 : _insertAt;
     var index = 0;
     var total = 1;
     var levelBase = _parentView ? _parentView._level+1 : 0;
@@ -8380,7 +8314,7 @@ enifed('ember-metal-views/renderer', ['exports', 'dom-helper', 'ember-metal/envi
 
         parentIndex = parents[level];
         parent = parentIndex === -1 ? _parentView : views[parentIndex];
-        this.insertElement(view, parent, element, -1);
+        this.insertElement(view, parent, element, null);
         index = queue[--length];
         view = views[index];
         element = elements[level];
@@ -8388,7 +8322,7 @@ enifed('ember-metal-views/renderer', ['exports', 'dom-helper', 'ember-metal/envi
       }
     }
 
-    this.insertElement(view, _parentView, element, insertAt);
+    this.insertElement(view, _parentView, element, _refMorph);
 
     for (i=total-1; i>=0; i--) {
       if (willInsert) {
@@ -8437,7 +8371,12 @@ enifed('ember-metal-views/renderer', ['exports', 'dom-helper', 'ember-metal/envi
 
   Renderer.prototype.replaceIn =
     function Renderer_replaceIn(view, target) {
-      var morph = this._dom.createMorph(target, null, null);
+      var morph;
+      if (target.firstNode) {
+        morph = this._dom.createMorph(target, target.firstNode, target.lastNode);
+      } else {
+        morph = this._dom.appendMorph(target);
+      }
       this.scheduleInsert(view, morph);
     };
 
@@ -8510,7 +8449,7 @@ enifed('ember-metal-views/renderer', ['exports', 'dom-helper', 'ember-metal/envi
     }
   }
 
-  function Renderer_insertElement(view, parentView, element, index) {
+  function Renderer_insertElement(view, parentView, element, refMorph) {
     if (element === null || element === undefined) {
       return;
     }
@@ -8518,11 +8457,7 @@ enifed('ember-metal-views/renderer', ['exports', 'dom-helper', 'ember-metal/envi
     if (view._morph) {
       view._morph.setContent(element);
     } else if (parentView) {
-      if (index === -1) {
-        view._morph = parentView._childViewsMorph.append(element);
-      } else {
-        view._morph = parentView._childViewsMorph.insert(index, element);
-      }
+      view._morph = parentView._childViewsMorph.insertContentBeforeMorph(element, refMorph);
     }
   }
 
@@ -8611,12 +8546,12 @@ enifed('ember-metal', ['exports', 'ember-metal/core', 'ember-metal/merge', 'embe
 
   var EmberInstrumentation = Ember['default'].Instrumentation = {};
   EmberInstrumentation.instrument = instrumentation.instrument;
-  EmberInstrumentation.subscribe = streams__utils.subscribe;
-  EmberInstrumentation.unsubscribe = streams__utils.unsubscribe;
+  EmberInstrumentation.subscribe = instrumentation.subscribe;
+  EmberInstrumentation.unsubscribe = instrumentation.unsubscribe;
   EmberInstrumentation.reset  = instrumentation.reset;
 
   Ember['default'].instrument = instrumentation.instrument;
-  Ember['default'].subscribe = streams__utils.subscribe;
+  Ember['default'].subscribe = instrumentation.subscribe;
 
   Ember['default']._Cache = Cache['default'];
 
@@ -8766,23 +8701,7 @@ enifed('ember-metal', ['exports', 'ember-metal/core', 'ember-metal/merge', 'embe
 
   Ember['default'].merge = merge['default'];
 
-  if (Ember['default'].FEATURES.isEnabled('ember-metal-stream')) {
-    Ember['default'].stream = {
-      Stream: Stream['default'],
-
-      isStream: streams__utils.isStream,
-      subscribe: streams__utils.subscribe,
-      unsubscribe: streams__utils.unsubscribe,
-      read: streams__utils.read,
-      readHash: streams__utils.readHash,
-      readArray: streams__utils.readArray,
-      scanArray: streams__utils.scanArray,
-      scanHash: streams__utils.scanHash,
-      concat: streams__utils.concat,
-      chain: streams__utils.chain
-    };
-  }
-
+  
   /**
     A function may be assigned to `Ember.onerror` to be called when Ember
     internals encounter an error. This is useful for specialized error handling
@@ -10051,27 +9970,13 @@ enifed('ember-metal/computed', ['exports', 'ember-metal/property_set', 'ember-me
   */
   function ComputedProperty(config, opts) {
     this.isDescriptor = true;
-    if (Ember.FEATURES.isEnabled("new-computed-syntax")) {
-      if (typeof config === "function") {
-        config.__ember_arity = config.length;
-        this._getter = config;
-        if (config.__ember_arity > 1) {
-          this._setter = config;
-        }
-      } else {
-        this._getter = config.get;
-        this._setter = config.set;
-        if (this._setter && this._setter.__ember_arity === undefined) {
-          this._setter.__ember_arity = this._setter.length;
-        }
-      }
-    } else {
+    
       config.__ember_arity = config.length;
       this._getter = config;
       if (config.__ember_arity > 1) {
         this._setter = config;
       }
-    }
+    
 
     this._dependentKeys = undefined;
     this._suspended = undefined;
@@ -10517,14 +10422,12 @@ enifed('ember-metal/computed', ['exports', 'ember-metal/property_set', 'ember-me
 
     var cp = new ComputedProperty(func);
     // jscs:disable
-    if (Ember.FEATURES.isEnabled("new-computed-syntax")) {
-      // Empty block on purpose
-    } else {
+    
       // jscs:enable
       if (typeof func !== "function") {
         throw new EmberError['default']("Computed Property declared without a property function");
       }
-    }
+    
 
     if (args) {
       cp.property.apply(cp, args);
@@ -11338,7 +11241,7 @@ enifed('ember-metal/core', ['exports'], function (exports) {
 
     @class Ember
     @static
-    @version 1.11.0-beta.1
+    @version 1.11.0-beta.2
   */
 
   if ('undefined' === typeof Ember) {
@@ -11366,10 +11269,10 @@ enifed('ember-metal/core', ['exports'], function (exports) {
   /**
     @property VERSION
     @type String
-    @default '1.11.0-beta.1'
+    @default '1.11.0-beta.2'
     @static
   */
-  Ember.VERSION = '1.11.0-beta.1';
+  Ember.VERSION = '1.11.0-beta.2';
 
   /**
     Standard environmental variables. You can define these in a global `EmberENV`
@@ -11414,7 +11317,7 @@ enifed('ember-metal/core', ['exports'], function (exports) {
   Ember.FEATURES = Ember.ENV.FEATURES;
 
   if (!Ember.FEATURES) {
-    Ember.FEATURES = {"features-stripped-test":null,"ember-routing-named-substates":true,"ember-metal-injected-properties":true,"mandatory-setter":true,"ember-htmlbars":true,"ember-htmlbars-block-params":true,"ember-htmlbars-component-generation":null,"ember-htmlbars-component-helper":true,"ember-htmlbars-inline-if-helper":true,"ember-htmlbars-attribute-syntax":true,"ember-routing-transitioning-classes":true,"new-computed-syntax":null,"ember-testing-checkbox-helpers":null,"ember-metal-stream":null,"ember-htmlbars-each-with-index":true,"ember-application-instance-initializers":null,"ember-application-initializer-context":null,"ember-router-willtransition":true,"ember-application-visit":null}; //jshint ignore:line
+    Ember.FEATURES = {"features-stripped-test":false,"ember-routing-named-substates":true,"mandatory-setter":true,"ember-htmlbars-component-generation":false,"ember-htmlbars-component-helper":true,"ember-htmlbars-inline-if-helper":true,"ember-htmlbars-attribute-syntax":true,"ember-routing-transitioning-classes":true,"new-computed-syntax":false,"ember-testing-checkbox-helpers":false,"ember-metal-stream":false,"ember-htmlbars-each-with-index":true,"ember-application-instance-initializers":false,"ember-application-initializer-context":false,"ember-router-willtransition":true,"ember-application-visit":false}; //jshint ignore:line
   }
 
   /**
@@ -18610,7 +18513,7 @@ enifed('ember-routing-htmlbars/helpers/link-to', ['exports', 'ember-metal/core',
 
     if (!options.template) {
       var linkTitle = params.shift();
-      var shouldEscape = options.morph.escaped;
+      var parseTextAsHTML = options.morph.parseTextAsHTML;
 
       if (utils.isStream(linkTitle)) {
         hash.linkTitle = { stream: linkTitle };
@@ -18618,12 +18521,13 @@ enifed('ember-routing-htmlbars/helpers/link-to', ['exports', 'ember-metal/core',
 
       options.template = {
         isHTMLBars: true,
+        revision: 'Ember@1.11.0-beta.2',
         render: function(view, env) {
           var value = utils.read(linkTitle) || "";
-          if (shouldEscape) {
-            return env.dom.createTextNode(value);
-          } else {
+          if (parseTextAsHTML) {
             return value;
+          } else {
+            return env.dom.createTextNode(value);
           }
         }
       };
@@ -18667,7 +18571,7 @@ enifed('ember-routing-htmlbars/helpers/link-to', ['exports', 'ember-metal/core',
   }
 
 });
-enifed('ember-routing-htmlbars/helpers/outlet', ['exports', 'ember-metal/core', 'ember-metal/property_set', 'ember-routing-views/views/outlet'], function (exports, Ember, property_set, outlet) {
+enifed('ember-routing-htmlbars/helpers/outlet', ['exports', 'ember-metal/core'], function (exports, Ember) {
 
   'use strict';
 
@@ -18679,7 +18583,6 @@ enifed('ember-routing-htmlbars/helpers/outlet', ['exports', 'ember-metal/core',
   */
 
   function outletHelper(params, hash, options, env) {
-    var outletSource;
     var viewName;
     var viewClass;
     var viewFullName;
@@ -18691,11 +18594,6 @@ enifed('ember-routing-htmlbars/helpers/outlet', ['exports', 'ember-metal/core',
 
     var property = params[0] || 'main';
 
-    outletSource = this;
-    while (!outletSource.get('template.isTop')) {
-      outletSource = outletSource._parentView;
-    }
-    property_set.set(this, 'outletSource', outletSource);
 
     // provide controller override
     viewName = hash.view;
@@ -18713,12 +18611,9 @@ enifed('ember-routing-htmlbars/helpers/outlet', ['exports', 'ember-metal/core',
       );
     }
 
-    viewClass = viewName ? this.container.lookupFactory(viewFullName) : hash.viewClass || outlet.OutletView;
-
-    hash.currentViewBinding = '_view.outletSource._outlets.' + property;
-
+    viewClass = viewName ? this.container.lookupFactory(viewFullName) : hash.viewClass || this.container.lookupFactory('view:-outlet');
+    hash._outletName = property;
     options.helperName = options.helperName || 'outlet';
-
     return env.helpers.view.helperFunction.call(this, [viewClass], hash, options, env);
   }
 
@@ -18923,7 +18818,7 @@ enifed('ember-routing-views/views/link', ['exports', 'ember-metal/core', 'ember-
     @extends Ember.View
     @see {Handlebars.helpers.link-to}
   **/
-  var LinkView = Ember['default'].LinkView = EmberComponent['default'].extend({
+  var LinkView = EmberComponent['default'].extend({
     tagName: 'a',
 
     /**
@@ -19499,21 +19394,143 @@ enifed('ember-routing-views/views/link', ['exports', 'ember-metal/core', 'ember-
   exports.LinkView = LinkView;
 
 });
-enifed('ember-routing-views/views/outlet', ['exports', 'ember-views/views/container_view', 'ember-views/views/metamorph_view'], function (exports, ContainerView, metamorph_view) {
+enifed('ember-routing-views/views/outlet', ['exports', 'ember-views/views/container_view', 'ember-views/views/metamorph_view', 'ember-metal/property_get'], function (exports, ContainerView, metamorph_view, property_get) {
 
-	'use strict';
+  'use strict';
 
-	/**
-	@module ember
-	@submodule ember-routing-views
-	*/
+  /**
+  @module ember
+  @submodule ember-routing-views
+  */
+
+  var CoreOutletView = ContainerView['default'].extend({
+    init: function() {
+      this._super();
+      this._childOutlets = [];
+      this._outletState = null;
+    },
+
+    _isOutlet: true,
+
+    _parentOutlet: function() {
+      var parent = this._parentView;
+      while (parent && !parent._isOutlet) {
+        parent = parent._parentView;
+      }
+      return parent;
+    },
+
+    _linkParent: Ember.on('init', 'parentViewDidChange', function() {
+      var parent = this._parentOutlet();
+      if (parent) {
+        parent._childOutlets.push(this);
+        if (parent._outletState) {
+          this.setOutletState(parent._outletState.outlets[this._outletName]);
+        }
+      }
+    }),
+
+    willDestroy: function() {
+      var parent = this._parentOutlet();
+      if (parent) {
+        parent._childOutlets.removeObject(this);
+      }
+      this._super();
+    },
+
+
+    _diffState: function(state) {
+      while (state && emptyRouteState(state)) {
+        state = state.outlets.main;
+      }
+      var different = !sameRouteState(this._outletState, state);
+      this._outletState = state;
+      return different;
+    },
 
-	var OutletView = ContainerView['default'].extend(metamorph_view._Metamorph);
+    setOutletState: function(state) {
+      if (!this._diffState(state)) {
+        var children = this._childOutlets;
+        for (var i = 0 ; i < children.length; i++) {
+          var child = children[i];
+          child.setOutletState(this._outletState && this._outletState.outlets[child._outletName]);
+        }
+      } else {
+        var view = this._buildView(this._outletState);
+        var length = property_get.get(this, 'length');
+        if (view) {
+          this.replace(0, length, [view]);
+        } else {
+          this.replace(0, length , []);
+        }
+      }
+    },
+
+    _buildView: function(state) {
+      if (!state) { return; }
+
+      var LOG_VIEW_LOOKUPS = property_get.get(this, 'namespace.LOG_VIEW_LOOKUPS');
+      var view;
+      var render = state.render;
+      var ViewClass = render.ViewClass;
+      var isDefaultView = false;
+
+      if (!ViewClass) {
+        isDefaultView = true;
+        ViewClass = this.container.lookupFactory(this._isTopLevel ? 'view:toplevel' : 'view:default');
+      }
+
+      view = ViewClass.create({
+        _debugTemplateName: render.name,
+        renderedName: render.name,
+        controller: render.controller
+      });
+
+      if (!property_get.get(view, 'template')) {
+        view.set('template', render.template);
+      }
+
+      if (LOG_VIEW_LOOKUPS) {
+        Ember.Logger.info("Rendering " + render.name + " with " + (render.isDefaultView ? "default view " : "") + view, { fullName: 'view:' + render.name });
+      }
+
+      return view;
+    }
+  });
+
+  function emptyRouteState(state) {
+    return !state.render.ViewClass && !state.render.template;
+  }
+
+  function sameRouteState(a, b) {
+    if (!a && !b) {
+      return true;
+    }
+    if (!a || !b) {
+      return false;
+    }
+    a = a.render;
+    b = b.render;
+    for (var key in a) {
+      if (a.hasOwnProperty(key)) {
+        // name is only here for logging & debugging. If two different
+        // names result in otherwise identical states, they're still
+        // identical.
+        if (a[key] !== b[key] && key !== 'name') {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
 
-	exports.OutletView = OutletView;
+  var OutletView = CoreOutletView.extend(metamorph_view._Metamorph);
+
+  exports.CoreOutletView = CoreOutletView;
+  exports.OutletView = OutletView;
 
 });
-enifed('ember-routing', ['exports', 'ember-metal/core', 'ember-routing/ext/run_loop', 'ember-routing/ext/controller', 'ember-routing/ext/view', 'ember-routing/location/api', 'ember-routing/location/none_location', 'ember-routing/location/hash_location', 'ember-routing/location/history_location', 'ember-routing/location/auto_location', 'ember-routing/system/generate_controller', 'ember-routing/system/controller_for', 'ember-routing/system/dsl', 'ember-routing/system/router', 'ember-routing/system/route'], function (exports, Ember, __dep1__, __dep2__, __dep3__, EmberLocation, NoneLocation, HashLocation, HistoryLocation, AutoLocation, generate_controller, controllerFor, RouterDSL, Router, Route) {
+enifed('ember-routing', ['exports', 'ember-metal/core', 'ember-routing/ext/run_loop', 'ember-routing/ext/controller', 'ember-routing/location/api', 'ember-routing/location/none_location', 'ember-routing/location/hash_location', 'ember-routing/location/history_location', 'ember-routing/location/auto_location', 'ember-routing/system/generate_controller', 'ember-routing/system/controller_for', 'ember-routing/system/dsl', 'ember-routing/system/router', 'ember-routing/system/route'], function (exports, Ember, __dep1__, __dep2__, EmberLocation, NoneLocation, HashLocation, HistoryLocation, AutoLocation, generate_controller, controllerFor, RouterDSL, Router, Route) {
 
   'use strict';
 
@@ -19894,157 +19911,6 @@ enifed('ember-routing/ext/run_loop', ['ember-metal/run_loop'], function (run) {
 
 	run['default']._addQueue('routerTransitions', 'actions');
 
-});
-enifed('ember-routing/ext/view', ['exports', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-metal/run_loop', 'ember-views/views/view'], function (exports, property_get, property_set, run, EmberView) {
-
-  'use strict';
-
-  EmberView['default'].reopen({
-
-    /**
-      Sets the private `_outlets` object on the view.
-
-      @method init
-     */
-    init: function() {
-      this._outlets = {};
-      this._super.apply(this, arguments);
-    },
-
-    /**
-      Manually fill any of a view's `{{outlet}}` areas with the
-      supplied view.
-
-      Example
-
-      ```javascript
-      var MyView = Ember.View.extend({
-        template: Ember.Handlebars.compile('Child view: {{outlet "main"}} ')
-      });
-      var myView = MyView.create();
-      myView.appendTo('body');
-      // The html for myView now looks like:
-      // <div id="ember228" class="ember-view">Child view: </div>
-
-      var FooView = Ember.View.extend({
-        template: Ember.Handlebars.compile('<h1>Foo</h1> ')
-      });
-      var fooView = FooView.create();
-      myView.connectOutlet('main', fooView);
-      // The html for myView now looks like:
-      // <div id="ember228" class="ember-view">Child view:
-      //   <div id="ember234" class="ember-view"><h1>Foo</h1> </div>
-      // </div>
-      ```
-      @method connectOutlet
-      @param  {String} outletName A unique name for the outlet
-      @param  {Object} view       An Ember.View
-     */
-    connectOutlet: function(outletName, view) {
-      if (this._pendingDisconnections) {
-        delete this._pendingDisconnections[outletName];
-      }
-
-      if (this._hasEquivalentView(outletName, view)) {
-        view.destroy();
-        return;
-      }
-
-      var outlets = property_get.get(this, '_outlets');
-      var container = property_get.get(this, 'container');
-      var router = container && container.lookup('router:main');
-      var renderedName = property_get.get(view, 'renderedName');
-
-      property_set.set(outlets, outletName, view);
-
-      if (router && renderedName) {
-        router._connectActiveView(renderedName, view);
-      }
-    },
-
-    /**
-      Determines if the view has already been created by checking if
-      the view has the same constructor, template, and context as the
-      view in the `_outlets` object.
-
-      @private
-      @method _hasEquivalentView
-      @param  {String} outletName The name of the outlet we are checking
-      @param  {Object} view       An Ember.View
-      @return {Boolean}
-     */
-    _hasEquivalentView: function(outletName, view) {
-      var existingView = property_get.get(this, '_outlets.'+outletName);
-      return existingView &&
-        existingView.constructor === view.constructor &&
-        existingView.get('template') === view.get('template') &&
-        existingView.get('context') === view.get('context');
-    },
-
-    /**
-      Removes an outlet from the view.
-
-      Example
-
-      ```javascript
-      var MyView = Ember.View.extend({
-        template: Ember.Handlebars.compile('Child view: {{outlet "main"}} ')
-      });
-      var myView = MyView.create();
-      myView.appendTo('body');
-      // myView's html:
-      // <div id="ember228" class="ember-view">Child view: </div>
-
-      var FooView = Ember.View.extend({
-        template: Ember.Handlebars.compile('<h1>Foo</h1> ')
-      });
-      var fooView = FooView.create();
-      myView.connectOutlet('main', fooView);
-      // myView's html:
-      // <div id="ember228" class="ember-view">Child view:
-      //   <div id="ember234" class="ember-view"><h1>Foo</h1> </div>
-      // </div>
-
-      myView.disconnectOutlet('main');
-      // myView's html:
-      // <div id="ember228" class="ember-view">Child view: </div>
-      ```
-
-      @method disconnectOutlet
-      @param  {String} outletName The name of the outlet to be removed
-     */
-    disconnectOutlet: function(outletName) {
-      if (!this._pendingDisconnections) {
-        this._pendingDisconnections = {};
-      }
-      this._pendingDisconnections[outletName] = true;
-      run['default'].once(this, '_finishDisconnections');
-    },
-
-    /**
-      Gets an outlet that is pending disconnection and then
-      nullifies the object on the `_outlet` object.
-
-      @private
-      @method _finishDisconnections
-     */
-    _finishDisconnections: function() {
-      if (this.isDestroyed) {
-        return; // _outlets will be gone anyway
-      }
-
-      var outlets = property_get.get(this, '_outlets');
-      var pendingDisconnections = this._pendingDisconnections;
-      this._pendingDisconnections = null;
-
-      for (var outletName in pendingDisconnections) {
-        property_set.set(outlets, outletName, null);
-      }
-    }
-  });
-
-  exports['default'] = EmberView['default'];
-
 });
 enifed('ember-routing/location/api', ['exports', 'ember-metal/core', 'ember-metal/environment'], function (exports, Ember, environment) {
 
@@ -21532,6 +21398,7 @@ enifed('ember-routing/system/route', ['exports', 'ember-metal/core', 'ember-meta
       @method enter
     */
     enter: function() {
+      this.connections = [];
       this.activate();
       this.trigger('activate');
     },
@@ -22937,6 +22804,7 @@ enifed('ember-routing/system/route', ['exports', 'ember-metal/core', 'ember-meta
       Ember['default'].assert("The name in the given arguments is undefined", arguments.length > 0 ? !isNone['default'](arguments[0]) : true);
 
       var namePassed = typeof _name === 'string' && !!_name;
+      var isDefaultRender = arguments.length === 0 || Ember['default'].isEmpty(arguments[0]);
       var name;
 
       if (typeof _name === 'object' && !options) {
@@ -22946,53 +22814,9 @@ enifed('ember-routing/system/route', ['exports', 'ember-metal/core', 'ember-meta
         name = _name;
       }
 
-      var templateName;
-
-      if (name) {
-        name = name.replace(/\//g, '.');
-        templateName = name;
-      } else {
-        name = this.routeName;
-        templateName = this.templateName || name;
-      }
-
-      var renderOptions = buildRenderOptions(this, namePassed, name, options);
-
-      var LOG_VIEW_LOOKUPS = property_get.get(this.router, 'namespace.LOG_VIEW_LOOKUPS');
-      var viewName = options && options.view || namePassed && name || this.viewName || name;
-      var view, template;
-
-      var ViewClass = this.container.lookupFactory('view:' + viewName);
-      if (ViewClass) {
-        view = setupView(ViewClass, renderOptions);
-        if (!property_get.get(view, 'template')) {
-          view.set('template', this.container.lookup('template:' + templateName));
-        }
-        if (LOG_VIEW_LOOKUPS) {
-          Ember['default'].Logger.info("Rendering " + renderOptions.name + " with " + view, { fullName: 'view:' + renderOptions.name });
-        }
-      } else {
-        template = this.container.lookup('template:' + templateName);
-        if (!template) {
-          Ember['default'].assert("Could not find \"" + name + "\" template or view.", arguments.length === 0 || Ember['default'].isEmpty(arguments[0]));
-          if (LOG_VIEW_LOOKUPS) {
-            Ember['default'].Logger.info("Could not find \"" + name + "\" template or view. Nothing will be rendered", { fullName: 'template:' + name });
-          }
-          return;
-        }
-        var defaultView = renderOptions.into ? 'view:default' : 'view:toplevel';
-        ViewClass = this.container.lookupFactory(defaultView);
-        view = setupView(ViewClass, renderOptions);
-        if (!property_get.get(view, 'template')) {
-          view.set('template', template);
-        }
-        if (LOG_VIEW_LOOKUPS) {
-          Ember['default'].Logger.info("Rendering " + renderOptions.name + " with default view " + view, { fullName: 'view:' + renderOptions.name });
-        }
-      }
-
-      if (renderOptions.outlet === 'main') { this.lastRenderedTemplate = name; }
-      appendView(this, view, renderOptions);
+      var renderOptions = buildRenderOptions(this, namePassed, isDefaultRender, name, options);
+      this.connections.push(renderOptions);
+      run['default'].once(this.router, '_setOutlets');
     },
 
     /**
@@ -23039,16 +22863,31 @@ enifed('ember-routing/system/route', ['exports', 'ember-metal/core', 'ember-meta
       @param {Object|String} options the options hash or outlet name
     */
     disconnectOutlet: function(options) {
+      var outletName;
+      var parentView;
+      var parent;
       if (!options || typeof options === "string") {
-        var outletName = options;
-        options = {};
-        options.outlet = outletName;
+        outletName = options;
+      } else {
+        outletName = options.outlet;
+        parentView = options.parentView;
+      }
+
+      parentView = parentView && parentView.replace(/\//g, '.');
+      parent = parentRoute(this);
+      if (parent && parentView === parent.routeName) {
+        parentView = undefined;
       }
-      options.parentView = options.parentView ? options.parentView.replace(/\//g, '.') : parentTemplate(this);
-      options.outlet = options.outlet || 'main';
+      outletName = outletName || 'main';
 
-      var parentView = this.router._lookupActiveView(options.parentView);
-      if (parentView) { parentView.disconnectOutlet(options.outlet); }
+      for (var i = 0; i < this.connections.length; i++) {
+        var connection = this.connections[i];
+        if (connection.outlet === outletName && connection.into === parentView) {
+          this.connections.splice(i, 1);
+          run['default'].once(this.router, '_setOutlets');
+          return;
+        }
+      }
     },
 
     willDestroy: function() {
@@ -23061,18 +22900,10 @@ enifed('ember-routing/system/route', ['exports', 'ember-metal/core', 'ember-meta
       @method teardownViews
     */
     teardownViews: function() {
-      // Tear down the top level view
-      if (this.teardownTopLevelView) { this.teardownTopLevelView(); }
-
-      // Tear down any outlets rendered with 'into'
-      var teardownOutletViews = this.teardownOutletViews || [];
-      enumerable_utils.forEach(teardownOutletViews, function(teardownOutletView) {
-        teardownOutletView();
-      });
-
-      delete this.teardownTopLevelView;
-      delete this.teardownOutletViews;
-      delete this.lastRenderedTemplate;
+      if (this.connections && this.connections.length > 0) {
+        this.connections = [];
+        run['default'].once(this.router, '_setOutlets');
+      }
     }
   });
 
@@ -23098,21 +22929,23 @@ enifed('ember-routing/system/route', ['exports', 'ember-metal/core', 'ember-meta
     }
   }
 
-  function parentTemplate(route) {
-    var parent = parentRoute(route);
+  function buildRenderOptions(route, namePassed, isDefaultRender, name, options) {
+    var controller = options && options.controller;
+    var templateName;
+    var viewName;
+    var ViewClass;
     var template;
+    var LOG_VIEW_LOOKUPS = property_get.get(route.router, 'namespace.LOG_VIEW_LOOKUPS');
+    var into = options && options.into && options.into.replace(/\//g, '.');
+    var outlet = (options && options.outlet) || 'main';
 
-    if (!parent) { return; }
-
-    if (template = parent.lastRenderedTemplate) {
-      return template;
+    if (name) {
+      name = name.replace(/\//g, '.');
+      templateName = name;
     } else {
-      return parentTemplate(parent);
+      name = route.routeName;
+      templateName = route.templateName || name;
     }
-  }
-
-  function buildRenderOptions(route, namePassed, name, options) {
-    var controller = options && options.controller;
 
     if (!controller) {
       if (namePassed) {
@@ -23134,55 +22967,33 @@ enifed('ember-routing/system/route', ['exports', 'ember-metal/core', 'ember-meta
       controller.set('model', options.model);
     }
 
-    var renderOptions = {
-      into: options && options.into ? options.into.replace(/\//g, '.') : parentTemplate(route),
-      outlet: (options && options.outlet) || 'main',
-      name: name,
-      controller: controller
-    };
-
-    Ember['default'].assert("An outlet ("+renderOptions.outlet+") was specified but was not found.", renderOptions.outlet === 'main' || renderOptions.into);
-
-    return renderOptions;
-  }
-
-  function setupView(ViewClass, options) {
-    return ViewClass.create({
-      _debugTemplateName: options.name,
-      renderedName: options.name,
-      controller: options.controller
-    });
-  }
-
-  function appendView(route, view, options) {
-    if (options.into) {
-      var parentView = route.router._lookupActiveView(options.into);
-      var teardownOutletView = generateOutletTeardown(parentView, options.outlet);
-      if (!route.teardownOutletViews) { route.teardownOutletViews = []; }
-      enumerable_utils.replace(route.teardownOutletViews, 0, 0, [teardownOutletView]);
-      parentView.connectOutlet(options.outlet, view);
-    } else {
-      // tear down view if one is already rendered
-      if (route.teardownTopLevelView) {
-        route.teardownTopLevelView();
+    viewName = options && options.view || namePassed && name || route.viewName || name;
+    ViewClass = route.container.lookupFactory('view:' + viewName);
+    template = route.container.lookup('template:' + templateName);
+    if (!ViewClass && !template) {
+      Ember['default'].assert("Could not find \"" + name + "\" template or view.", isDefaultRender);
+      if (LOG_VIEW_LOOKUPS) {
+        Ember['default'].Logger.info("Could not find \"" + name + "\" template or view. Nothing will be rendered", { fullName: 'template:' + name });
       }
+    }
 
-      route.router._connectActiveView(options.name, view);
-      route.teardownTopLevelView = function() { view.destroy(); };
+    Ember['default'].assert("An outlet ("+outlet+") was specified but was not found.", outlet === 'main' || into);
 
-      // Notify the application instance that we have created the root-most
-      // view. It is the responsibility of the instance to tell the root view
-      // how to render, typically by appending it to the application's
-      // `rootElement`.
-      var instance = route.container.lookup('-application-instance:main');
-      instance.didCreateRootView(view);
+    var parent;
+    if (into && (parent = parentRoute(route)) && into === parentRoute(route).routeName) {
+      into = undefined;
     }
-  }
 
-  function generateOutletTeardown(parentView, outlet) {
-    return function() {
-      parentView.disconnectOutlet(outlet);
+    var renderOptions = {
+      into: into,
+      outlet: outlet,
+      name: name,
+      controller: controller,
+      ViewClass: ViewClass,
+      template: template
     };
+
+    return renderOptions;
   }
 
   function getFullQueryParams(router, state) {
@@ -23395,6 +23206,38 @@ enifed('ember-routing/system/router', ['exports', 'ember-metal/core', 'ember-met
       }
     },
 
+    _setOutlets: function() {
+      var handlerInfos = this.router.currentHandlerInfos;
+      var route;
+      var defaultParentState;
+      var liveRoutes = null;
+
+      if (!handlerInfos) {
+        return;
+      }
+
+      for (var i = 0; i < handlerInfos.length; i++) {
+        route = handlerInfos[i].handler;
+        var connections = normalizedConnections(route);
+        var ownState;
+        for (var j = 0; j < connections.length; j++) {
+          var appended = appendLiveRoute(liveRoutes, defaultParentState, connections[j]);
+          liveRoutes = appended.liveRoutes;
+          if (appended.ownState.render.name === route.routeName) {
+            ownState = appended.ownState;
+          }
+        }
+        defaultParentState = ownState;
+      }
+      if (!this._toplevelView) {
+        var OutletView = this.container.lookupFactory('view:-outlet');
+        this._toplevelView = OutletView.create({ _isTopLevel: true });
+        var instance = this.container.lookup('-application-instance:main');
+        instance.didCreateRootView(this._toplevelView);
+      }
+      this._toplevelView.setOutletState(liveRoutes);
+    },
+
     /**
       Handles notifying any listeners of an impending URL
       change.
@@ -23523,6 +23366,10 @@ enifed('ember-routing/system/router', ['exports', 'ember-metal/core', 'ember-met
     },
 
     willDestroy: function() {
+      if (this._toplevelView) {
+        this._toplevelView.destroy();
+        this._toplevelView = null;
+      }
       this._super.apply(this, arguments);
       this.reset();
     },
@@ -24156,6 +24003,74 @@ enifed('ember-routing/system/router', ['exports', 'ember-metal/core', 'ember-met
     }
   }
 
+  function findLiveRoute(liveRoutes, name) {
+    if (!liveRoutes) { return; }
+    var stack = [liveRoutes];
+    while (stack.length > 0) {
+      var test = stack.shift();
+      if (test.render.name === name) {
+        return test;
+      }
+      var outlets = test.outlets;
+      for (var outletName in outlets) {
+        stack.push(outlets[outletName]);
+      }
+    }
+  }
+
+  function appendLiveRoute(liveRoutes, defaultParentState, renderOptions) {
+    var target;
+    var myState = {
+      render: renderOptions,
+      outlets: create['default'](null)
+    };
+    if (renderOptions.into) {
+      target = findLiveRoute(liveRoutes, renderOptions.into);
+    } else {
+      target = defaultParentState;
+    }
+    if (target) {
+      property_set.set(target.outlets, renderOptions.outlet, myState);
+    } else {
+      Ember['default'].assert("You attempted to render into '" + renderOptions.into + "' but it was not found", !renderOptions.into);
+      liveRoutes = myState;
+    }
+    return {
+      liveRoutes: liveRoutes,
+      ownState: myState
+    };
+  }
+
+  function normalizedConnections(route) {
+    var connections = route.connections;
+    var mainConnections = [];
+    var otherConnections = [];
+
+    for (var i = 0; i < connections.length; i++) {
+      var connection = connections[i];
+      if (connection.outlet === 'main') {
+        mainConnections.push(connection);
+      } else {
+        otherConnections.push(connection);
+      }
+    }
+
+    if (mainConnections.length === 0) {
+      // There's always an entry to represent the route, even if it
+      // doesn't actually render anything into its own
+      // template. This gives other routes a place to target.
+      mainConnections.push({
+        name: route.routeName,
+        outlet: 'main'
+      });
+    }
+
+    // We process main connections first, because a main connection may
+    // be targeted by other connections.
+    return mainConnections.concat(otherConnections);
+  }
+
+
   exports['default'] = EmberRouter;
 
 });
@@ -28632,7 +28547,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
 
     /**
       Returns an array with all of the items in the enumeration where the passed
-      function returns false for. This method is the inverse of filter().
+      function returns true. This method is the inverse of filter().
 
       The callback method you provide should have the following signature (all
       parameters are optional):
@@ -34237,7 +34152,7 @@ enifed('ember-template-compiler/compat', ['ember-metal/core', 'ember-template-co
 	EmberHandlebars.template = template['default'];
 
 });
-enifed('ember-template-compiler/compat/precompile', ['exports'], function (exports) {
+enifed('ember-template-compiler/compat/precompile', ['exports', 'ember-template-compiler/system/compile_options'], function (exports, compileOptions) {
 
   'use strict';
 
@@ -34245,7 +34160,6 @@ enifed('ember-template-compiler/compat/precompile', ['exports'], function (expor
   @module ember
   @submodule ember-template-compiler
   */
-
   var compile, compileSpec;
 
   exports['default'] = function(string) {
@@ -34263,7 +34177,7 @@ enifed('ember-template-compiler/compat/precompile', ['exports'], function (expor
     var asObject = arguments[1] === undefined ? true : arguments[1];
     var compileFunc = asObject ? compile : compileSpec;
 
-    return compileFunc(string);
+    return compileFunc(string, compileOptions['default']());
   }
 
 });
@@ -34486,11 +34400,10 @@ enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-meta
 
   exports['default'] = function() {
     var disableComponentGeneration = true;
-    if (Ember['default'].FEATURES.isEnabled('ember-htmlbars-component-generation')) {
-      disableComponentGeneration = false;
-    }
-
+    
     return {
+      revision: 'Ember@1.11.0-beta.2',
+
       disableComponentGeneration: disableComponentGeneration,
 
       plugins: plugins['default']
@@ -34920,44 +34833,7 @@ enifed('ember-testing/helpers', ['ember-metal/core', 'ember-metal/property_get',
   */
   asyncHelper('click', click);
 
-  if (Ember['default'].FEATURES.isEnabled('ember-testing-checkbox-helpers')) {
-    /**
-    * Checks a checkbox. Ensures the presence of the `checked` attribute
-    *
-    * Example:
-    *
-    * ```javascript
-    * check('#remember-me').then(function() {
-    *   // assert something
-    * });
-    * ```
-    *
-    * @method check
-    * @param {String} selector jQuery selector finding an `input[type="checkbox"]`
-    * element on the DOM to check
-    * @return {RSVP.Promise}
-    */
-    asyncHelper('check', check);
-
-    /**
-    * Unchecks a checkbox. Ensures the absence of the `checked` attribute
-    *
-    * Example:
-    *
-    * ```javascript
-    * uncheck('#remember-me').then(function() {
-    *   // assert something
-    * });
-    * ```
-    *
-    * @method check
-    * @param {String} selector jQuery selector finding an `input[type="checkbox"]`
-    * element on the DOM to uncheck
-    * @return {RSVP.Promise}
-    */
-    asyncHelper('uncheck', uncheck);
-  }
-  /**
+    /**
   * Simulates a key event, e.g. `keypress`, `keydown`, `keyup` with the desired keyCode
   *
   * Example:
@@ -35960,7 +35836,11 @@ enifed('ember-views/attr_nodes/legacy_bind', ['exports', './attr_node', 'ember-r
     }
     var value = streams__utils.read(this.attrValue);
 
-    if (this.attrName === 'value' && (value === null || value === undefined)) {
+    if (value === undefined) {
+      value = null;
+    }
+
+    if (this.attrName === 'value' && value === null) {
       value = '';
     }
 
@@ -36007,6 +35887,285 @@ enifed('ember-views/component_lookup', ['exports', 'ember-runtime/system/object'
     }
   });
 
+});
+enifed('ember-views/mixins/attribute_bindings_support', ['exports', 'ember-metal/mixin', 'ember-views/attr_nodes/attr_node', 'ember-metal/properties', 'ember-views/system/platform', 'ember-metal/streams/utils', 'ember-metal/property_set'], function (exports, mixin, AttrNode, properties, platform, utils, property_set) {
+
+  'use strict';
+
+  var EMPTY_ARRAY = [];
+
+  var AttributeBindingsSupport = mixin.Mixin.create({
+    concatenatedProperties: ['attributeBindings'],
+
+    /**
+      A list of properties of the view to apply as attributes. If the property is
+      a string value, the value of that string will be applied as the attribute.
+
+      ```javascript
+      // Applies the type attribute to the element
+      // with the value "button", like <div type="button">
+      Ember.View.extend({
+        attributeBindings: ['type'],
+        type: 'button'
+      });
+      ```
+
+      If the value of the property is a Boolean, the name of that property is
+      added as an attribute.
+
+      ```javascript
+      // Renders something like <div enabled="enabled">
+      Ember.View.extend({
+        attributeBindings: ['enabled'],
+        enabled: true
+      });
+      ```
+
+      @property attributeBindings
+    */
+    attributeBindings: EMPTY_ARRAY,
+
+    _unspecifiedAttributeBindings: null,
+
+    /**
+      Iterates through the view's attribute bindings, sets up observers for each,
+      then applies the current value of the attributes to the passed render buffer.
+
+      @method _applyAttributeBindings
+      @param {Ember.RenderBuffer} buffer
+      @param {Array} attributeBindings
+      @private
+    */
+    _applyAttributeBindings: function(buffer) {
+      var attributeBindings = this.attributeBindings;
+
+      if (!attributeBindings || !attributeBindings.length) { return; }
+
+      var unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
+
+      var binding, colonIndex, property, attrName, attrNode, attrValue;
+      var i, l;
+      for (i=0, l=attributeBindings.length; i<l; i++) {
+        binding = attributeBindings[i];
+        colonIndex = binding.indexOf(':');
+        if (colonIndex === -1) {
+          property = binding;
+          attrName = binding;
+        } else {
+          property = binding.substring(0, colonIndex);
+          attrName = binding.substring(colonIndex + 1);
+        }
+
+        Ember.assert('You cannot use class as an attributeBinding, use classNameBindings instead.', attrName !== 'class');
+
+        if (property in this) {
+          attrValue = this.getStream('view.'+property);
+          attrNode = new AttrNode['default'](attrName, attrValue);
+          this.appendAttr(attrNode);
+          if (!platform.canSetNameOnInputs && attrName === 'name') {
+            buffer.attr('name', utils.read(attrValue));
+          }
+        } else {
+          unspecifiedAttributeBindings[property] = attrName;
+        }
+      }
+
+      // Lazily setup setUnknownProperty after attributeBindings are initially applied
+      this.setUnknownProperty = this._setUnknownProperty;
+    },
+
+    /**
+      We're using setUnknownProperty as a hook to setup attributeBinding observers for
+      properties that aren't defined on a view at initialization time.
+
+      Note: setUnknownProperty will only be called once for each property.
+
+      @method setUnknownProperty
+      @param key
+      @param value
+      @private
+    */
+    setUnknownProperty: null, // Gets defined after initialization by _applyAttributeBindings
+
+    _setUnknownProperty: function(key, value) {
+      var attrName = this._unspecifiedAttributeBindings && this._unspecifiedAttributeBindings[key];
+
+      properties.defineProperty(this, key);
+
+      if (attrName) {
+        var attrValue = this.getStream('view.'+key);
+        var attrNode = new AttrNode['default'](attrName, attrValue);
+        this.appendAttr(attrNode);
+      }
+      return property_set.set(this, key, value);
+    }
+  });
+
+  exports['default'] = AttributeBindingsSupport;
+
+});
+enifed('ember-views/mixins/class_names_support', ['exports', 'ember-metal/core', 'ember-metal/mixin', 'ember-runtime/system/native_array', 'ember-metal/enumerable_utils', 'ember-metal/streams/utils', 'ember-views/streams/class_name_binding', 'ember-metal/utils'], function (exports, Ember, mixin, native_array, enumerable_utils, utils, class_name_binding, ember_metal__utils) {
+
+  'use strict';
+
+  var EMPTY_ARRAY = [];
+
+  var ClassNamesSupport = mixin.Mixin.create({
+    concatenatedProperties: ['classNames', 'classNameBindings'],
+
+    init: function() {
+      this._super.apply(this, arguments);
+
+      Ember['default'].assert("Only arrays are allowed for 'classNameBindings'", ember_metal__utils.typeOf(this.classNameBindings) === 'array');
+      this.classNameBindings = native_array.A(this.classNameBindings.slice());
+
+      Ember['default'].assert("Only arrays of static class strings are allowed for 'classNames'. For dynamic classes, use 'classNameBindings'.", ember_metal__utils.typeOf(this.classNames) === 'array');
+      this.classNames = native_array.A(this.classNames.slice());
+    },
+
+    /**
+      Standard CSS class names to apply to the view's outer element. This
+      property automatically inherits any class names defined by the view's
+      superclasses as well.
+
+      @property classNames
+      @type Array
+      @default ['ember-view']
+    */
+    classNames: ['ember-view'],
+
+    /**
+      A list of properties of the view to apply as class names. If the property
+      is a string value, the value of that string will be applied as a class
+      name.
+
+      ```javascript
+      // Applies the 'high' class to the view element
+      Ember.View.extend({
+        classNameBindings: ['priority']
+        priority: 'high'
+      });
+      ```
+
+      If the value of the property is a Boolean, the name of that property is
+      added as a dasherized class name.
+
+      ```javascript
+      // Applies the 'is-urgent' class to the view element
+      Ember.View.extend({
+        classNameBindings: ['isUrgent']
+        isUrgent: true
+      });
+      ```
+
+      If you would prefer to use a custom value instead of the dasherized
+      property name, you can pass a binding like this:
+
+      ```javascript
+      // Applies the 'urgent' class to the view element
+      Ember.View.extend({
+        classNameBindings: ['isUrgent:urgent']
+        isUrgent: true
+      });
+      ```
+
+      This list of properties is inherited from the view's superclasses as well.
+
+      @property classNameBindings
+      @type Array
+      @default []
+    */
+    classNameBindings: EMPTY_ARRAY,
+
+    /**
+      Iterates over the view's `classNameBindings` array, inserts the value
+      of the specified property into the `classNames` array, then creates an
+      observer to update the view's element if the bound property ever changes
+      in the future.
+
+      @method _applyClassNameBindings
+      @private
+    */
+    _applyClassNameBindings: function() {
+      var classBindings = this.classNameBindings;
+
+      if (!classBindings || !classBindings.length) { return; }
+
+      var classNames = this.classNames;
+      var elem, newClass, dasherizedClass;
+
+      // Loop through all of the configured bindings. These will be either
+      // property names ('isUrgent') or property paths relative to the view
+      // ('content.isUrgent')
+      enumerable_utils.forEach(classBindings, function(binding) {
+
+        var boundBinding;
+        if (utils.isStream(binding)) {
+          boundBinding = binding;
+        } else {
+          boundBinding = class_name_binding.streamifyClassNameBinding(this, binding, '_view.');
+        }
+
+        // Variable in which the old class value is saved. The observer function
+        // closes over this variable, so it knows which string to remove when
+        // the property changes.
+        var oldClass;
+
+        // Set up an observer on the context. If the property changes, toggle the
+        // class name.
+        var observer = this._wrapAsScheduled(function() {
+          // Get the current value of the property
+          elem = this.$();
+          newClass = utils.read(boundBinding);
+
+          // If we had previously added a class to the element, remove it.
+          if (oldClass) {
+            elem.removeClass(oldClass);
+            // Also remove from classNames so that if the view gets rerendered,
+            // the class doesn't get added back to the DOM.
+            classNames.removeObject(oldClass);
+          }
+
+          // If necessary, add a new class. Make sure we keep track of it so
+          // it can be removed in the future.
+          if (newClass) {
+            elem.addClass(newClass);
+            oldClass = newClass;
+          } else {
+            oldClass = null;
+          }
+        });
+
+        // Get the class name for the property at its current value
+        dasherizedClass = utils.read(boundBinding);
+
+        if (dasherizedClass) {
+          // Ensure that it gets into the classNames array
+          // so it is displayed when we render.
+          enumerable_utils.addObject(classNames, dasherizedClass);
+
+          // Save a reference to the class name so we can remove it
+          // if the observer fires. Remember that this variable has
+          // been closed over by the observer.
+          oldClass = dasherizedClass;
+        }
+
+        utils.subscribe(boundBinding, observer, this);
+        // Remove className so when the view is rerendered,
+        // the className is added based on binding reevaluation
+        this.one('willClearRender', function() {
+          if (oldClass) {
+            classNames.removeObject(oldClass);
+            oldClass = null;
+          }
+        });
+
+      }, this);
+    }
+  });
+
+  exports['default'] = ClassNamesSupport;
+
 });
 enifed('ember-views/mixins/component_template_deprecation', ['exports', 'ember-metal/core', 'ember-metal/property_get', 'ember-metal/mixin'], function (exports, Ember, property_get, mixin) {
 
@@ -36057,6 +36216,117 @@ enifed('ember-views/mixins/component_template_deprecation', ['exports', 'ember-m
     }
   });
 
+});
+enifed('ember-views/mixins/instrumentation_support', ['exports', 'ember-metal/mixin', 'ember-metal/computed', 'ember-metal/property_get'], function (exports, mixin, computed, property_get) {
+
+  'use strict';
+
+  var InstrumentationSupport = mixin.Mixin.create({
+    /**
+      Used to identify this view during debugging
+
+      @property instrumentDisplay
+      @type String
+    */
+    instrumentDisplay: computed.computed(function() {
+      if (this.helperName) {
+        return '{{' + this.helperName + '}}';
+      }
+    }),
+
+    instrumentName: 'view',
+
+    instrumentDetails: function(hash) {
+      hash.template = property_get.get(this, 'templateName');
+      this._super(hash);
+    }
+  });
+
+  exports['default'] = InstrumentationSupport;
+
+});
+enifed('ember-views/mixins/legacy_view_support', ['exports', 'ember-metal/core', 'ember-metal/mixin', 'ember-metal/property_get'], function (exports, Ember, mixin, property_get) {
+
+  'use strict';
+
+  var LegacyViewSupport = mixin.Mixin.create({
+    beforeRender: function(buffer) {},
+
+    afterRender: function(buffer) {},
+
+    mutateChildViews: function(callback) {
+      var childViews = this._childViews;
+      var idx = childViews.length;
+      var view;
+
+      while (--idx >= 0) {
+        view = childViews[idx];
+        callback(this, view, idx);
+      }
+
+      return this;
+    },
+
+    /**
+      Removes all children from the `parentView`.
+
+      @method removeAllChildren
+      @return {Ember.View} receiver
+    */
+    removeAllChildren: function() {
+      return this.mutateChildViews(function(parentView, view) {
+        parentView.removeChild(view);
+      });
+    },
+
+    destroyAllChildren: function() {
+      return this.mutateChildViews(function(parentView, view) {
+        view.destroy();
+      });
+    },
+
+    /**
+      Return the nearest ancestor whose parent is an instance of
+      `klass`.
+
+      @method nearestChildOf
+      @param {Class} klass Subclass of Ember.View (or Ember.View itself)
+      @return Ember.View
+      @deprecated
+    */
+    nearestChildOf: function(klass) {
+      Ember['default'].deprecate("nearestChildOf has been deprecated.");
+
+      var view = property_get.get(this, 'parentView');
+
+      while (view) {
+        if (property_get.get(view, 'parentView') instanceof klass) { return view; }
+        view = property_get.get(view, 'parentView');
+      }
+    },
+
+    /**
+      Return the nearest ancestor that is an instance of the provided
+      class.
+
+      @method nearestInstanceOf
+      @param {Class} klass Subclass of Ember.View (or Ember.View itself)
+      @return Ember.View
+      @deprecated
+    */
+    nearestInstanceOf: function(klass) {
+      Ember['default'].deprecate("nearestInstanceOf is deprecated and will be removed from future releases. Use nearestOfType.");
+      var view = property_get.get(this, 'parentView');
+
+      while (view) {
+        if (view instanceof klass) { return view; }
+        view = property_get.get(view, 'parentView');
+      }
+    }
+  });
+
+  exports['default'] = LegacyViewSupport;
+
 });
 enifed('ember-views/mixins/normalized_rerender_if_needed', ['exports', 'ember-metal/property_get', 'ember-metal/mixin', 'ember-metal/merge', 'ember-views/views/states'], function (exports, property_get, mixin, merge, views__states) {
 
@@ -36095,6 +36365,43 @@ enifed('ember-views/mixins/normalized_rerender_if_needed', ['exports', 'ember-me
     }
   });
 
+});
+enifed('ember-views/mixins/template_rendering_support', ['exports', 'ember-metal/mixin', 'ember-metal/property_get'], function (exports, mixin, property_get) {
+
+  'use strict';
+
+  var _renderView;
+  function renderView(view, buffer, template) {
+    if (_renderView === undefined) {
+      _renderView = eriuqer('ember-htmlbars/system/render-view')['default'];
+    }
+    _renderView(view, buffer, template);
+  }
+
+  var TemplateRenderingSupport = mixin.Mixin.create({
+    /**
+      Called on your view when it should push strings of HTML into a
+      `Ember.RenderBuffer`. Most users will want to override the `template`
+      or `templateName` properties instead of this method.
+
+      By default, `Ember.View` will look for a function in the `template`
+      property and invoke it with the value of `context`. The value of
+      `context` will be the view's controller unless you override it.
+
+      @method render
+      @param {Ember.RenderBuffer} buffer The render buffer
+    */
+    render: function(buffer) {
+      // If this view has a layout, it is the responsibility of the
+      // the layout to render the view's template. Otherwise, render the template
+      // directly.
+      var template = property_get.get(this, 'layout') || property_get.get(this, 'template');
+      renderView(this, buffer, template);
+    }
+  });
+
+  exports['default'] = TemplateRenderingSupport;
+
 });
 enifed('ember-views/mixins/text_support', ['exports', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-metal/mixin', 'ember-runtime/mixins/target_action_support'], function (exports, property_get, property_set, mixin, TargetActionSupport) {
 
@@ -36343,6 +36650,394 @@ enifed('ember-views/mixins/text_support', ['exports', 'ember-metal/property_get'
 
   exports['default'] = TextSupport;
 
+});
+enifed('ember-views/mixins/view_child_views_support', ['exports', 'ember-metal/core', 'ember-metal/mixin', 'ember-metal/computed', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-metal/set_properties', 'ember-metal/error', 'ember-metal/enumerable_utils', 'ember-runtime/system/native_array'], function (exports, Ember, mixin, computed, property_get, property_set, setProperties, EmberError, enumerable_utils, native_array) {
+
+  'use strict';
+
+  var childViewsProperty = computed.computed(function() {
+    var childViews = this._childViews;
+    var ret = native_array.A();
+
+    enumerable_utils.forEach(childViews, function(view) {
+      var currentChildViews;
+      if (view.isVirtual) {
+        if (currentChildViews = property_get.get(view, 'childViews')) {
+          ret.pushObjects(currentChildViews);
+        }
+      } else {
+        ret.push(view);
+      }
+    });
+
+    ret.replace = function (idx, removedCount, addedViews) {
+      throw new EmberError['default']("childViews is immutable");
+    };
+
+    return ret;
+  });
+
+  var EMPTY_ARRAY = [];
+
+  var ViewChildViewsSupport = mixin.Mixin.create({
+    /**
+      Array of child views. You should never edit this array directly.
+      Instead, use `appendChild` and `removeFromParent`.
+
+      @property childViews
+      @type Array
+      @default []
+      @private
+    */
+    childViews: childViewsProperty,
+
+    _childViews: EMPTY_ARRAY,
+
+    init: function() {
+      // setup child views. be sure to clone the child views array first
+      this._childViews = this._childViews.slice();
+
+      this._super.apply(this, arguments);
+    },
+
+    appendChild: function(view, options) {
+      return this.currentState.appendChild(this, view, options);
+    },
+
+    /**
+      Removes the child view from the parent view.
+
+      @method removeChild
+      @param {Ember.View} view
+      @return {Ember.View} receiver
+    */
+    removeChild: function(view) {
+      // If we're destroying, the entire subtree will be
+      // freed, and the DOM will be handled separately,
+      // so no need to mess with childViews.
+      if (this.isDestroying) { return; }
+
+      // update parent node
+      property_set.set(view, '_parentView', null);
+
+      // remove view from childViews array.
+      var childViews = this._childViews;
+
+      enumerable_utils.removeObject(childViews, view);
+
+      this.propertyDidChange('childViews'); // HUH?! what happened to will change?
+
+      return this;
+    },
+
+    /**
+      Instantiates a view to be added to the childViews array during view
+      initialization. You generally will not call this method directly unless
+      you are overriding `createChildViews()`. Note that this method will
+      automatically configure the correct settings on the new view instance to
+      act as a child of the parent.
+
+      @method createChildView
+      @param {Class|String} viewClass
+      @param {Hash} [attrs] Attributes to add
+      @return {Ember.View} new instance
+    */
+    createChildView: function(maybeViewClass, _attrs) {
+      if (!maybeViewClass) {
+        throw new TypeError("createChildViews first argument must exist");
+      }
+
+      if (maybeViewClass.isView && maybeViewClass._parentView === this && maybeViewClass.container === this.container) {
+        return maybeViewClass;
+      }
+
+      var attrs = _attrs || {};
+      var view;
+      attrs._parentView = this;
+      attrs.renderer = this.renderer;
+
+      if (maybeViewClass.isViewClass) {
+        attrs.container = this.container;
+
+        view = maybeViewClass.create(attrs);
+
+        // don't set the property on a virtual view, as they are invisible to
+        // consumers of the view API
+        if (view.viewName) {
+          property_set.set(property_get.get(this, 'concreteView'), view.viewName, view);
+        }
+      } else if ('string' === typeof maybeViewClass) {
+        var fullName = 'view:' + maybeViewClass;
+        var ViewKlass = this.container.lookupFactory(fullName);
+
+        Ember['default'].assert("Could not find view: '" + fullName + "'", !!ViewKlass);
+
+        view = ViewKlass.create(attrs);
+      } else {
+        view = maybeViewClass;
+        Ember['default'].assert('You must pass instance or subclass of View', view.isView);
+
+        attrs.container = this.container;
+        setProperties['default'](view, attrs);
+      }
+
+      return view;
+    }
+  });
+
+  exports['default'] = ViewChildViewsSupport;
+
+  exports.childViewsProperty = childViewsProperty;
+
+});
+enifed('ember-views/mixins/view_context_support', ['exports', 'ember-metal/mixin', 'ember-metal/computed', 'ember-metal/property_get', 'ember-metal/property_set'], function (exports, mixin, computed, property_get, property_set) {
+
+  'use strict';
+
+  var ViewContextSupport = mixin.Mixin.create({
+    /**
+      The object from which templates should access properties.
+
+      This object will be passed to the template function each time the render
+      method is called, but it is up to the individual function to decide what
+      to do with it.
+
+      By default, this will be the view's controller.
+
+      @property context
+      @type Object
+    */
+    context: computed.computed(function(key, value) {
+      if (arguments.length === 2) {
+        property_set.set(this, '_context', value);
+        return value;
+      } else {
+        return property_get.get(this, '_context');
+      }
+    })["volatile"](),
+
+    /**
+      Private copy of the view's template context. This can be set directly
+      by Handlebars without triggering the observer that causes the view
+      to be re-rendered.
+
+      The context of a view is looked up as follows:
+
+      1. Supplied context (usually by Handlebars)
+      2. Specified controller
+      3. `parentView`'s context (for a child of a ContainerView)
+
+      The code in Handlebars that overrides the `_context` property first
+      checks to see whether the view has a specified controller. This is
+      something of a hack and should be revisited.
+
+      @property _context
+      @private
+    */
+    _context: computed.computed(function(key, value) {
+      if (arguments.length === 2) {
+        return value;
+      }
+
+      var parentView, controller;
+
+      if (controller = property_get.get(this, 'controller')) {
+        return controller;
+      }
+
+      parentView = this._parentView;
+      if (parentView) {
+        return property_get.get(parentView, '_context');
+      }
+
+      return null;
+    }),
+
+    _controller: null,
+
+    /**
+      The controller managing this view. If this property is set, it will be
+      made available for use by the template.
+
+      @property controller
+      @type Object
+    */
+    controller: computed.computed(function(key, value) {
+      if (arguments.length === 2) {
+        this._controller = value;
+        return value;
+      }
+
+      if (this._controller) {
+        return this._controller;
+      }
+
+      var parentView = this._parentView;
+      return parentView ? property_get.get(parentView, 'controller') : null;
+    })
+  });
+
+  exports['default'] = ViewContextSupport;
+
+});
+enifed('ember-views/mixins/view_keyword_support', ['exports', 'ember-metal/mixin', 'ember-metal/platform/create', 'ember-views/streams/key_stream'], function (exports, mixin, create, KeyStream) {
+
+  'use strict';
+
+  var ViewKeywordSupport = mixin.Mixin.create({
+    init: function() {
+      this._super.apply(this, arguments);
+
+      if (!this._keywords) {
+        this._keywords = create['default'](null);
+      }
+      this._keywords._view = this;
+      this._keywords.view = undefined;
+      this._keywords.controller = new KeyStream['default'](this, 'controller');
+      this._setupKeywords();
+    },
+
+    _setupKeywords: function() {
+      var keywords = this._keywords;
+      var contextView = this._contextView || this._parentView;
+
+      if (contextView) {
+        var parentKeywords = contextView._keywords;
+
+        keywords.view = this.isVirtual ? parentKeywords.view : this;
+
+        for (var name in parentKeywords) {
+          if (keywords[name]) {
+            continue;
+          }
+
+          keywords[name] = parentKeywords[name];
+        }
+      } else {
+        keywords.view = this.isVirtual ? null : this;
+      }
+    }
+  });
+
+  exports['default'] = ViewKeywordSupport;
+
+});
+enifed('ember-views/mixins/view_state_support', ['exports', 'ember-metal/core', 'ember-metal/mixin'], function (exports, Ember, mixin) {
+
+  'use strict';
+
+  var ViewStateSupport = mixin.Mixin.create({
+    transitionTo: function(state, children) {
+      Ember['default'].deprecate("Ember.View#transitionTo has been deprecated, it is for internal use only");
+      this._transitionTo(state, children);
+    },
+
+    _transitionTo: function(state, children) {
+      var priorState = this.currentState;
+      var currentState = this.currentState = this._states[state];
+      this._state = state;
+
+      if (priorState && priorState.exit) { priorState.exit(this); }
+      if (currentState.enter) { currentState.enter(this); }
+    }
+  });
+
+  exports['default'] = ViewStateSupport;
+
+});
+enifed('ember-views/mixins/view_stream_support', ['exports', 'ember-metal/mixin', 'ember-metal/streams/stream_binding', 'ember-views/streams/key_stream', 'ember-views/streams/context_stream', 'ember-metal/platform/create', 'ember-metal/streams/utils'], function (exports, mixin, StreamBinding, KeyStream, ContextStream, create, utils) {
+
+  'use strict';
+
+  var ViewStreamSupport = mixin.Mixin.create({
+    init: function() {
+      this._baseContext = undefined;
+      this._contextStream = undefined;
+      this._streamBindings = undefined;
+      this._super.apply(this, arguments);
+    },
+
+    getStream: function(path) {
+      var stream = this._getContextStream().get(path);
+
+      stream._label = path;
+
+      return stream;
+    },
+
+    _willDestroyElement: function() {
+      if (this._streamBindings) {
+        this._destroyStreamBindings();
+      }
+      if (this._contextStream) {
+        this._destroyContextStream();
+      }
+    },
+
+    _getBindingForStream: function(pathOrStream) {
+      if (this._streamBindings === undefined) {
+        this._streamBindings = create['default'](null);
+      }
+
+      var path = pathOrStream;
+      if (utils.isStream(pathOrStream)) {
+        path = pathOrStream._label;
+
+        if (!path) {
+          // if no _label is present on the provided stream
+          // it is likely a subexpr and cannot be set (so it
+          // does not need a StreamBinding)
+          return pathOrStream;
+        }
+      }
+
+      if (this._streamBindings[path] !== undefined) {
+        return this._streamBindings[path];
+      } else {
+        var stream = this._getContextStream().get(path);
+        var streamBinding = new StreamBinding['default'](stream);
+
+        streamBinding._label = path;
+
+        return this._streamBindings[path] = streamBinding;
+      }
+    },
+
+    _destroyStreamBindings: function() {
+      var streamBindings = this._streamBindings;
+      for (var path in streamBindings) {
+        streamBindings[path].destroy();
+      }
+      this._streamBindings = undefined;
+    },
+
+    _getContextStream: function() {
+      if (this._contextStream === undefined) {
+        this._baseContext = new KeyStream['default'](this, 'context');
+        this._contextStream = new ContextStream['default'](this);
+      }
+
+      return this._contextStream;
+    },
+
+    _destroyContextStream: function() {
+      this._baseContext.destroy();
+      this._baseContext = undefined;
+      this._contextStream.destroy();
+      this._contextStream = undefined;
+    },
+
+    _unsubscribeFromStreamBindings: function() {
+      for (var key in this._streamBindingSubscriptions) {
+        var streamBinding = this[key + 'Binding'];
+        var callback = this._streamBindingSubscriptions[key];
+        streamBinding.unsubscribe(callback);
+      }
+    }
+  });
+
+  exports['default'] = ViewStreamSupport;
+
 });
 enifed('ember-views/mixins/view_target_action_support', ['exports', 'ember-metal/mixin', 'ember-runtime/mixins/target_action_support', 'ember-metal/alias'], function (exports, mixin, TargetActionSupport, alias) {
 
@@ -36359,6 +37054,99 @@ enifed('ember-views/mixins/view_target_action_support', ['exports', 'ember-metal
     actionContext: alias['default']('context')
   });
 
+});
+enifed('ember-views/mixins/visibility_support', ['exports', 'ember-metal/mixin', 'ember-metal/property_get', 'ember-metal/run_loop'], function (exports, mixin, property_get, run) {
+
+  'use strict';
+
+  function K() { return this; }
+
+  var VisibilitySupport = mixin.Mixin.create({
+    /**
+      If `false`, the view will appear hidden in DOM.
+
+      @property isVisible
+      @type Boolean
+      @default null
+    */
+    isVisible: true,
+
+    becameVisible: K,
+    becameHidden: K,
+
+    /**
+      When the view's `isVisible` property changes, toggle the visibility
+      element of the actual DOM element.
+
+      @method _isVisibleDidChange
+      @private
+    */
+    _isVisibleDidChange: mixin.observer('isVisible', function() {
+      if (this._isVisible === property_get.get(this, 'isVisible')) { return ; }
+      run['default'].scheduleOnce('render', this, this._toggleVisibility);
+    }),
+
+    _toggleVisibility: function() {
+      var $el = this.$();
+      var isVisible = property_get.get(this, 'isVisible');
+
+      if (this._isVisible === isVisible) { return ; }
+
+      // It's important to keep these in sync, even if we don't yet have
+      // an element in the DOM to manipulate:
+      this._isVisible = isVisible;
+
+      if (!$el) { return; }
+
+      $el.toggle(isVisible);
+
+      if (this._isAncestorHidden()) { return; }
+
+      if (isVisible) {
+        this._notifyBecameVisible();
+      } else {
+        this._notifyBecameHidden();
+      }
+    },
+
+    _notifyBecameVisible: function() {
+      this.trigger('becameVisible');
+
+      this.forEachChildView(function(view) {
+        var isVisible = property_get.get(view, 'isVisible');
+
+        if (isVisible || isVisible === null) {
+          view._notifyBecameVisible();
+        }
+      });
+    },
+
+    _notifyBecameHidden: function() {
+      this.trigger('becameHidden');
+      this.forEachChildView(function(view) {
+        var isVisible = property_get.get(view, 'isVisible');
+
+        if (isVisible || isVisible === null) {
+          view._notifyBecameHidden();
+        }
+      });
+    },
+
+    _isAncestorHidden: function() {
+      var parent = property_get.get(this, 'parentView');
+
+      while (parent) {
+        if (property_get.get(parent, 'isVisible') === false) { return true; }
+
+        parent = property_get.get(parent, 'parentView');
+      }
+
+      return false;
+    }
+  });
+
+  exports['default'] = VisibilitySupport;
+
 });
 enifed('ember-views/streams/class_name_binding', ['exports', 'ember-metal/streams/utils', 'ember-metal/property_get', 'ember-runtime/system/string', 'ember-metal/utils'], function (exports, utils, property_get, string, ember_metal__utils) {
 
@@ -37598,11 +38386,8 @@ enifed('ember-views/system/render_buffer', ['exports', 'ember-views/system/jquer
       if (content.nodeType) {
         this._element.appendChild(content);
       } else {
-        var nodes;
-        nodes = this.dom.parseHTML(content, contextualElement);
-        while (nodes[0]) {
-          this._element.appendChild(nodes[0]);
-        }
+        var frag = this.dom.parseHTML(content, contextualElement);
+        this._element.appendChild(frag);
       }
 
       // This should only happen with legacy string buffers
@@ -37906,8 +38691,8 @@ enifed('ember-views/system/utils', ['exports'], function (exports) {
   */
   function getViewRange(view) {
     var range = document.createRange();
-    range.setStartAfter(view._morph.start);
-    range.setEndBefore(view._morph.end);
+    range.setStartBefore(view._morph.firstNode);
+    range.setEndAfter(view._morph.lastNode);
     return range;
   }
 
@@ -38960,7 +39745,7 @@ enifed('ember-views/views/container_view', ['exports', 'ember-metal/core', 'embe
         buffer._element = element;
         this._childViewsMorph = dom.appendMorph(element, this._morph.contextualElement);
       } else {
-        this._childViewsMorph = dom.createMorph(element, element.lastChild, null);
+        this._childViewsMorph = dom.appendMorph(element);
       }
 
       return element;
@@ -39083,12 +39868,13 @@ enifed('ember-views/views/container_view', ['exports', 'ember-metal/core', 'embe
       var childViews = view._childViews;
       var renderer = view._renderer;
 
-      var i, len, childView;
-      for (i = 0, len = childViews.length; i < len; i++) {
-        childView = childViews[i];
+      var refMorph = null;
+      for (var i = childViews.length-1; i >= 0; i--) {
+        var childView = childViews[i];
         if (!childView._elementCreated) {
-          renderer.renderTree(childView, view, i);
+          renderer.renderTree(childView, view, refMorph);
         }
+        refMorph = childView._morph;
       }
     }
   });
@@ -39379,6 +40165,7 @@ enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', '
 
   var selectOptionDefaultTemplate = {
     isHTMLBars: true,
+    revision: 'Ember@1.11.0-beta.2',
     render: function(context, env, contextualElement) {
       var lazyValue = context.getStream('view.label');
 
@@ -39958,7 +40745,7 @@ enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', '
       var content = property_get.get(this, 'contentValues');
       if (!el) { return; }
 
-      var selectionIndex = content.indexOf(selectionValue);
+      var selectionIndex = enumerable_utils.indexOf(content, selectionValue);
       var prompt = property_get.get(this, 'prompt');
 
       if (prompt) { selectionIndex += 1; }
@@ -40407,565 +41194,186 @@ enifed('ember-views/views/states/in_dom', ['exports', 'ember-metal/core', 'ember
 });
 enifed('ember-views/views/states/pre_render', ['exports', 'ember-views/views/states/default', 'ember-metal/platform/create'], function (exports, _default, create) {
 
-	'use strict';
-
-	var preRender = create['default'](_default['default']);
-
-	exports['default'] = preRender;
-
-});
-enifed('ember-views/views/text_area', ['exports', 'ember-metal/property_get', 'ember-views/views/component', 'ember-views/mixins/text_support', 'ember-metal/mixin'], function (exports, property_get, Component, TextSupport, mixin) {
-
-  'use strict';
-
-
-  /**
-  @module ember
-  @submodule ember-views
-  */
-  exports['default'] = Component['default'].extend(TextSupport['default'], {
-    instrumentDisplay: '{{textarea}}',
-
-    classNames: ['ember-text-area'],
-
-    tagName: "textarea",
-    attributeBindings: [
-      'rows',
-      'cols',
-      'name',
-      'selectionEnd',
-      'selectionStart',
-      'wrap',
-      'lang',
-      'dir'
-    ],
-    rows: null,
-    cols: null,
-
-    _updateElementValue: mixin.observer('value', function() {
-      // We do this check so cursor position doesn't get affected in IE
-      var value = property_get.get(this, 'value');
-      var $el = this.$();
-      if ($el && value !== $el.val()) {
-        $el.val(value);
-      }
-    }),
-
-    init: function() {
-      this._super.apply(this, arguments);
-      this.on("didInsertElement", this, this._updateElementValue);
-    }
-  });
-
-});
-enifed('ember-views/views/text_field', ['exports', 'ember-views/views/component', 'ember-views/mixins/text_support'], function (exports, Component, TextSupport) {
-
-  'use strict';
-
-  /**
-  @module ember
-  @submodule ember-views
-  */
-  exports['default'] = Component['default'].extend(TextSupport['default'], {
-    instrumentDisplay: '{{input type="text"}}',
-
-    classNames: ['ember-text-field'],
-    tagName: "input",
-    attributeBindings: [
-      'accept',
-      'autocomplete',
-      'autosave',
-      'dir',
-      'formaction',
-      'formenctype',
-      'formmethod',
-      'formnovalidate',
-      'formtarget',
-      'height',
-      'inputmode',
-      'lang',
-      'list',
-      'max',
-      'min',
-      'multiple',
-      'name',
-      'pattern',
-      'size',
-      'step',
-      'type',
-      'value',
-      'width'
-    ],
-
-    defaultLayout: null,
-
-    /**
-      The `value` attribute of the input element. As the user inputs text, this
-      property is updated live.
-
-      @property value
-      @type String
-      @default ""
-    */
-    value: "",
-
-    /**
-      The `type` attribute of the input element.
-
-      @property type
-      @type String
-      @default "text"
-    */
-    type: "text",
-
-    /**
-      The `size` of the text field in characters.
-
-      @property size
-      @type String
-      @default null
-    */
-    size: null,
-
-    /**
-      The `pattern` attribute of input element.
-
-      @property pattern
-      @type String
-      @default null
-    */
-    pattern: null,
-
-    /**
-      The `min` attribute of input element used with `type="number"` or `type="range"`.
-
-      @property min
-      @type String
-      @default null
-      @since 1.4.0
-    */
-    min: null,
-
-    /**
-      The `max` attribute of input element used with `type="number"` or `type="range"`.
-
-      @property max
-      @type String
-      @default null
-      @since 1.4.0
-    */
-    max: null
-  });
-
-});
-enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/platform/create', 'ember-runtime/mixins/evented', 'ember-runtime/system/object', 'ember-metal/error', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-metal/set_properties', 'ember-metal/run_loop', 'ember-metal/observer', 'ember-metal/properties', 'ember-metal/utils', 'ember-metal/computed', 'ember-metal/mixin', 'ember-views/streams/key_stream', 'ember-metal/streams/stream_binding', 'ember-views/streams/context_stream', 'ember-metal/streams/utils', 'ember-views/attr_nodes/attr_node', 'ember-metal/deprecate_property', 'ember-runtime/system/native_array', 'ember-views/streams/class_name_binding', 'ember-metal/enumerable_utils', 'ember-metal/property_events', 'ember-views/system/jquery', 'ember-views/system/ext', 'ember-views/views/core_view', 'ember-views/system/platform'], function (exports, Ember, create, Evented, EmberObject, EmberError, property_get, property_set, setProperties, run, ember_metal__observer, properties, utils, computed, mixin, KeyStream, StreamBinding, ContextStream, streams__utils, AttrNode, deprecate_property, native_array, class_name_binding, enumerable_utils, property_events, jQuery, __dep25__, CoreView, platform) {
-
-  'use strict';
-
-  // Ember.assert, Ember.deprecate, Ember.warn, Ember.TEMPLATES,
-  // jQuery, Ember.lookup,
-  // Ember.ContainerView circular dependency
-  // Ember.ENV
-  function K() { return this; }
-
-  // Circular dep
-  var _renderView;
-  function renderView(view, buffer, template) {
-    if (_renderView === undefined) {
-      _renderView = eriuqer('ember-htmlbars/system/render-view')['default'];
-    }
-    _renderView(view, buffer, template);
-  }
-
-  /**
-  @module ember
-  @submodule ember-views
-  */
-  var childViewsProperty = computed.computed(function() {
-    var childViews = this._childViews;
-    var ret = native_array.A();
-
-    enumerable_utils.forEach(childViews, function(view) {
-      var currentChildViews;
-      if (view.isVirtual) {
-        if (currentChildViews = property_get.get(view, 'childViews')) {
-          ret.pushObjects(currentChildViews);
-        }
-      } else {
-        ret.push(view);
-      }
-    });
-
-    ret.replace = function (idx, removedCount, addedViews) {
-      throw new EmberError['default']("childViews is immutable");
-    };
-
-    return ret;
-  });
-
-  Ember['default'].warn("The VIEW_PRESERVES_CONTEXT flag has been removed and the functionality can no longer be disabled.", Ember['default'].ENV.VIEW_PRESERVES_CONTEXT !== false);
-
-  /**
-    Global hash of shared templates. This will automatically be populated
-    by the build tools so that you can store your Handlebars templates in
-    separate files that get loaded into JavaScript at buildtime.
-
-    @property TEMPLATES
-    @for Ember
-    @type Hash
-  */
-  Ember['default'].TEMPLATES = {};
-
-  var EMPTY_ARRAY = [];
-
-  var ViewStreamSupport = mixin.Mixin.create({
-    init: function() {
-      this._baseContext = undefined;
-      this._contextStream = undefined;
-      this._streamBindings = undefined;
-      this._super.apply(this, arguments);
-    },
-
-    getStream: function(path) {
-      var stream = this._getContextStream().get(path);
-
-      stream._label = path;
-
-      return stream;
-    },
-
-    _willDestroyElement: function() {
-      if (this._streamBindings) {
-        this._destroyStreamBindings();
-      }
-      if (this._contextStream) {
-        this._destroyContextStream();
-      }
-    },
-
-    _getBindingForStream: function(pathOrStream) {
-      if (this._streamBindings === undefined) {
-        this._streamBindings = create['default'](null);
-      }
-
-      var path = pathOrStream;
-      if (streams__utils.isStream(pathOrStream)) {
-        path = pathOrStream._label;
-
-        if (!path) {
-          // if no _label is present on the provided stream
-          // it is likely a subexpr and cannot be set (so it
-          // does not need a StreamBinding)
-          return pathOrStream;
-        }
-      }
-
-      if (this._streamBindings[path] !== undefined) {
-        return this._streamBindings[path];
-      } else {
-        var stream = this._getContextStream().get(path);
-        var streamBinding = new StreamBinding['default'](stream);
-
-        streamBinding._label = path;
-
-        return this._streamBindings[path] = streamBinding;
-      }
-    },
-
-    _destroyStreamBindings: function() {
-      var streamBindings = this._streamBindings;
-      for (var path in streamBindings) {
-        streamBindings[path].destroy();
-      }
-      this._streamBindings = undefined;
-    },
-
-    _getContextStream: function() {
-      if (this._contextStream === undefined) {
-        this._baseContext = new KeyStream['default'](this, 'context');
-        this._contextStream = new ContextStream['default'](this);
-      }
-
-      return this._contextStream;
-    },
-
-    _destroyContextStream: function() {
-      this._baseContext.destroy();
-      this._baseContext = undefined;
-      this._contextStream.destroy();
-      this._contextStream = undefined;
-    },
-
-    _unsubscribeFromStreamBindings: function() {
-      for (var key in this._streamBindingSubscriptions) {
-        var streamBinding = this[key + 'Binding'];
-        var callback = this._streamBindingSubscriptions[key];
-        streamBinding.unsubscribe(callback);
-      }
-    }
-  });
-
-  var ViewKeywordSupport = mixin.Mixin.create({
-    init: function() {
-      this._super.apply(this, arguments);
-
-      if (!this._keywords) {
-        this._keywords = create['default'](null);
-      }
-      this._keywords._view = this;
-      this._keywords.view = undefined;
-      this._keywords.controller = new KeyStream['default'](this, 'controller');
-      this._setupKeywords();
-    },
-
-    _setupKeywords: function() {
-      var keywords = this._keywords;
-      var contextView = this._contextView || this._parentView;
-
-      if (contextView) {
-        var parentKeywords = contextView._keywords;
-
-        keywords.view = this.isVirtual ? parentKeywords.view : this;
-
-        for (var name in parentKeywords) {
-          if (keywords[name]) {
-            continue;
-          }
-
-          keywords[name] = parentKeywords[name];
-        }
-      } else {
-        keywords.view = this.isVirtual ? null : this;
-      }
-    }
-  });
-
-  var ViewContextSupport = mixin.Mixin.create({
-    /**
-      The object from which templates should access properties.
-
-      This object will be passed to the template function each time the render
-      method is called, but it is up to the individual function to decide what
-      to do with it.
-
-      By default, this will be the view's controller.
-
-      @property context
-      @type Object
-    */
-    context: computed.computed(function(key, value) {
-      if (arguments.length === 2) {
-        property_set.set(this, '_context', value);
-        return value;
-      } else {
-        return property_get.get(this, '_context');
-      }
-    })["volatile"](),
-
-    /**
-      Private copy of the view's template context. This can be set directly
-      by Handlebars without triggering the observer that causes the view
-      to be re-rendered.
-
-      The context of a view is looked up as follows:
-
-      1. Supplied context (usually by Handlebars)
-      2. Specified controller
-      3. `parentView`'s context (for a child of a ContainerView)
-
-      The code in Handlebars that overrides the `_context` property first
-      checks to see whether the view has a specified controller. This is
-      something of a hack and should be revisited.
-
-      @property _context
-      @private
-    */
-    _context: computed.computed(function(key, value) {
-      if (arguments.length === 2) {
-        return value;
-      }
-
-      var parentView, controller;
-
-      if (controller = property_get.get(this, 'controller')) {
-        return controller;
-      }
-
-      parentView = this._parentView;
-      if (parentView) {
-        return property_get.get(parentView, '_context');
-      }
+	'use strict';
 
-      return null;
-    }),
+	var preRender = create['default'](_default['default']);
 
-    _controller: null,
+	exports['default'] = preRender;
 
-    /**
-      The controller managing this view. If this property is set, it will be
-      made available for use by the template.
+});
+enifed('ember-views/views/text_area', ['exports', 'ember-metal/property_get', 'ember-views/views/component', 'ember-views/mixins/text_support', 'ember-metal/mixin'], function (exports, property_get, Component, TextSupport, mixin) {
 
-      @property controller
-      @type Object
-    */
-    controller: computed.computed(function(key, value) {
-      if (arguments.length === 2) {
-        this._controller = value;
-        return value;
-      }
+  'use strict';
 
-      if (this._controller) {
-        return this._controller;
-      }
 
-      var parentView = this._parentView;
-      return parentView ? property_get.get(parentView, 'controller') : null;
-    })
-  });
+  /**
+  @module ember
+  @submodule ember-views
+  */
+  exports['default'] = Component['default'].extend(TextSupport['default'], {
+    instrumentDisplay: '{{textarea}}',
 
-  var ViewChildViewsSupport = mixin.Mixin.create({
-    /**
-      Array of child views. You should never edit this array directly.
-      Instead, use `appendChild` and `removeFromParent`.
+    classNames: ['ember-text-area'],
 
-      @property childViews
-      @type Array
-      @default []
-      @private
-    */
-    childViews: childViewsProperty,
+    tagName: "textarea",
+    attributeBindings: [
+      'rows',
+      'cols',
+      'name',
+      'selectionEnd',
+      'selectionStart',
+      'wrap',
+      'lang',
+      'dir'
+    ],
+    rows: null,
+    cols: null,
 
-    _childViews: EMPTY_ARRAY,
+    _updateElementValue: mixin.observer('value', function() {
+      // We do this check so cursor position doesn't get affected in IE
+      var value = property_get.get(this, 'value');
+      var $el = this.$();
+      if ($el && value !== $el.val()) {
+        $el.val(value);
+      }
+    }),
 
     init: function() {
-      // setup child views. be sure to clone the child views array first
-      this._childViews = this._childViews.slice();
-
       this._super.apply(this, arguments);
-    },
-
-    appendChild: function(view, options) {
-      return this.currentState.appendChild(this, view, options);
-    },
+      this.on("didInsertElement", this, this._updateElementValue);
+    }
+  });
 
-    /**
-      Removes the child view from the parent view.
+});
+enifed('ember-views/views/text_field', ['exports', 'ember-views/views/component', 'ember-views/mixins/text_support'], function (exports, Component, TextSupport) {
 
-      @method removeChild
-      @param {Ember.View} view
-      @return {Ember.View} receiver
-    */
-    removeChild: function(view) {
-      // If we're destroying, the entire subtree will be
-      // freed, and the DOM will be handled separately,
-      // so no need to mess with childViews.
-      if (this.isDestroying) { return; }
+  'use strict';
 
-      // update parent node
-      property_set.set(view, '_parentView', null);
+  /**
+  @module ember
+  @submodule ember-views
+  */
+  exports['default'] = Component['default'].extend(TextSupport['default'], {
+    instrumentDisplay: '{{input type="text"}}',
 
-      // remove view from childViews array.
-      var childViews = this._childViews;
+    classNames: ['ember-text-field'],
+    tagName: "input",
+    attributeBindings: [
+      'accept',
+      'autocomplete',
+      'autosave',
+      'dir',
+      'formaction',
+      'formenctype',
+      'formmethod',
+      'formnovalidate',
+      'formtarget',
+      'height',
+      'inputmode',
+      'lang',
+      'list',
+      'max',
+      'min',
+      'multiple',
+      'name',
+      'pattern',
+      'size',
+      'step',
+      'type',
+      'value',
+      'width'
+    ],
 
-      enumerable_utils.removeObject(childViews, view);
+    defaultLayout: null,
 
-      this.propertyDidChange('childViews'); // HUH?! what happened to will change?
+    /**
+      The `value` attribute of the input element. As the user inputs text, this
+      property is updated live.
 
-      return this;
-    },
+      @property value
+      @type String
+      @default ""
+    */
+    value: "",
 
     /**
-      Instantiates a view to be added to the childViews array during view
-      initialization. You generally will not call this method directly unless
-      you are overriding `createChildViews()`. Note that this method will
-      automatically configure the correct settings on the new view instance to
-      act as a child of the parent.
+      The `type` attribute of the input element.
 
-      @method createChildView
-      @param {Class|String} viewClass
-      @param {Hash} [attrs] Attributes to add
-      @return {Ember.View} new instance
+      @property type
+      @type String
+      @default "text"
     */
-    createChildView: function(maybeViewClass, _attrs) {
-      if (!maybeViewClass) {
-        throw new TypeError("createChildViews first argument must exist");
-      }
-
-      if (maybeViewClass.isView && maybeViewClass._parentView === this && maybeViewClass.container === this.container) {
-        return maybeViewClass;
-      }
+    type: "text",
 
-      var attrs = _attrs || {};
-      var view;
-      attrs._parentView = this;
-      attrs.renderer = this.renderer;
+    /**
+      The `size` of the text field in characters.
 
-      if (maybeViewClass.isViewClass) {
-        attrs.container = this.container;
+      @property size
+      @type String
+      @default null
+    */
+    size: null,
 
-        view = maybeViewClass.create(attrs);
+    /**
+      The `pattern` attribute of input element.
 
-        // don't set the property on a virtual view, as they are invisible to
-        // consumers of the view API
-        if (view.viewName) {
-          property_set.set(property_get.get(this, 'concreteView'), view.viewName, view);
-        }
-      } else if ('string' === typeof maybeViewClass) {
-        var fullName = 'view:' + maybeViewClass;
-        var ViewKlass = this.container.lookupFactory(fullName);
+      @property pattern
+      @type String
+      @default null
+    */
+    pattern: null,
 
-        Ember['default'].assert("Could not find view: '" + fullName + "'", !!ViewKlass);
+    /**
+      The `min` attribute of input element used with `type="number"` or `type="range"`.
 
-        view = ViewKlass.create(attrs);
-      } else {
-        view = maybeViewClass;
-        Ember['default'].assert('You must pass instance or subclass of View', view.isView);
+      @property min
+      @type String
+      @default null
+      @since 1.4.0
+    */
+    min: null,
 
-        attrs.container = this.container;
-        setProperties['default'](view, attrs);
-      }
+    /**
+      The `max` attribute of input element used with `type="number"` or `type="range"`.
 
-      return view;
-    }
+      @property max
+      @type String
+      @default null
+      @since 1.4.0
+    */
+    max: null
   });
 
-  var ViewStateSupport = mixin.Mixin.create({
-    transitionTo: function(state, children) {
-      Ember['default'].deprecate("Ember.View#transitionTo has been deprecated, it is for internal use only");
-      this._transitionTo(state, children);
-    },
+});
+enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-runtime/mixins/evented', 'ember-runtime/system/object', 'ember-metal/error', 'ember-metal/property_get', 'ember-metal/run_loop', 'ember-metal/observer', 'ember-metal/utils', 'ember-metal/computed', 'ember-metal/mixin', 'ember-metal/deprecate_property', 'ember-metal/property_events', 'ember-views/system/jquery', 'ember-views/system/ext', 'ember-views/views/core_view', 'ember-views/mixins/view_stream_support', 'ember-views/mixins/view_keyword_support', 'ember-views/mixins/view_context_support', 'ember-views/mixins/view_child_views_support', 'ember-views/mixins/view_state_support', 'ember-views/mixins/template_rendering_support', 'ember-views/mixins/class_names_support', 'ember-views/mixins/attribute_bindings_support', 'ember-views/mixins/legacy_view_support', 'ember-views/mixins/instrumentation_support', 'ember-views/mixins/visibility_support'], function (exports, Ember, Evented, EmberObject, EmberError, property_get, run, observer, utils, computed, mixin, deprecate_property, property_events, jQuery, __dep13__, CoreView, ViewStreamSupport, ViewKeywordSupport, ViewContextSupport, view_child_views_support, ViewStateSupport, TemplateRenderingSupport, ClassNamesSupport, AttributeBindingsSupport, LegacyViewSupport, InstrumentationSupport, VisibilitySupport) {
 
-    _transitionTo: function(state, children) {
-      var priorState = this.currentState;
-      var currentState = this.currentState = this._states[state];
-      this._state = state;
+  'use strict';
 
-      if (priorState && priorState.exit) { priorState.exit(this); }
-      if (currentState.enter) { currentState.enter(this); }
-    }
-  });
+  // Ember.assert, Ember.deprecate, Ember.warn, Ember.TEMPLATES,
+  // jQuery, Ember.lookup,
+  // Ember.ContainerView circular dependency
+  // Ember.ENV
+  function K() { return this; }
 
-  var TemplateRenderingSupport = mixin.Mixin.create({
-    /**
-      Called on your view when it should push strings of HTML into a
-      `Ember.RenderBuffer`. Most users will want to override the `template`
-      or `templateName` properties instead of this method.
+  /**
+  @module ember
+  @submodule ember-views
+  */
 
-      By default, `Ember.View` will look for a function in the `template`
-      property and invoke it with the value of `context`. The value of
-      `context` will be the view's controller unless you override it.
+  Ember['default'].warn("The VIEW_PRESERVES_CONTEXT flag has been removed and the functionality can no longer be disabled.", Ember['default'].ENV.VIEW_PRESERVES_CONTEXT !== false);
 
-      @method render
-      @param {Ember.RenderBuffer} buffer The render buffer
-    */
-    render: function(buffer) {
-      // If this view has a layout, it is the responsibility of the
-      // the layout to render the view's template. Otherwise, render the template
-      // directly.
-      var template = property_get.get(this, 'layout') || property_get.get(this, 'template');
-      renderView(this, buffer, template);
-    }
-  });
+  /**
+    Global hash of shared templates. This will automatically be populated
+    by the build tools so that you can store your Handlebars templates in
+    separate files that get loaded into JavaScript at buildtime.
+
+    @property TEMPLATES
+    @for Ember
+    @type Hash
+  */
+  Ember['default'].TEMPLATES = {};
+
+  var EMPTY_ARRAY = [];
 
   /**
     `Ember.View` is the class in Ember responsible for encapsulating templates of
@@ -41570,9 +41978,18 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/pl
     @namespace Ember
     @extends Ember.CoreView
   */
-  var View = CoreView['default'].extend(ViewStreamSupport, ViewKeywordSupport, ViewContextSupport, ViewChildViewsSupport, ViewStateSupport, TemplateRenderingSupport, {
-
-    concatenatedProperties: ['classNames', 'classNameBindings', 'attributeBindings'],
+  var View = CoreView['default'].extend(
+    ViewStreamSupport['default'],
+    ViewKeywordSupport['default'],
+    ViewContextSupport['default'],
+    view_child_views_support["default"],
+    ViewStateSupport['default'],
+    TemplateRenderingSupport['default'],
+    ClassNamesSupport['default'],
+    AttributeBindingsSupport['default'],
+    LegacyViewSupport['default'],
+    InstrumentationSupport['default'],
+    VisibilitySupport['default'], {
 
     /**
       @property isView
@@ -41610,18 +42027,6 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/pl
     */
     layoutName: null,
 
-    /**
-      Used to identify this view during debugging
-
-      @property instrumentDisplay
-      @type String
-    */
-    instrumentDisplay: computed.computed(function() {
-      if (this.helperName) {
-        return '{{' + this.helperName + '}}';
-      }
-    }),
-
     /**
       The template used to render the view. This should be a function that
       accepts an optional context parameter and returns a string of HTML that
@@ -41671,12 +42076,7 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/pl
       var template = property_get.get(this, 'template');
 
       if (template) {
-        var useHTMLBars = false;
-        
-          useHTMLBars = template.isHTMLBars;
-        
-
-        if (useHTMLBars) {
+        if (template.isHTMLBars) {
           return template.render(this, options, morph.contextualElement);
         } else {
           return template(context, options);
@@ -41710,16 +42110,6 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/pl
       this.rerender();
     }),
 
-    /**
-      If `false`, the view will appear hidden in DOM.
-
-      @property isVisible
-      @type Boolean
-      @default null
-    */
-    isVisible: true,
-
-
     // When it's a virtual view, we need to notify the parent that their
     // childViews will change.
     _childViewsWillChange: mixin.beforeObserver('childViews', function() {
@@ -41738,25 +42128,6 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/pl
       }
     }),
 
-    /**
-      Return the nearest ancestor that is an instance of the provided
-      class.
-
-      @method nearestInstanceOf
-      @param {Class} klass Subclass of Ember.View (or Ember.View itself)
-      @return Ember.View
-      @deprecated
-    */
-    nearestInstanceOf: function(klass) {
-      Ember['default'].deprecate("nearestInstanceOf is deprecated and will be removed from future releases. Use nearestOfType.");
-      var view = property_get.get(this, 'parentView');
-
-      while (view) {
-        if (view instanceof klass) { return view; }
-        view = property_get.get(view, 'parentView');
-      }
-    },
-
     /**
       Return the nearest ancestor that is an instance of the provided
       class or mixin.
@@ -41794,26 +42165,6 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/pl
       }
     },
 
-    /**
-      Return the nearest ancestor whose parent is an instance of
-      `klass`.
-
-      @method nearestChildOf
-      @param {Class} klass Subclass of Ember.View (or Ember.View itself)
-      @return Ember.View
-      @deprecated
-    */
-    nearestChildOf: function(klass) {
-      Ember['default'].deprecate("nearestChildOf has been deprecated.");
-
-      var view = property_get.get(this, 'parentView');
-
-      while (view) {
-        if (property_get.get(view, 'parentView') instanceof klass) { return view; }
-        view = property_get.get(view, 'parentView');
-      }
-    },
-
     /**
       When the parent view changes, recursively invalidate `controller`
 
@@ -41861,159 +42212,6 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/pl
       return this.currentState.rerender(this);
     },
 
-    /**
-      Iterates over the view's `classNameBindings` array, inserts the value
-      of the specified property into the `classNames` array, then creates an
-      observer to update the view's element if the bound property ever changes
-      in the future.
-
-      @method _applyClassNameBindings
-      @private
-    */
-    _applyClassNameBindings: function(classBindings) {
-      var classNames = this.classNames;
-      var elem, newClass, dasherizedClass;
-
-      // Loop through all of the configured bindings. These will be either
-      // property names ('isUrgent') or property paths relative to the view
-      // ('content.isUrgent')
-      enumerable_utils.forEach(classBindings, function(binding) {
-
-        var boundBinding;
-        if (streams__utils.isStream(binding)) {
-          boundBinding = binding;
-        } else {
-          boundBinding = class_name_binding.streamifyClassNameBinding(this, binding, '_view.');
-        }
-
-        // Variable in which the old class value is saved. The observer function
-        // closes over this variable, so it knows which string to remove when
-        // the property changes.
-        var oldClass;
-
-        // Set up an observer on the context. If the property changes, toggle the
-        // class name.
-        var observer = this._wrapAsScheduled(function() {
-          // Get the current value of the property
-          elem = this.$();
-          newClass = streams__utils.read(boundBinding);
-
-          // If we had previously added a class to the element, remove it.
-          if (oldClass) {
-            elem.removeClass(oldClass);
-            // Also remove from classNames so that if the view gets rerendered,
-            // the class doesn't get added back to the DOM.
-            classNames.removeObject(oldClass);
-          }
-
-          // If necessary, add a new class. Make sure we keep track of it so
-          // it can be removed in the future.
-          if (newClass) {
-            elem.addClass(newClass);
-            oldClass = newClass;
-          } else {
-            oldClass = null;
-          }
-        });
-
-        // Get the class name for the property at its current value
-        dasherizedClass = streams__utils.read(boundBinding);
-
-        if (dasherizedClass) {
-          // Ensure that it gets into the classNames array
-          // so it is displayed when we render.
-          enumerable_utils.addObject(classNames, dasherizedClass);
-
-          // Save a reference to the class name so we can remove it
-          // if the observer fires. Remember that this variable has
-          // been closed over by the observer.
-          oldClass = dasherizedClass;
-        }
-
-        streams__utils.subscribe(boundBinding, observer, this);
-        // Remove className so when the view is rerendered,
-        // the className is added based on binding reevaluation
-        this.one('willClearRender', function() {
-          if (oldClass) {
-            classNames.removeObject(oldClass);
-            oldClass = null;
-          }
-        });
-
-      }, this);
-    },
-
-    _unspecifiedAttributeBindings: null,
-
-    /**
-      Iterates through the view's attribute bindings, sets up observers for each,
-      then applies the current value of the attributes to the passed render buffer.
-
-      @method _applyAttributeBindings
-      @param {Ember.RenderBuffer} buffer
-      @param {Array} attributeBindings
-      @private
-    */
-    _applyAttributeBindings: function(buffer, attributeBindings) {
-      var unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
-
-      var binding, colonIndex, property, attrName, attrNode, attrValue;
-      var i, l;
-      for (i=0, l=attributeBindings.length; i<l; i++) {
-        binding = attributeBindings[i];
-        colonIndex = binding.indexOf(':');
-        if (colonIndex === -1) {
-          property = binding;
-          attrName = binding;
-        } else {
-          property = binding.substring(0, colonIndex);
-          attrName = binding.substring(colonIndex + 1);
-        }
-
-        Ember['default'].assert('You cannot use class as an attributeBinding, use classNameBindings instead.', attrName !== 'class');
-
-        if (property in this) {
-          attrValue = this.getStream('view.'+property);
-          attrNode = new AttrNode['default'](attrName, attrValue);
-          this.appendAttr(attrNode);
-          if (!platform.canSetNameOnInputs && attrName === 'name') {
-            buffer.attr('name', streams__utils.read(attrValue));
-          }
-        } else {
-          unspecifiedAttributeBindings[property] = attrName;
-        }
-      }
-
-      // Lazily setup setUnknownProperty after attributeBindings are initially applied
-      this.setUnknownProperty = this._setUnknownProperty;
-    },
-
-    /**
-      We're using setUnknownProperty as a hook to setup attributeBinding observers for
-      properties that aren't defined on a view at initialization time.
-
-      Note: setUnknownProperty will only be called once for each property.
-
-      @method setUnknownProperty
-      @param key
-      @param value
-      @private
-    */
-    setUnknownProperty: null, // Gets defined after initialization by _applyAttributeBindings
-
-    _setUnknownProperty: function(key, value) {
-      var attrName = this._unspecifiedAttributeBindings && this._unspecifiedAttributeBindings[key];
-
-      properties.defineProperty(this, key);
-
-      if (attrName) {
-        var attrValue = this.getStream('view.'+key);
-        var attrNode = new AttrNode['default'](attrName, attrValue);
-        this.appendAttr(attrNode);
-      }
-      return property_set.set(this, key, value);
-    },
-
     /**
       Given a property name, returns a dasherized version of that
       property name if the property evaluates to a non-falsy value.
@@ -42057,19 +42255,6 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/pl
       return this.currentState.$(this, sel);
     },
 
-    mutateChildViews: function(callback) {
-      var childViews = this._childViews;
-      var idx = childViews.length;
-      var view;
-
-      while (--idx >= 0) {
-        view = childViews[idx];
-        callback(this, view, idx);
-      }
-
-      return this;
-    },
-
     forEachChildView: function(callback) {
       var childViews = this._childViews;
 
@@ -42298,32 +42483,16 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/pl
     */
     parentViewDidChange: K,
 
-    instrumentName: 'view',
-
-    instrumentDetails: function(hash) {
-      hash.template = property_get.get(this, 'templateName');
-      this._super(hash);
-    },
-
-    beforeRender: function(buffer) {},
-
-    afterRender: function(buffer) {},
-
     applyAttributesToBuffer: function(buffer) {
       // Creates observers for all registered class name and attribute bindings,
       // then adds them to the element.
-      var classNameBindings = this.classNameBindings;
-      if (classNameBindings.length) {
-        this._applyClassNameBindings(classNameBindings);
-      }
+
+      this._applyClassNameBindings();
 
       // Pass the render buffer so the method can apply attributes directly.
       // This isn't needed for class name bindings because they use the
       // existing classNames infrastructure.
-      var attributeBindings = this.attributeBindings;
-      if (attributeBindings.length) {
-        this._applyAttributeBindings(buffer, attributeBindings);
-      }
+      this._applyAttributeBindings(buffer);
 
       buffer.setClasses(this.classNames);
       buffer.id(this.elementId);
@@ -42373,88 +42542,6 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/pl
     */
     ariaRole: null,
 
-    /**
-      Standard CSS class names to apply to the view's outer element. This
-      property automatically inherits any class names defined by the view's
-      superclasses as well.
-
-      @property classNames
-      @type Array
-      @default ['ember-view']
-    */
-    classNames: ['ember-view'],
-
-    /**
-      A list of properties of the view to apply as class names. If the property
-      is a string value, the value of that string will be applied as a class
-      name.
-
-      ```javascript
-      // Applies the 'high' class to the view element
-      Ember.View.extend({
-        classNameBindings: ['priority']
-        priority: 'high'
-      });
-      ```
-
-      If the value of the property is a Boolean, the name of that property is
-      added as a dasherized class name.
-
-      ```javascript
-      // Applies the 'is-urgent' class to the view element
-      Ember.View.extend({
-        classNameBindings: ['isUrgent']
-        isUrgent: true
-      });
-      ```
-
-      If you would prefer to use a custom value instead of the dasherized
-      property name, you can pass a binding like this:
-
-      ```javascript
-      // Applies the 'urgent' class to the view element
-      Ember.View.extend({
-        classNameBindings: ['isUrgent:urgent']
-        isUrgent: true
-      });
-      ```
-
-      This list of properties is inherited from the view's superclasses as well.
-
-      @property classNameBindings
-      @type Array
-      @default []
-    */
-    classNameBindings: EMPTY_ARRAY,
-
-    /**
-      A list of properties of the view to apply as attributes. If the property is
-      a string value, the value of that string will be applied as the attribute.
-
-      ```javascript
-      // Applies the type attribute to the element
-      // with the value "button", like <div type="button">
-      Ember.View.extend({
-        attributeBindings: ['type'],
-        type: 'button'
-      });
-      ```
-
-      If the value of the property is a Boolean, the name of that property is
-      added as an attribute.
-
-      ```javascript
-      // Renders something like <div enabled="enabled">
-      Ember.View.extend({
-        attributeBindings: ['enabled'],
-        enabled: true
-      });
-      ```
-
-      @property attributeBindings
-    */
-    attributeBindings: EMPTY_ARRAY,
-
     // .......................................................
     // CORE DISPLAY METHODS
     //
@@ -42475,12 +42562,6 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/pl
       }
 
       this._super.apply(this, arguments);
-
-      Ember['default'].assert("Only arrays are allowed for 'classNameBindings'", utils.typeOf(this.classNameBindings) === 'array');
-      this.classNameBindings = native_array.A(this.classNameBindings.slice());
-
-      Ember['default'].assert("Only arrays of static class strings are allowed for 'classNames'. For dynamic classes, use 'classNameBindings'.", utils.typeOf(this.classNames) === 'array');
-      this.classNames = native_array.A(this.classNames.slice());
     },
 
     __defineNonEnumerable: function(property) {
@@ -42491,24 +42572,6 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/pl
       return this.currentState.appendAttr(this, node);
     },
 
-    /**
-      Removes all children from the `parentView`.
-
-      @method removeAllChildren
-      @return {Ember.View} receiver
-    */
-    removeAllChildren: function() {
-      return this.mutateChildViews(function(parentView, view) {
-        parentView.removeChild(view);
-      });
-    },
-
-    destroyAllChildren: function() {
-      return this.mutateChildViews(function(parentView, view) {
-        view.destroy();
-      });
-    },
-
     /**
       Removes the view from its `parentView`, if one is found. Otherwise
       does nothing.
@@ -42549,79 +42612,6 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/pl
       return this;
     },
 
-    becameVisible: K,
-    becameHidden: K,
-
-    /**
-      When the view's `isVisible` property changes, toggle the visibility
-      element of the actual DOM element.
-
-      @method _isVisibleDidChange
-      @private
-    */
-    _isVisibleDidChange: mixin.observer('isVisible', function() {
-      if (this._isVisible === property_get.get(this, 'isVisible')) { return ; }
-      run['default'].scheduleOnce('render', this, this._toggleVisibility);
-    }),
-
-    _toggleVisibility: function() {
-      var $el = this.$();
-      var isVisible = property_get.get(this, 'isVisible');
-
-      if (this._isVisible === isVisible) { return ; }
-
-      // It's important to keep these in sync, even if we don't yet have
-      // an element in the DOM to manipulate:
-      this._isVisible = isVisible;
-
-      if (!$el) { return; }
-
-      $el.toggle(isVisible);
-
-      if (this._isAncestorHidden()) { return; }
-
-      if (isVisible) {
-        this._notifyBecameVisible();
-      } else {
-        this._notifyBecameHidden();
-      }
-    },
-
-    _notifyBecameVisible: function() {
-      this.trigger('becameVisible');
-
-      this.forEachChildView(function(view) {
-        var isVisible = property_get.get(view, 'isVisible');
-
-        if (isVisible || isVisible === null) {
-          view._notifyBecameVisible();
-        }
-      });
-    },
-
-    _notifyBecameHidden: function() {
-      this.trigger('becameHidden');
-      this.forEachChildView(function(view) {
-        var isVisible = property_get.get(view, 'isVisible');
-
-        if (isVisible || isVisible === null) {
-          view._notifyBecameHidden();
-        }
-      });
-    },
-
-    _isAncestorHidden: function() {
-      var parent = property_get.get(this, 'parentView');
-
-      while (parent) {
-        if (property_get.get(parent, 'isVisible') === false) { return true; }
-
-        parent = property_get.get(parent, 'parentView');
-      }
-
-      return false;
-    },
-
     // .......................................................
     // EVENT HANDLING
     //
@@ -42650,10 +42640,10 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/pl
 
       var scheduledObserver = this._wrapAsScheduled(observer);
 
-      ember_metal__observer.addObserver(root, path, target, scheduledObserver);
+      observer.addObserver(root, path, target, scheduledObserver);
 
       this.one('willClearRender', function() {
-        ember_metal__observer.removeObserver(root, path, target, scheduledObserver);
+        observer.removeObserver(root, path, target, scheduledObserver);
       });
     },
 
@@ -42727,16 +42717,18 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-metal/pl
   // supplied childViews and then restore the original computed property
   // at view initialization time. This happens in Ember.ContainerView's init
   // method.
-  View.childViewsProperty = childViewsProperty;
+  View.childViewsProperty = view_child_views_support.childViewsProperty;
 
   exports['default'] = View;
 
-  exports.ViewKeywordSupport = ViewKeywordSupport;
-  exports.ViewStreamSupport = ViewStreamSupport;
-  exports.ViewContextSupport = ViewContextSupport;
-  exports.ViewChildViewsSupport = ViewChildViewsSupport;
-  exports.ViewStateSupport = ViewStateSupport;
-  exports.TemplateRenderingSupport = TemplateRenderingSupport;
+  exports.ViewKeywordSupport = ViewKeywordSupport['default'];
+  exports.ViewStreamSupport = ViewStreamSupport['default'];
+  exports.ViewContextSupport = ViewContextSupport['default'];
+  exports.ViewChildViewsSupport = view_child_views_support["default"];
+  exports.ViewStateSupport = ViewStateSupport['default'];
+  exports.TemplateRenderingSupport = TemplateRenderingSupport['default'];
+  exports.ClassNamesSupport = ClassNamesSupport['default'];
+  exports.AttributeBindingsSupport = AttributeBindingsSupport['default'];
 
 });
 enifed('ember-views/views/with_view', ['exports', 'ember-metal/property_set', 'ember-views/views/metamorph_view', 'ember-views/mixins/normalized_rerender_if_needed', 'ember-metal/run_loop', 'ember-htmlbars/system/render-view'], function (exports, property_set, _MetamorphView, NormalizedRerenderIfNeededSupport, run, renderView) {
@@ -42811,7 +42803,7 @@ enifed('ember-views/views/with_view', ['exports', 'ember-metal/property_set', 'e
   });
 
 });
-enifed('ember', ['ember-metal', 'ember-runtime', 'ember-views', 'ember-routing', 'ember-application', 'ember-extension-support', 'ember-htmlbars', 'ember-routing-htmlbars', 'ember-metal/environment', 'ember-runtime/system/lazy_load'], function (__dep0__, __dep1__, __dep2__, __dep3__, __dep4__, __dep5__, __dep6__, __dep7__, environment, lazy_load) {
+enifed('ember', ['ember-metal', 'ember-runtime', 'ember-views', 'ember-routing', 'ember-application', 'ember-extension-support', 'ember-htmlbars', 'ember-routing-htmlbars', 'ember-routing-views', 'ember-metal/environment', 'ember-runtime/system/lazy_load'], function (__dep0__, __dep1__, __dep2__, __dep3__, __dep4__, __dep5__, __dep6__, __dep7__, __dep8__, environment, lazy_load) {
 
   'use strict';
 
@@ -43212,298 +43204,310 @@ enifed("morph-attr/sanitize-attribute-value",
     __exports__.sanitizeAttributeValue = sanitizeAttributeValue;
   });
 enifed("morph-range",
-  ["exports"],
-  function(__exports__) {
+  ["./morph-range/utils","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
-    var splice = Array.prototype.splice;
+    var clear = __dependency1__.clear;
+    var insertBefore = __dependency1__.insertBefore;
 
-    function ensureStartEnd(start, end) {
-      if (start === null || end === null) {
-        throw new Error('a fragment parent must have boundary nodes in order to detect insertion');
-      }
+    function Morph(domHelper, contextualElement) {
+      this.domHelper = domHelper;
+      // context if content if current content is detached
+      this.contextualElement = contextualElement;
+
+      // flag to force text to setContent to be treated as html
+      this.parseTextAsHTML = false;
+
+      this.firstNode = null;
+      this.lastNode  = null;
+
+      // morph graph
+      this.parentMorph     = null;
+      this.firstChildMorph = null;
+      this.lastChildMorph  = null;
+
+      this.previousMorph = null;
+      this.nextMorph = null;
     }
 
-    function ensureContext(contextualElement) {
-      if (!contextualElement || contextualElement.nodeType !== 1) {
-        throw new Error('An element node must be provided for a contextualElement, you provided ' +
-                        (contextualElement ? 'nodeType ' + contextualElement.nodeType : 'nothing'));
+    Morph.prototype.setContent = function Morph$setContent(content) {
+      if (content === null || content === undefined) {
+        return this.clear();
       }
-    }
 
-    // TODO: this is an internal API, this should be an assert
-    function Morph(parent, start, end, domHelper, contextualElement) {
-      if (parent.nodeType === 11) {
-        ensureStartEnd(start, end);
-        this.element = null;
-      } else {
-        this.element = parent;
+      var type = typeof content;
+      switch (type) {
+        case 'string':
+          if (this.parseTextAsHTML) {
+            return this.setHTML(content);
+          }
+          return this.setText(content);
+        case 'object':
+          if (typeof content.nodeType === 'number') {
+            return this.setNode(content);
+          }
+          /* Handlebars.SafeString */
+          if (typeof content.string === 'string') {
+            return this.setHTML(content.string);
+          }
+          if (this.parseTextAsHTML) {
+            return this.setHTML(content.toString());
+          }
+          /* falls through */
+        case 'boolean':
+        case 'number':
+          return this.setText(content.toString());
+        default:
+          throw new TypeError('unsupported content');
       }
-      this._parent = parent;
-      this.start = start;
-      this.end = end;
-      this.domHelper = domHelper;
-      ensureContext(contextualElement);
-      this.contextualElement = contextualElement;
-      this.escaped = true;
-      this.reset();
-    }
+    };
 
-    Morph.prototype.reset = function() {
-      this.text = null;
-      this.owner = null;
-      this.morphs = null;
-      this.before = null;
-      this.after = null;
+    Morph.prototype.clear = function Morph$clear() {
+      return this.setNode(this.domHelper.createComment(''));
     };
 
-    Morph.prototype.parent = function () {
-      if (!this.element) {
-        var parent = this.start.parentNode;
-        if (this._parent !== parent) {
-          this._parent = parent;
-        }
-        if (parent.nodeType === 1) {
-          this.element = parent;
-        }
+    Morph.prototype.setText = function Morph$setText(text) {
+      var firstNode = this.firstNode;
+      var lastNode = this.lastNode;
+
+      if (firstNode &&
+          lastNode === firstNode &&
+          firstNode.nodeType === 3) {
+        firstNode.nodeValue = text;
+        return firstNode;
       }
-      return this._parent;
+
+      return this.setNode(
+        text ? this.domHelper.createTextNode(text) : this.domHelper.createComment('')
+      );
     };
 
-    Morph.prototype.destroy = function () {
-      if (this.owner) {
-        this.owner.removeMorph(this);
-      } else {
-        clear(this.element || this.parent(), this.start, this.end);
+    Morph.prototype.setNode = function Morph$setNode(newNode) {
+      var firstNode, lastNode;
+      switch (newNode.nodeType) {
+        case 3:
+          firstNode = newNode;
+          lastNode = newNode;
+          break;
+        case 11:
+          firstNode = newNode.firstChild;
+          lastNode = newNode.lastChild;
+          if (firstNode === null) {
+            firstNode = this.domHelper.createComment('');
+            newNode.appendChild(firstNode);
+            lastNode = firstNode;
+          }
+          break;
+        default:
+          firstNode = newNode;
+          lastNode = newNode;
+          break;
       }
+
+      var previousFirstNode = this.firstNode;
+      if (previousFirstNode !== null) {
+
+        var parentNode = previousFirstNode.parentNode;
+        insertBefore(parentNode, firstNode, lastNode, previousFirstNode);
+        clear(parentNode, previousFirstNode, this.lastNode);
+      }
+
+      this.firstNode = firstNode;
+      this.lastNode  = lastNode;
+
+      if (this.parentMorph) {
+        syncFirstNode(this);
+        syncLastNode(this);
+      }
+
+      return newNode;
     };
 
-    Morph.prototype.removeMorph = function (morph) {
-      var morphs = this.morphs;
-      for (var i=0, l=morphs.length; i<l; i++) {
-        if (morphs[i] === morph) {
-          this.replace(i, 1);
+    function syncFirstNode(_morph) {
+      var morph = _morph;
+      var parentMorph;
+      while (parentMorph = morph.parentMorph) {
+        if (morph !== parentMorph.firstChildMorph) {
+          break;
+        }
+        if (morph.firstNode === parentMorph.firstNode) {
           break;
         }
-      }
-    };
 
-    Morph.prototype.setContent = function (nodeOrString) {
-      this._update(this.element || this.parent(), nodeOrString);
-    };
+        parentMorph.firstNode = morph.firstNode;
 
-    Morph.prototype.updateNode = function (node) {
-      var parent = this.element || this.parent();
-      if (!node) {
-        return this._updateText(parent, '');
+        morph = parentMorph;
       }
-      this._updateNode(parent, node);
-    };
+    }
 
-    Morph.prototype.updateText = function (text) {
-      this._updateText(this.element || this.parent(), text);
-    };
+    function syncLastNode(_morph) {
+      var morph = _morph;
+      var parentMorph;
+      while (parentMorph = morph.parentMorph) {
+        if (morph !== parentMorph.lastChildMorph) {
+          break;
+        }
+        if (morph.lastNode === parentMorph.lastNode) {
+          break;
+        }
+
+        parentMorph.lastNode = morph.lastNode;
 
-    Morph.prototype.updateHTML = function (html) {
-      var parent = this.element || this.parent();
-      if (!html) {
-        return this._updateText(parent, '');
+        morph = parentMorph;
       }
-      this._updateHTML(parent, html);
+    }
+
+    // return morph content to an undifferentiated state
+    // drops knowledge that the node has content.
+    // this is for rerender, I need to test, but basically
+    // the idea is to leave the content, but allow render again
+    // without appending, so n
+    Morph.prototype.reset = function Morph$reset() {
+      this.firstChildMorph = null;
+      this.lastChildMorph = null;
     };
 
-    Morph.prototype._update = function (parent, nodeOrString) {
-      if (nodeOrString === null || nodeOrString === undefined) {
-        this._updateText(parent, '');
-      } else if (typeof nodeOrString === 'string') {
-        if (this.escaped) {
-          this._updateText(parent, nodeOrString);
+    Morph.prototype.destroy = function Morph$destroy() {
+      var parentMorph = this.parentMorph;
+      var previousMorph = this.previousMorph;
+      var nextMorph = this.nextMorph;
+      var firstNode = this.firstNode;
+      var lastNode = this.lastNode;
+      var parentNode = firstNode && firstNode.parentNode;
+
+      if (previousMorph) {
+        if (nextMorph) {
+          previousMorph.nextMorph = nextMorph;
+          nextMorph.previousMorph = previousMorph;
         } else {
-          this._updateHTML(parent, nodeOrString);
+          previousMorph.nextMorph = null;
+          if (parentMorph) { parentMorph.lastChildMorph = previousMorph; }
         }
-      } else if (nodeOrString.nodeType) {
-        this._updateNode(parent, nodeOrString);
-      } else if (nodeOrString.string) { // duck typed SafeString
-        this._updateHTML(parent, nodeOrString.string);
       } else {
-        this._updateText(parent, nodeOrString.toString());
+        if (nextMorph) {
+          nextMorph.previousMorph = null;
+          if (parentMorph) { parentMorph.firstChildMorph = nextMorph; }
+        } else if (parentMorph) {
+          parentMorph.lastChildMorph = parentMorph.firstChildMorph = null;
+        }
       }
-    };
 
-    Morph.prototype._updateNode = function (parent, node) {
-      if (this.text) {
-        if (node.nodeType === 3) {
-          this.text.nodeValue = node.nodeValue;
+      this.parentMorph = null;
+      this.firstNode = null;
+      this.lastNode = null;
+
+      if (parentMorph) {
+        if (!parentMorph.firstChildMorph) {
+          // list is empty
+          parentMorph.clear();
           return;
         } else {
-          this.text = null;
+          syncFirstNode(parentMorph.firstChildMorph);
+          syncLastNode(parentMorph.lastChildMorph);
         }
       }
-      var start = this.start, end = this.end;
-      clear(parent, start, end);
-      parent.insertBefore(node, end);
-      if (this.before !== null) {
-        this.before.end = start.nextSibling;
-      }
-      if (this.after !== null) {
-        this.after.start = end.previousSibling;
-      }
-    };
 
-    Morph.prototype._updateText = function (parent, text) {
-      if (this.text) {
-        this.text.nodeValue = text;
-        return;
-      }
-      var node = this.domHelper.createTextNode(text);
-      this.text = node;
-      clear(parent, this.start, this.end);
-      parent.insertBefore(node, this.end);
-      if (this.before !== null) {
-        this.before.end = node;
-      }
-      if (this.after !== null) {
-        this.after.start = node;
-      }
+      clear(parentNode, firstNode, lastNode);
     };
 
-    Morph.prototype._updateHTML = function (parent, html) {
-      var start = this.start, end = this.end;
-      clear(parent, start, end);
-      this.text = null;
-      var childNodes = this.domHelper.parseHTML(html, this.contextualElement);
-      appendChildren(parent, end, childNodes);
-      if (this.before !== null) {
-        this.before.end = start.nextSibling;
-      }
-      if (this.after !== null) {
-        this.after.start = end.previousSibling;
-      }
+    Morph.prototype.setHTML = function(text) {
+      var fragment = this.domHelper.parseHTML(text, this.contextualElement);
+      return this.setNode(fragment);
     };
 
-    Morph.prototype.append = function (node) {
-      if (this.morphs === null) {
-        this.morphs = [];
-      }
-      var index = this.morphs.length;
-      return this.insert(index, node);
+    Morph.prototype.appendContent = function(content) {
+      return this.insertContentBeforeMorph(content, null);
     };
 
-    Morph.prototype.insert = function (index, node) {
-      if (this.morphs === null) {
-        this.morphs = [];
-      }
-      var parent = this.element || this.parent();
-      var morphs = this.morphs;
-      var before = index > 0 ? morphs[index-1] : null;
-      var after  = index < morphs.length ? morphs[index] : null;
-      var start  = before === null ? this.start : (before.end === null ? parent.lastChild : before.end.previousSibling);
-      var end    = after === null ? this.end : (after.start === null ? parent.firstChild : after.start.nextSibling);
-      var morph  = new Morph(parent, start, end, this.domHelper, this.contextualElement);
+    Morph.prototype.insertContentBeforeMorph = function (content, referenceMorph) {
+      var morph = new Morph(this.domHelper, this.contextualElement);
+      morph.setContent(content);
+      this.insertBeforeMorph(morph, referenceMorph);
+      return morph;
+    };
 
-      morph.owner = this;
-      morph._update(parent, node);
+    Morph.prototype.appendMorph = function(morph) {
+      this.insertBeforeMorph(morph, null);
+    };
 
-      if (before !== null) {
-        morph.before = before;
-        before.end = start.nextSibling;
-        before.after = morph;
+    Morph.prototype.insertBeforeMorph = function(morph, referenceMorph) {
+      if (referenceMorph && referenceMorph.parentMorph !== this) {
+        throw new Error('The morph before which the new morph is to be inserted is not a child of this morph.');
       }
 
-      if (after !== null) {
-        morph.after = after;
-        after.before = morph;
-        after.start = end.previousSibling;
-      }
+      morph.parentMorph = this;
 
-      this.morphs.splice(index, 0, morph);
-      return morph;
-    };
+      var parentNode = this.firstNode.parentNode;
 
-    Morph.prototype.replace = function (index, removedLength, addedNodes) {
-      if (this.morphs === null) {
-        this.morphs = [];
-      }
-      var parent = this.element || this.parent();
-      var morphs = this.morphs;
-      var before = index > 0 ? morphs[index-1] : null;
-      var after = index+removedLength < morphs.length ? morphs[index+removedLength] : null;
-      var start = before === null ? this.start : (before.end === null ? parent.lastChild : before.end.previousSibling);
-      var end   = after === null ? this.end : (after.start === null ? parent.firstChild : after.start.nextSibling);
-      var addedLength = addedNodes === undefined ? 0 : addedNodes.length;
-      var args, i, current;
+      insertBefore(
+        parentNode,
+        morph.firstNode,
+        morph.lastNode,
+        referenceMorph ? referenceMorph.firstNode : this.lastNode.nextSibling
+      );
 
-      if (removedLength > 0) {
-        clear(parent, start, end);
+      // was not in list mode replace current content
+      if (!this.firstChildMorph) {
+        clear(parentNode, this.firstNode, this.lastNode);
       }
 
-      if (addedLength === 0) {
-        if (before !== null) {
-          before.after = after;
-          before.end = end;
-        }
-        if (after !== null) {
-          after.before = before;
-          after.start = start;
-        }
-        morphs.splice(index, removedLength);
-        return;
+      var previousMorph = referenceMorph ? referenceMorph.previousMorph : this.lastChildMorph;
+      if (previousMorph) {
+        previousMorph.nextMorph = morph;
+        morph.previousMorph = previousMorph;
+      } else {
+        this.firstChildMorph = morph;
       }
 
-      args = new Array(addedLength+2);
-      if (addedLength > 0) {
-        for (i=0; i<addedLength; i++) {
-          args[i+2] = current = new Morph(parent, start, end, this.domHelper, this.contextualElement);
-          current._update(parent, addedNodes[i]);
-          current.owner = this;
-          if (before !== null) {
-            current.before = before;
-            before.end = start.nextSibling;
-            before.after = current;
-          }
-          before = current;
-          start = end === null ? parent.lastChild : end.previousSibling;
-        }
-        if (after !== null) {
-          current.after = after;
-          after.before = current;
-          after.start = end.previousSibling;
-        }
+      if (referenceMorph) {
+        referenceMorph.previousMorph = morph;
+        morph.nextMorph = referenceMorph;
+      } else {
+        this.lastChildMorph = morph;
       }
 
-      args[0] = index;
-      args[1] = removedLength;
-
-      splice.apply(morphs, args);
+      syncFirstNode(this.firstChildMorph);
+      syncLastNode(this.lastChildMorph);
     };
 
-    function appendChildren(parent, end, nodeList) {
-      var ref = end;
-      var i = nodeList.length;
-      var node;
+    __exports__["default"] = Morph;
+  });
+enifed("morph-range/utils",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    // inclusive of both nodes
+    function clear(parentNode, firstNode, lastNode) {
+      if (!parentNode) { return; }
 
-      while (i--) {
-        node = nodeList[i];
-        parent.insertBefore(node, ref);
-        ref = node;
-      }
+      var node = firstNode;
+      var nextNode;
+      do {
+        nextNode = node.nextSibling;
+        parentNode.removeChild(node);
+        if (node === lastNode) {
+          break;
+        }
+        node = nextNode;
+      } while (node);
     }
 
-    function clear(parent, start, end) {
-      var current, previous;
-      if (end === null) {
-        current = parent.lastChild;
-      } else {
-        current = end.previousSibling;
-      }
-
-      while (current !== null && current !== start) {
-        previous = current.previousSibling;
-        parent.removeChild(current);
-        current = previous;
-      }
+    __exports__.clear = clear;function insertBefore(parentNode, firstNode, lastNode, _refNode) {
+      var node = lastNode;
+      var refNode = _refNode;
+      var prevNode;
+      do {
+        prevNode = node.previousSibling;
+        parentNode.insertBefore(node, refNode);
+        if (node === firstNode) {
+          break;
+        }
+        refNode = node;
+        node = prevNode;
+      } while (node);
     }
 
-    __exports__["default"] = Morph;
+    __exports__.insertBefore = insertBefore;
   });
 enifed("route-recognizer",
   ["./route-recognizer/dsl","exports"],