ember-source 1.11.0.1 → 1.11.1

data/dist/ember.debug.cjs.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
+ * @version   1.11.1
  */
 
 (function() {
@@ -6029,7 +6029,7 @@ enifed('ember-htmlbars/compat/helper', ['exports', 'ember-metal/merge', 'ember-h
   function HandlebarsCompatibleHelper(fn) {
     this.helperFunction = function helperFunc(params, hash, options, env) {
       var param, blockResult, fnResult;
-      var context = this;
+      var context = env.data.view;
       var handlebarsOptions = {
         hash: { },
         types: new Array(params.length),
@@ -6045,6 +6045,12 @@ enifed('ember-htmlbars/compat/helper', ['exports', 'ember-metal/merge', 'ember-h
         handlebarsOptions.fn = function() {
           blockResult = options.template.render(context, env, options.morph.contextualElement);
         };
+
+        if (options.inverse) {
+          handlebarsOptions.inverse = function() {
+            blockResult = options.inverse.render(context, env, options.morph.contextualElement);
+          };
+        }
       }
 
       for (var prop in hash) {
@@ -7818,8 +7824,8 @@ enifed('ember-htmlbars/system/render-view', ['exports', 'ember-metal/core', 'emb
   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` (this revision).',
-      template.revision === 'Ember@1.11.0'
+      '` which does not match `Ember@1.11.1` (this revision).',
+      template.revision === 'Ember@1.11.1'
     );
 
     var contextualElement = buffer.innerContextualElement();
@@ -7859,7 +7865,7 @@ enifed('ember-htmlbars/templates/component', ['exports', 'ember-template-compile
   exports['default'] = template['default']((function() {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0",
+      revision: "Ember@1.11.1",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -7906,7 +7912,7 @@ enifed('ember-htmlbars/templates/empty', ['exports', 'ember-template-compiler/sy
   exports['default'] = template['default']((function() {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0",
+      revision: "Ember@1.11.1",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -7946,7 +7952,7 @@ enifed('ember-htmlbars/templates/link-to-escaped', ['exports', 'ember-template-c
   exports['default'] = template['default']((function() {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0",
+      revision: "Ember@1.11.1",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -7993,7 +7999,7 @@ enifed('ember-htmlbars/templates/link-to-unescaped', ['exports', 'ember-template
   exports['default'] = template['default']((function() {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0",
+      revision: "Ember@1.11.1",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -8041,7 +8047,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
     var child0 = (function() {
       return {
         isHTMLBars: true,
-        revision: "Ember@1.11.0",
+        revision: "Ember@1.11.1",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
@@ -8084,7 +8090,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       var child0 = (function() {
         return {
           isHTMLBars: true,
-          revision: "Ember@1.11.0",
+          revision: "Ember@1.11.1",
           blockParams: 0,
           cachedFragment: null,
           hasRendered: false,
@@ -8124,7 +8130,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       }());
       return {
         isHTMLBars: true,
-        revision: "Ember@1.11.0",
+        revision: "Ember@1.11.1",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
@@ -8166,7 +8172,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       var child0 = (function() {
         return {
           isHTMLBars: true,
-          revision: "Ember@1.11.0",
+          revision: "Ember@1.11.1",
           blockParams: 0,
           cachedFragment: null,
           hasRendered: false,
@@ -8206,7 +8212,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       }());
       return {
         isHTMLBars: true,
-        revision: "Ember@1.11.0",
+        revision: "Ember@1.11.1",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
@@ -8246,7 +8252,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
     }());
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0",
+      revision: "Ember@1.11.1",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -8560,7 +8566,7 @@ enifed('ember-metal-views/renderer', ['exports', 'dom-helper', 'ember-metal/envi
 
       this.beforeRemove(removeQueue[idx]);
 
-      childViews = view._childViews;
+      childViews = this.childViews(view);
       if (childViews) {
         for (i=0,l=childViews.length; i<l; i++) {
           queue.push(childViews[i]);
@@ -8573,7 +8579,7 @@ enifed('ember-metal-views/renderer', ['exports', 'dom-helper', 'ember-metal/envi
 
       this.beforeRemove(destroyQueue[idx]);
 
-      childViews = view._childViews;
+      childViews = this.childViews(view);
       if (childViews) {
         for (i=0,l=childViews.length; i<l; i++) {
           destroyQueue.push(childViews[i]);
@@ -11393,7 +11399,7 @@ enifed('ember-metal/core', ['exports'], function (exports) {
 
     @class Ember
     @static
-    @version 1.11.0
+    @version 1.11.1
   */
 
   if ('undefined' === typeof Ember) {
@@ -11421,10 +11427,10 @@ enifed('ember-metal/core', ['exports'], function (exports) {
   /**
     @property VERSION
     @type String
-    @default '1.11.0'
+    @default '1.11.1'
     @static
   */
-  Ember.VERSION = '1.11.0';
+  Ember.VERSION = '1.11.1';
 
   /**
     Standard environmental variables. You can define these in a global `EmberENV`
@@ -16880,7 +16886,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     return object && object.isStream;
   }
 
-  /**
+  /*
    A method of subscribing to a stream which is safe for use with a non-stream
    object. If a non-stream object is passed, the function does nothing.
 
@@ -16898,7 +16904,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     }
   }
 
-  /**
+  /*
    A method of unsubscribing from a stream which is safe for use with a non-stream
    object. If a non-stream object is passed, the function does nothing.
 
@@ -16915,7 +16921,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     }
   }
 
-  /**
+  /*
    Retrieve the value of a stream, or in the case a non-stream object is passed,
    return the object itself.
 
@@ -16933,7 +16939,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     }
   }
 
-  /**
+  /*
    Map an array, replacing any streams with their values.
 
    @public
@@ -16954,7 +16960,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     return ret;
   }
 
-  /**
+  /*
    Map a hash, replacing any stream property values with the current value of that
    stream.
 
@@ -16975,7 +16981,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     return ret;
   }
 
-  /**
+  /*
    Check whether an array contains any stream values
 
    @public
@@ -16999,7 +17005,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     return containsStream;
   }
 
-  /**
+  /*
    Check whether a hash has any stream property values
 
    @public
@@ -17022,7 +17028,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     return containsStream;
   }
 
-  /**
+  /*
    Join an array, with any streams replaced by their current values
 
    @public
@@ -17055,7 +17061,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     }
   }
 
-  /**
+  /*
    Generate a new stream by providing a source stream and a function that can
    be used to transform the stream's value. In the case of a non-stream object,
    returns the result of the function.
@@ -18787,7 +18793,7 @@ enifed('ember-routing-htmlbars/helpers/query-params', ['exports', 'ember-metal/c
   }
 
 });
-enifed('ember-routing-htmlbars/helpers/render', ['exports', 'ember-metal/core', 'ember-metal/error', 'ember-runtime/system/string', 'ember-routing/system/generate_controller', 'ember-metal/streams/utils', 'ember-htmlbars/system/merge-view-bindings', 'ember-htmlbars/system/append-templated-view', 'ember-metal/platform/create'], function (exports, Ember, EmberError, string, generate_controller, utils, mergeViewBindings, appendTemplatedView, create) {
+enifed('ember-routing-htmlbars/helpers/render', ['exports', 'ember-metal/core', 'ember-metal/property_get', 'ember-metal/error', 'ember-runtime/system/string', 'ember-routing/system/generate_controller', 'ember-metal/streams/utils', 'ember-htmlbars/system/merge-view-bindings', 'ember-htmlbars/system/append-templated-view', 'ember-metal/platform/create'], function (exports, Ember, property_get, EmberError, string, generate_controller, utils, mergeViewBindings, appendTemplatedView, create) {
 
   'use strict';
 
@@ -18848,6 +18854,9 @@ enifed('ember-routing-htmlbars/helpers/render', ['exports', 'ember-metal/core',
     view = container.lookup('view:' + name);
     if (!view) {
       view = container.lookup('view:default');
+    }
+    var viewHasTemplateSpecified = !!property_get.get(view, 'template');
+    if (!viewHasTemplateSpecified) {
       template = template || container.lookup(templateName);
     }
 
@@ -20732,6 +20741,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
     init: function() {
       property_set.set(this, 'location', property_get.get(this, 'location') || window.location);
       property_set.set(this, 'baseURL', jQuery['default']('base').attr('href') || '');
+
     },
 
     /**
@@ -20741,7 +20751,13 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
       @method initState
     */
     initState: function() {
-      property_set.set(this, 'history', property_get.get(this, 'history') || window.history);
+      var history = property_get.get(this, 'history') || window.history;
+      property_set.set(this, 'history', history);
+
+      if (history && 'state' in history) {
+        this.supportsHistory = true;
+      }
+
       this.replaceState(this.formatURL(this.getURL()));
     },
 
@@ -20786,7 +20802,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
       @param path {String}
     */
     setURL: function(path) {
-      var state = this._historyState;
+      var state = this.getState();
       path = this.formatURL(path);
 
       if (!state || state.path !== path) {
@@ -20803,7 +20819,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
       @param path {String}
     */
     replaceURL: function(path) {
-      var state = this._historyState;
+      var state = this.getState();
       path = this.formatURL(path);
 
       if (!state || state.path !== path) {
@@ -20811,6 +20827,24 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
       }
     },
 
+    /**
+      Get the current `history.state`. Checks for if a polyfill is
+      required and if so fetches this._historyState. The state returned
+      from getState may be null if an iframe has changed a window's
+      history.
+
+      @private
+      @method getState
+      @return state {Object}
+    */
+    getState: function() {
+      if (this.supportsHistory) {
+        return property_get.get(this, 'history').state;
+      }
+
+      return this._historyState;
+    },
+
     /**
      Pushes a new state.
 
@@ -20821,7 +20855,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
     pushState: function(path) {
       var state = { path: path };
 
-      property_get.get(this, 'history').pushState(null, null, path);
+      property_get.get(this, 'history').pushState(state, null, path);
 
       this._historyState = state;
 
@@ -20838,7 +20872,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
     */
     replaceState: function(path) {
       var state = { path: path };
-      property_get.get(this, 'history').replaceState(null, null, path);
+      property_get.get(this, 'history').replaceState(state, null, path);
 
       this._historyState = state;
 
@@ -26651,7 +26685,7 @@ enifed('ember-runtime/controllers/array_controller', ['exports', 'ember-metal/co
         Ember['default'].assert(
           'ArrayController expects `model` to implement the Ember.Array mixin. ' +
           'This can often be fixed by wrapping your model with `Ember.A()`.',
-          EmberArray['default'].detect(value)
+          EmberArray['default'].detect(value) || !value
         );
 
         return value;
@@ -34713,7 +34747,7 @@ enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-meta
     var disableComponentGeneration = true;
     
     return {
-      revision: 'Ember@1.11.0',
+      revision: 'Ember@1.11.1',
 
       disableComponentGeneration: disableComponentGeneration,
 
@@ -36269,6 +36303,8 @@ enifed('ember-views/mixins/attribute_bindings_support', ['exports', 'ember-metal
     */
     attributeBindings: EMPTY_ARRAY,
 
+    _attrNodes: EMPTY_ARRAY,
+
     _unspecifiedAttributeBindings: null,
 
     /**
@@ -38886,7 +38922,10 @@ enifed('ember-views/system/renderer', ['exports', 'ember-metal/core', 'ember-met
   };
 
   EmberRenderer.prototype.childViews = function childViews(view) {
-    return view._childViews;
+    if (view._attrNodes && view._childViews) {
+      return view._attrNodes.concat(view._childViews);
+    }
+    return view._attrNodes || view._childViews;
   };
 
   Renderer['default'].prototype.willCreateElement = function (view) {
@@ -40459,7 +40498,7 @@ enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', '
 
   var selectOptionDefaultTemplate = {
     isHTMLBars: true,
-    revision: 'Ember@1.11.0',
+    revision: 'Ember@1.11.1',
     render: function(context, env, contextualElement) {
       var lazyValue = context.getStream('view.label');
 
@@ -41410,10 +41449,10 @@ enifed('ember-views/views/states/in_buffer', ['exports', 'ember-views/views/stat
 
     appendAttr: function(view, attrNode) {
       var buffer = view.buffer;
-      var _childViews = view._childViews;
+      var _attrNodes = view._attrNodes;
 
-      if (!_childViews.length) { _childViews = view._childViews = _childViews.slice(); }
-      _childViews.push(attrNode);
+      if (!_attrNodes.length) { _attrNodes = view._attrNodes = _attrNodes.slice(); }
+      _attrNodes.push(attrNode);
 
       if (!attrNode._morph) {
         Ember.assert("bound attributes that do not have a morph must have a buffer", !!buffer);
@@ -41468,10 +41507,10 @@ enifed('ember-views/views/states/in_dom', ['exports', 'ember-metal/core', 'ember
     },
 
     appendAttr: function(view, attrNode) {
-      var _childViews = view._childViews;
+      var _attrNodes = view._attrNodes;
 
-      if (!_childViews.length) { _childViews = view._childViews = _childViews.slice(); }
-      _childViews.push(attrNode);
+      if (!_attrNodes.length) { _attrNodes = view._attrNodes = _attrNodes.slice(); }
+      _attrNodes.push(attrNode);
 
       attrNode._parentView = view;
       view.renderer.appendAttrTo(attrNode, view.element, attrNode.attrName);

data/dist/ember.debug.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
+ * @version   1.11.1
  */
 
 (function() {
@@ -6029,7 +6029,7 @@ enifed('ember-htmlbars/compat/helper', ['exports', 'ember-metal/merge', 'ember-h
   function HandlebarsCompatibleHelper(fn) {
     this.helperFunction = function helperFunc(params, hash, options, env) {
       var param, blockResult, fnResult;
-      var context = this;
+      var context = env.data.view;
       var handlebarsOptions = {
         hash: { },
         types: new Array(params.length),
@@ -6045,6 +6045,12 @@ enifed('ember-htmlbars/compat/helper', ['exports', 'ember-metal/merge', 'ember-h
         handlebarsOptions.fn = function() {
           blockResult = options.template.render(context, env, options.morph.contextualElement);
         };
+
+        if (options.inverse) {
+          handlebarsOptions.inverse = function() {
+            blockResult = options.inverse.render(context, env, options.morph.contextualElement);
+          };
+        }
       }
 
       for (var prop in hash) {
@@ -7818,8 +7824,8 @@ enifed('ember-htmlbars/system/render-view', ['exports', 'ember-metal/core', 'emb
   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` (this revision).',
-      template.revision === 'Ember@1.11.0'
+      '` which does not match `Ember@1.11.1` (this revision).',
+      template.revision === 'Ember@1.11.1'
     );
 
     var contextualElement = buffer.innerContextualElement();
@@ -7859,7 +7865,7 @@ enifed('ember-htmlbars/templates/component', ['exports', 'ember-template-compile
   exports['default'] = template['default']((function() {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0",
+      revision: "Ember@1.11.1",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -7906,7 +7912,7 @@ enifed('ember-htmlbars/templates/empty', ['exports', 'ember-template-compiler/sy
   exports['default'] = template['default']((function() {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0",
+      revision: "Ember@1.11.1",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -7946,7 +7952,7 @@ enifed('ember-htmlbars/templates/link-to-escaped', ['exports', 'ember-template-c
   exports['default'] = template['default']((function() {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0",
+      revision: "Ember@1.11.1",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -7993,7 +7999,7 @@ enifed('ember-htmlbars/templates/link-to-unescaped', ['exports', 'ember-template
   exports['default'] = template['default']((function() {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0",
+      revision: "Ember@1.11.1",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -8041,7 +8047,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
     var child0 = (function() {
       return {
         isHTMLBars: true,
-        revision: "Ember@1.11.0",
+        revision: "Ember@1.11.1",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
@@ -8084,7 +8090,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       var child0 = (function() {
         return {
           isHTMLBars: true,
-          revision: "Ember@1.11.0",
+          revision: "Ember@1.11.1",
           blockParams: 0,
           cachedFragment: null,
           hasRendered: false,
@@ -8124,7 +8130,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       }());
       return {
         isHTMLBars: true,
-        revision: "Ember@1.11.0",
+        revision: "Ember@1.11.1",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
@@ -8166,7 +8172,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       var child0 = (function() {
         return {
           isHTMLBars: true,
-          revision: "Ember@1.11.0",
+          revision: "Ember@1.11.1",
           blockParams: 0,
           cachedFragment: null,
           hasRendered: false,
@@ -8206,7 +8212,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       }());
       return {
         isHTMLBars: true,
-        revision: "Ember@1.11.0",
+        revision: "Ember@1.11.1",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
@@ -8246,7 +8252,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
     }());
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0",
+      revision: "Ember@1.11.1",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -8560,7 +8566,7 @@ enifed('ember-metal-views/renderer', ['exports', 'dom-helper', 'ember-metal/envi
 
       this.beforeRemove(removeQueue[idx]);
 
-      childViews = view._childViews;
+      childViews = this.childViews(view);
       if (childViews) {
         for (i=0,l=childViews.length; i<l; i++) {
           queue.push(childViews[i]);
@@ -8573,7 +8579,7 @@ enifed('ember-metal-views/renderer', ['exports', 'dom-helper', 'ember-metal/envi
 
       this.beforeRemove(destroyQueue[idx]);
 
-      childViews = view._childViews;
+      childViews = this.childViews(view);
       if (childViews) {
         for (i=0,l=childViews.length; i<l; i++) {
           destroyQueue.push(childViews[i]);
@@ -11393,7 +11399,7 @@ enifed('ember-metal/core', ['exports'], function (exports) {
 
     @class Ember
     @static
-    @version 1.11.0
+    @version 1.11.1
   */
 
   if ('undefined' === typeof Ember) {
@@ -11421,10 +11427,10 @@ enifed('ember-metal/core', ['exports'], function (exports) {
   /**
     @property VERSION
     @type String
-    @default '1.11.0'
+    @default '1.11.1'
     @static
   */
-  Ember.VERSION = '1.11.0';
+  Ember.VERSION = '1.11.1';
 
   /**
     Standard environmental variables. You can define these in a global `EmberENV`
@@ -16880,7 +16886,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     return object && object.isStream;
   }
 
-  /**
+  /*
    A method of subscribing to a stream which is safe for use with a non-stream
    object. If a non-stream object is passed, the function does nothing.
 
@@ -16898,7 +16904,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     }
   }
 
-  /**
+  /*
    A method of unsubscribing from a stream which is safe for use with a non-stream
    object. If a non-stream object is passed, the function does nothing.
 
@@ -16915,7 +16921,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     }
   }
 
-  /**
+  /*
    Retrieve the value of a stream, or in the case a non-stream object is passed,
    return the object itself.
 
@@ -16933,7 +16939,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     }
   }
 
-  /**
+  /*
    Map an array, replacing any streams with their values.
 
    @public
@@ -16954,7 +16960,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     return ret;
   }
 
-  /**
+  /*
    Map a hash, replacing any stream property values with the current value of that
    stream.
 
@@ -16975,7 +16981,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     return ret;
   }
 
-  /**
+  /*
    Check whether an array contains any stream values
 
    @public
@@ -16999,7 +17005,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     return containsStream;
   }
 
-  /**
+  /*
    Check whether a hash has any stream property values
 
    @public
@@ -17022,7 +17028,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     return containsStream;
   }
 
-  /**
+  /*
    Join an array, with any streams replaced by their current values
 
    @public
@@ -17055,7 +17061,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     }
   }
 
-  /**
+  /*
    Generate a new stream by providing a source stream and a function that can
    be used to transform the stream's value. In the case of a non-stream object,
    returns the result of the function.
@@ -18787,7 +18793,7 @@ enifed('ember-routing-htmlbars/helpers/query-params', ['exports', 'ember-metal/c
   }
 
 });
-enifed('ember-routing-htmlbars/helpers/render', ['exports', 'ember-metal/core', 'ember-metal/error', 'ember-runtime/system/string', 'ember-routing/system/generate_controller', 'ember-metal/streams/utils', 'ember-htmlbars/system/merge-view-bindings', 'ember-htmlbars/system/append-templated-view', 'ember-metal/platform/create'], function (exports, Ember, EmberError, string, generate_controller, utils, mergeViewBindings, appendTemplatedView, create) {
+enifed('ember-routing-htmlbars/helpers/render', ['exports', 'ember-metal/core', 'ember-metal/property_get', 'ember-metal/error', 'ember-runtime/system/string', 'ember-routing/system/generate_controller', 'ember-metal/streams/utils', 'ember-htmlbars/system/merge-view-bindings', 'ember-htmlbars/system/append-templated-view', 'ember-metal/platform/create'], function (exports, Ember, property_get, EmberError, string, generate_controller, utils, mergeViewBindings, appendTemplatedView, create) {
 
   'use strict';
 
@@ -18848,6 +18854,9 @@ enifed('ember-routing-htmlbars/helpers/render', ['exports', 'ember-metal/core',
     view = container.lookup('view:' + name);
     if (!view) {
       view = container.lookup('view:default');
+    }
+    var viewHasTemplateSpecified = !!property_get.get(view, 'template');
+    if (!viewHasTemplateSpecified) {
       template = template || container.lookup(templateName);
     }
 
@@ -20732,6 +20741,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
     init: function() {
       property_set.set(this, 'location', property_get.get(this, 'location') || window.location);
       property_set.set(this, 'baseURL', jQuery['default']('base').attr('href') || '');
+
     },
 
     /**
@@ -20741,7 +20751,13 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
       @method initState
     */
     initState: function() {
-      property_set.set(this, 'history', property_get.get(this, 'history') || window.history);
+      var history = property_get.get(this, 'history') || window.history;
+      property_set.set(this, 'history', history);
+
+      if (history && 'state' in history) {
+        this.supportsHistory = true;
+      }
+
       this.replaceState(this.formatURL(this.getURL()));
     },
 
@@ -20786,7 +20802,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
       @param path {String}
     */
     setURL: function(path) {
-      var state = this._historyState;
+      var state = this.getState();
       path = this.formatURL(path);
 
       if (!state || state.path !== path) {
@@ -20803,7 +20819,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
       @param path {String}
     */
     replaceURL: function(path) {
-      var state = this._historyState;
+      var state = this.getState();
       path = this.formatURL(path);
 
       if (!state || state.path !== path) {
@@ -20811,6 +20827,24 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
       }
     },
 
+    /**
+      Get the current `history.state`. Checks for if a polyfill is
+      required and if so fetches this._historyState. The state returned
+      from getState may be null if an iframe has changed a window's
+      history.
+
+      @private
+      @method getState
+      @return state {Object}
+    */
+    getState: function() {
+      if (this.supportsHistory) {
+        return property_get.get(this, 'history').state;
+      }
+
+      return this._historyState;
+    },
+
     /**
      Pushes a new state.
 
@@ -20821,7 +20855,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
     pushState: function(path) {
       var state = { path: path };
 
-      property_get.get(this, 'history').pushState(null, null, path);
+      property_get.get(this, 'history').pushState(state, null, path);
 
       this._historyState = state;
 
@@ -20838,7 +20872,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
     */
     replaceState: function(path) {
       var state = { path: path };
-      property_get.get(this, 'history').replaceState(null, null, path);
+      property_get.get(this, 'history').replaceState(state, null, path);
 
       this._historyState = state;
 
@@ -26651,7 +26685,7 @@ enifed('ember-runtime/controllers/array_controller', ['exports', 'ember-metal/co
         Ember['default'].assert(
           'ArrayController expects `model` to implement the Ember.Array mixin. ' +
           'This can often be fixed by wrapping your model with `Ember.A()`.',
-          EmberArray['default'].detect(value)
+          EmberArray['default'].detect(value) || !value
         );
 
         return value;
@@ -34713,7 +34747,7 @@ enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-meta
     var disableComponentGeneration = true;
     
     return {
-      revision: 'Ember@1.11.0',
+      revision: 'Ember@1.11.1',
 
       disableComponentGeneration: disableComponentGeneration,
 
@@ -36269,6 +36303,8 @@ enifed('ember-views/mixins/attribute_bindings_support', ['exports', 'ember-metal
     */
     attributeBindings: EMPTY_ARRAY,
 
+    _attrNodes: EMPTY_ARRAY,
+
     _unspecifiedAttributeBindings: null,
 
     /**
@@ -38886,7 +38922,10 @@ enifed('ember-views/system/renderer', ['exports', 'ember-metal/core', 'ember-met
   };
 
   EmberRenderer.prototype.childViews = function childViews(view) {
-    return view._childViews;
+    if (view._attrNodes && view._childViews) {
+      return view._attrNodes.concat(view._childViews);
+    }
+    return view._attrNodes || view._childViews;
   };
 
   Renderer['default'].prototype.willCreateElement = function (view) {
@@ -40459,7 +40498,7 @@ enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', '
 
   var selectOptionDefaultTemplate = {
     isHTMLBars: true,
-    revision: 'Ember@1.11.0',
+    revision: 'Ember@1.11.1',
     render: function(context, env, contextualElement) {
       var lazyValue = context.getStream('view.label');
 
@@ -41410,10 +41449,10 @@ enifed('ember-views/views/states/in_buffer', ['exports', 'ember-views/views/stat
 
     appendAttr: function(view, attrNode) {
       var buffer = view.buffer;
-      var _childViews = view._childViews;
+      var _attrNodes = view._attrNodes;
 
-      if (!_childViews.length) { _childViews = view._childViews = _childViews.slice(); }
-      _childViews.push(attrNode);
+      if (!_attrNodes.length) { _attrNodes = view._attrNodes = _attrNodes.slice(); }
+      _attrNodes.push(attrNode);
 
       if (!attrNode._morph) {
         Ember.assert("bound attributes that do not have a morph must have a buffer", !!buffer);
@@ -41468,10 +41507,10 @@ enifed('ember-views/views/states/in_dom', ['exports', 'ember-metal/core', 'ember
     },
 
     appendAttr: function(view, attrNode) {
-      var _childViews = view._childViews;
+      var _attrNodes = view._attrNodes;
 
-      if (!_childViews.length) { _childViews = view._childViews = _childViews.slice(); }
-      _childViews.push(attrNode);
+      if (!_attrNodes.length) { _attrNodes = view._attrNodes = _attrNodes.slice(); }
+      _attrNodes.push(attrNode);
 
       attrNode._parentView = view;
       view.renderer.appendAttrTo(attrNode, view.element, attrNode.attrName);