ember-source 1.11.0.beta.3 → 1.11.0.beta.4

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.3.780ac356
+ * @version   1.11.0-beta.4.a4140e29
  */
 
 (function() {
@@ -3920,7 +3920,7 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
       this._readinessDeferrals = 1;
 
       
-        this.Router = Router['default'].extend();
+        this.Router = (this.Router || Router['default']).extend();
         this.waitForDOMReady(this.buildDefaultInstance());
       
     },
@@ -6109,7 +6109,7 @@ enifed('ember-htmlbars/compat/make-bound-helper', ['exports', 'ember-metal/core'
     }
 
     function helperFunc(params, hash, options, env) {
-      var view = this;
+      var view = env.data.view;
       var numParams = params.length;
       var param;
 
@@ -6397,7 +6397,7 @@ enifed('ember-htmlbars/helpers/bind-attr', ['exports', 'ember-metal/core', 'embe
 
     Ember['default'].assert("You must specify at least one hash argument to bind-attr", !!keys['default'](hash).length);
 
-    var view = this;
+    var view = env.data.view;
 
     // Handle classes differently, as we can bind multiple classes
     var classNameBindings = hash['class'];
@@ -6579,7 +6579,7 @@ enifed('ember-htmlbars/helpers/collection', ['exports', 'ember-metal/core', 'emb
     }
     if (emptyViewClass) { hash.emptyView = emptyViewClass; }
 
-    var viewOptions = mergeViewBindings['default'](this, {}, itemHash);
+    var viewOptions = mergeViewBindings['default'](view, {}, itemHash);
 
     if (hash.itemClassBinding) {
       var itemClassBindings = hash.itemClassBinding.split(' ');
@@ -6613,8 +6613,9 @@ enifed('ember-htmlbars/helpers/component', ['exports', 'ember-metal/core', 'embe
       params.length === 1
     );
 
+    var view = env.data.view;
     var componentNameParam = params[0];
-    var container = this.container || utils.read(this._keywords.view).container;
+    var container = view.container || utils.read(view._keywords.view).container;
 
     var props = {
       helperName: options.helperName || 'component'
@@ -6633,10 +6634,10 @@ enifed('ember-htmlbars/helpers/component', ['exports', 'ember-metal/core', 'embe
       if (!viewClass) {
         throw new EmberError['default']('HTMLBars error: Could not find component named "' + componentNameParam + '".');
       }
-      mergeViewBindings['default'](this, props, hash);
+      mergeViewBindings['default'](view, props, hash);
     }
 
-    appendTemplatedView['default'](this, options.morph, viewClass, props);
+    appendTemplatedView['default'](view, options.morph, viewClass, props);
   }
 
 });
@@ -6652,10 +6653,10 @@ enifed('ember-htmlbars/helpers/debugger', ['exports', 'ember-metal/logger'], fun
   @module ember
   @submodule ember-htmlbars
   */
-  function debuggerHelper() {
+  function debuggerHelper(params, hash, options, env) {
 
     /* jshint unused: false */
-    var view = this;
+    var view = env.data.view;
 
     /* jshint unused: false */
     var context = view.get('context');
@@ -6682,8 +6683,9 @@ enifed('ember-htmlbars/helpers/each', ['exports', 'ember-metal/core', 'ember-vie
   @submodule ember-htmlbars
   */
   function eachHelper(params, hash, options, env) {
+    var view = env.data.view;
     var helperName = 'each';
-    var path = params[0] || this.getStream('');
+    var path = params[0] || view.getStream('');
 
     Ember['default'].assert(
       "If you pass more than one argument to the each helper, " +
@@ -6728,7 +6730,7 @@ enifed('ember-htmlbars/helpers/if_unless', ['exports', 'ember-metal/core', 'embe
 
   function ifHelper(params, hash, options, env) {
     var helperName = options.helperName || 'if';
-    return appendConditional(this, false, helperName, params, hash, options, env);
+    return appendConditional(false, helperName, params, hash, options, env);
   }
 
   /**
@@ -6737,7 +6739,7 @@ enifed('ember-htmlbars/helpers/if_unless', ['exports', 'ember-metal/core', 'embe
   */
   function unlessHelper(params, hash, options, env) {
     var helperName = options.helperName || 'unless';
-    return appendConditional(this, true, helperName, params, hash, options, env);
+    return appendConditional(true, helperName, params, hash, options, env);
   }
 
 
@@ -6748,7 +6750,9 @@ enifed('ember-htmlbars/helpers/if_unless', ['exports', 'ember-metal/core', 'embe
     );
   }
 
-  function appendConditional(view, inverted, helperName, params, hash, options, env) {
+  function appendConditional(inverted, helperName, params, hash, options, env) {
+    var view = env.data.view;
+
     if (options.isBlock) {
       return appendBlockConditional(view, inverted, helperName, params, hash, options, env);
     } else {
@@ -6847,7 +6851,7 @@ enifed('ember-htmlbars/helpers/loc', ['exports', 'ember-metal/core', 'ember-runt
       return true;
     })());
 
-    return string.loc.apply(this, params);
+    return string.loc.apply(env.data.view, params);
   }
 
 });
@@ -6880,18 +6884,19 @@ enifed('ember-htmlbars/helpers/partial', ['exports', 'ember-metal/property_get',
   exports.partialHelper = partialHelper;
 
   function partialHelper(params, hash, options, env) {
+    var view = env.data.view;
     var templateName = params[0];
 
     if (utils.isStream(templateName)) {
-      this.appendChild(BoundPartialView['default'], {
+      view.appendChild(BoundPartialView['default'], {
         _morph: options.morph,
-        _context: property_get.get(this, 'context'),
+        _context: property_get.get(view, 'context'),
         templateNameStream: templateName,
         helperName: options.helperName || 'partial'
       });
     } else {
-      var template = lookupPartial['default'](this, templateName);
-      return template.render(this, env, options.morph.contextualElement);
+      var template = lookupPartial['default'](view, templateName);
+      return template.render(view, env, options.morph.contextualElement);
     }
   }
 
@@ -6948,14 +6953,15 @@ enifed('ember-htmlbars/helpers/unbound', ['exports', 'ember-metal/error', 'ember
     } else {
       options.helperName = options.helperName || 'unbound';
 
+      var view = env.data.view;
       var helperName = params[0]._label;
-      var helper = lookupHelper['default'](helperName, this, env);
+      var helper = lookupHelper['default'](helperName, view, env);
 
       if (!helper) {
         throw new EmberError['default']('HTMLBars error: Could not find component or helper named ' + helperName + '.');
       }
 
-      return helper.helperFunction.call(this, readParams(params), readHash(hash, this), options, env);
+      return helper.helperFunction.call(this, readParams(params), readHash(hash, view), options, env);
     }
   }
 
@@ -7007,7 +7013,8 @@ enifed('ember-htmlbars/helpers/view', ['exports', 'ember-metal/core', 'ember-met
       params.length <= 2
     );
 
-    var container = this.container || utils.read(this._keywords.view).container;
+    var view = env.data.view;
+    var container = view.container || utils.read(view._keywords.view).container;
     var viewClassOrInstance;
     if (params.length === 0) {
       if (container) {
@@ -7027,8 +7034,8 @@ enifed('ember-htmlbars/helpers/view', ['exports', 'ember-metal/core', 'ember-met
       props.template = options.template;
     }
 
-    mergeViewBindings['default'](this, props, hash);
-    appendTemplatedView['default'](this, options.morph, viewClassOrInstance, props);
+    mergeViewBindings['default'](view, props, hash);
+    appendTemplatedView['default'](view, options.morph, viewClassOrInstance, props);
   }
 
 });
@@ -7055,6 +7062,7 @@ enifed('ember-htmlbars/helpers/with', ['exports', 'ember-metal/core', 'ember-vie
       !!options.template
     );
 
+    var view = env.data.view;
     var preserveContext;
 
     if (options.template.blockParams) {
@@ -7069,11 +7077,11 @@ enifed('ember-htmlbars/helpers/with', ['exports', 'ember-metal/core', 'ember-vie
       preserveContext = false;
     }
 
-    this.appendChild(WithView['default'], {
+    view.appendChild(WithView['default'], {
       _morph: options.morph,
       withValue: params[0],
       preserveContext: preserveContext,
-      previousContext: this.get('context'),
+      previousContext: view.get('context'),
       controllerName: hash.controller,
       mainTemplate: options.template,
       inverseTemplate: options.inverse,
@@ -7094,20 +7102,21 @@ enifed('ember-htmlbars/helpers/yield', ['exports', 'ember-metal/core', 'ember-me
   */
 
   function yieldHelper(params, hash, options, env) {
-    var view = this;
+    var view = env.data.view;
+    var layoutView = view;
 
     // Yea gods
-    while (view && !property_get.get(view, 'layout')) {
-      if (view._contextView) {
-        view = view._contextView;
+    while (layoutView && !property_get.get(layoutView, 'layout')) {
+      if (layoutView._contextView) {
+        layoutView = layoutView._contextView;
       } else {
-        view = view._parentView;
+        layoutView = layoutView._parentView;
       }
     }
 
-    Ember['default'].assert("You called yield in a template that was not a layout", !!view);
+    Ember['default'].assert("You called yield in a template that was not a layout", !!layoutView);
 
-    return view._yield(this, env, options.morph, params);
+    return layoutView._yield(view, env, options.morph, params);
   }
 
 });
@@ -7163,7 +7172,7 @@ enifed('ember-htmlbars/hooks/block', ['exports', 'ember-views/views/simple_bound
       inverse: inverse,
       isBlock: true
     };
-    var result = helper.helperFunction.call(view, params, hash, options, env);
+    var result = helper.helperFunction.call(undefined, params, hash, options, env);
 
     if (utils.isStream(result)) {
       simple_bound_view.appendSimpleBoundView(view, morph, result);
@@ -7188,7 +7197,7 @@ enifed('ember-htmlbars/hooks/component', ['exports', 'ember-metal/core', 'ember-
 
     Ember['default'].assert('You specified `' + tagName + '` in your template, but a component for `' + tagName + '` could not be found.', !!helper);
 
-    return helper.helperFunction.call(view, [], attrs, { morph: morph, template: template }, env);
+    return helper.helperFunction.call(undefined, [], attrs, { morph: morph, template: template }, env);
   }
   exports['default'] = component;
 
@@ -7226,7 +7235,7 @@ enifed('ember-htmlbars/hooks/content', ['exports', 'ember-views/views/simple_bou
         morph: morph,
         isInline: true
       };
-      result = helper.helperFunction.call(view, [], {}, options, env);
+      result = helper.helperFunction.call(undefined, [], {}, options, env);
     } else {
       result = view.getStream(path);
     }
@@ -7257,7 +7266,7 @@ enifed('ember-htmlbars/hooks/element', ['exports', 'ember-metal/core', 'ember-me
       var options = {
         element: domElement
       };
-      valueOrLazyValue = helper.helperFunction.call(view, params, hash, options, env);
+      valueOrLazyValue = helper.helperFunction.call(undefined, params, hash, options, env);
     } else {
       valueOrLazyValue = view.getStream(path);
     }
@@ -7310,7 +7319,7 @@ enifed('ember-htmlbars/hooks/inline', ['exports', 'ember-views/views/simple_boun
 
     Ember.assert("A helper named '"+path+"' could not be found", helper);
 
-    var result = helper.helperFunction.call(view, params, hash, { morph: morph }, env);
+    var result = helper.helperFunction.call(undefined, params, hash, { morph: morph }, env);
 
     if (utils.isStream(result)) {
       simple_bound_view.appendSimpleBoundView(view, morph, result);
@@ -7353,7 +7362,7 @@ enifed('ember-htmlbars/hooks/subexpr', ['exports', 'ember-htmlbars/system/lookup
     var options = {
       isInline: true
     };
-    return helper.helperFunction.call(view, params, hash, options, env);
+    return helper.helperFunction.call(undefined, params, hash, options, env);
   }
   exports['default'] = subexpr;
 
@@ -7598,7 +7607,7 @@ enifed('ember-htmlbars/system/make_bound_helper', ['exports', 'ember-metal/core'
 
   function makeBoundHelper(fn) {
     function helperFunc(params, hash, options, env) {
-      var view = this;
+      var view = env.data.view;
       var numParams = params.length;
       var param, prop;
 
@@ -7762,8 +7771,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-beta.3.780ac356` (this revision).',
-      template.revision === 'Ember@1.11.0-beta.3.780ac356'
+      '` which does not match `Ember@1.11.0-beta.4.a4140e29` (this revision).',
+      template.revision === 'Ember@1.11.0-beta.4.a4140e29'
     );
 
     var contextualElement = buffer.innerContextualElement();
@@ -7803,7 +7812,7 @@ enifed('ember-htmlbars/templates/component', ['exports', 'ember-template-compile
   exports['default'] = template['default']((function() {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0-beta.3.780ac356",
+      revision: "Ember@1.11.0-beta.4.a4140e29",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -7850,16 +7859,106 @@ enifed('ember-htmlbars/templates/empty', ['exports', 'ember-template-compiler/sy
   exports['default'] = template['default']((function() {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0-beta.3.780ac356",
+      revision: "Ember@1.11.0-beta.4.a4140e29",
+      blockParams: 0,
+      cachedFragment: null,
+      hasRendered: false,
+      build: function build(dom) {
+        var el0 = dom.createDocumentFragment();
+        return el0;
+      },
+      render: function render(context, env, contextualElement) {
+        var dom = env.dom;
+        dom.detectNamespace(contextualElement);
+        var fragment;
+        if (env.useFragmentCache && dom.canClone) {
+          if (this.cachedFragment === null) {
+            fragment = this.build(dom);
+            if (this.hasRendered) {
+              this.cachedFragment = fragment;
+            } else {
+              this.hasRendered = true;
+            }
+          }
+          if (this.cachedFragment) {
+            fragment = dom.cloneNode(this.cachedFragment, true);
+          }
+        } else {
+          fragment = this.build(dom);
+        }
+        return fragment;
+      }
+    };
+  }()));
+
+});
+enifed('ember-htmlbars/templates/link-to-escaped', ['exports', 'ember-template-compiler/system/template'], function (exports, template) {
+
+  'use strict';
+
+  exports['default'] = template['default']((function() {
+    return {
+      isHTMLBars: true,
+      revision: "Ember@1.11.0-beta.4.a4140e29",
+      blockParams: 0,
+      cachedFragment: null,
+      hasRendered: false,
+      build: function build(dom) {
+        var el0 = dom.createDocumentFragment();
+        var el1 = dom.createComment("");
+        dom.appendChild(el0, el1);
+        return el0;
+      },
+      render: function render(context, env, contextualElement) {
+        var dom = env.dom;
+        var hooks = env.hooks, content = hooks.content;
+        dom.detectNamespace(contextualElement);
+        var fragment;
+        if (env.useFragmentCache && dom.canClone) {
+          if (this.cachedFragment === null) {
+            fragment = this.build(dom);
+            if (this.hasRendered) {
+              this.cachedFragment = fragment;
+            } else {
+              this.hasRendered = true;
+            }
+          }
+          if (this.cachedFragment) {
+            fragment = dom.cloneNode(this.cachedFragment, true);
+          }
+        } else {
+          fragment = this.build(dom);
+        }
+        var morph0 = dom.createMorphAt(fragment,0,0,contextualElement);
+        dom.insertBoundary(fragment, null);
+        dom.insertBoundary(fragment, 0);
+        content(env, morph0, context, "linkTitle");
+        return fragment;
+      }
+    };
+  }()));
+
+});
+enifed('ember-htmlbars/templates/link-to-unescaped', ['exports', 'ember-template-compiler/system/template'], function (exports, template) {
+
+  'use strict';
+
+  exports['default'] = template['default']((function() {
+    return {
+      isHTMLBars: true,
+      revision: "Ember@1.11.0-beta.4.a4140e29",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
       build: function build(dom) {
         var el0 = dom.createDocumentFragment();
+        var el1 = dom.createComment("");
+        dom.appendChild(el0, el1);
         return el0;
       },
       render: function render(context, env, contextualElement) {
         var dom = env.dom;
+        var hooks = env.hooks, content = hooks.content;
         dom.detectNamespace(contextualElement);
         var fragment;
         if (env.useFragmentCache && dom.canClone) {
@@ -7877,6 +7976,10 @@ enifed('ember-htmlbars/templates/empty', ['exports', 'ember-template-compiler/sy
         } else {
           fragment = this.build(dom);
         }
+        var morph0 = dom.createUnsafeMorphAt(fragment,0,0,contextualElement);
+        dom.insertBoundary(fragment, null);
+        dom.insertBoundary(fragment, 0);
+        content(env, morph0, context, "linkTitle");
         return fragment;
       }
     };
@@ -7891,7 +7994,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
     var child0 = (function() {
       return {
         isHTMLBars: true,
-        revision: "Ember@1.11.0-beta.3.780ac356",
+        revision: "Ember@1.11.0-beta.4.a4140e29",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
@@ -7934,7 +8037,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       var child0 = (function() {
         return {
           isHTMLBars: true,
-          revision: "Ember@1.11.0-beta.3.780ac356",
+          revision: "Ember@1.11.0-beta.4.a4140e29",
           blockParams: 0,
           cachedFragment: null,
           hasRendered: false,
@@ -7974,7 +8077,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       }());
       return {
         isHTMLBars: true,
-        revision: "Ember@1.11.0-beta.3.780ac356",
+        revision: "Ember@1.11.0-beta.4.a4140e29",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
@@ -8016,7 +8119,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       var child0 = (function() {
         return {
           isHTMLBars: true,
-          revision: "Ember@1.11.0-beta.3.780ac356",
+          revision: "Ember@1.11.0-beta.4.a4140e29",
           blockParams: 0,
           cachedFragment: null,
           hasRendered: false,
@@ -8056,7 +8159,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       }());
       return {
         isHTMLBars: true,
-        revision: "Ember@1.11.0-beta.3.780ac356",
+        revision: "Ember@1.11.0-beta.4.a4140e29",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
@@ -8096,7 +8199,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
     }());
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0-beta.3.780ac356",
+      revision: "Ember@1.11.0-beta.4.a4140e29",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -11243,7 +11346,7 @@ enifed('ember-metal/core', ['exports'], function (exports) {
 
     @class Ember
     @static
-    @version 1.11.0-beta.3.780ac356
+    @version 1.11.0-beta.4.a4140e29
   */
 
   if ('undefined' === typeof Ember) {
@@ -11271,10 +11374,10 @@ enifed('ember-metal/core', ['exports'], function (exports) {
   /**
     @property VERSION
     @type String
-    @default '1.11.0-beta.3.780ac356'
+    @default '1.11.0-beta.4.a4140e29'
     @static
   */
-  Ember.VERSION = '1.11.0-beta.3.780ac356';
+  Ember.VERSION = '1.11.0-beta.4.a4140e29';
 
   /**
     Standard environmental variables. You can define these in a global `EmberENV`
@@ -18455,14 +18558,14 @@ enifed('ember-routing-htmlbars/helpers/action', ['exports', 'ember-metal/core',
     @param {Hash} options
   */
   function actionHelper(params, hash, options, env) {
-
+    var view = env.data.view;
     var target;
     if (!hash.target) {
-      target = this.getStream('controller');
+      target = view.getStream('controller');
     } else if (ember_metal__streams__utils.isStream(hash.target)) {
       target = hash.target;
     } else {
-      target = this.getStream(hash.target);
+      target = view.getStream(hash.target);
     }
 
     // Ember.assert("You specified a quoteless path to the {{action}} helper which did not resolve to an action name (a string). Perhaps you meant to use a quoted actionName? (e.g. {{action 'save'}}).", !params[0].isStream);
@@ -18471,7 +18574,7 @@ enifed('ember-routing-htmlbars/helpers/action', ['exports', 'ember-metal/core',
     var actionOptions = {
       eventName: hash.on || "click",
       parameters: params.slice(1),
-      view: this,
+      view: view,
       bubbles: hash.bubbles,
       preventDefault: hash.preventDefault,
       target: target,
@@ -18485,7 +18588,7 @@ enifed('ember-routing-htmlbars/helpers/action', ['exports', 'ember-metal/core',
   exports.ActionHelper = ActionHelper;
 
 });
-enifed('ember-routing-htmlbars/helpers/link-to', ['exports', 'ember-metal/core', 'ember-routing-views/views/link', 'ember-metal/streams/utils', 'ember-runtime/mixins/controller', 'ember-htmlbars'], function (exports, Ember, link, utils, ControllerMixin) {
+enifed('ember-routing-htmlbars/helpers/link-to', ['exports', 'ember-metal/core', 'ember-routing-views/views/link', 'ember-metal/streams/utils', 'ember-runtime/mixins/controller', 'ember-htmlbars/templates/link-to-escaped', 'ember-htmlbars/templates/link-to-unescaped', 'ember-htmlbars'], function (exports, Ember, link, utils, ControllerMixin, inlineEscapedLinkTo, inlineUnescapedLinkTo) {
 
   'use strict';
 
@@ -18517,22 +18620,13 @@ enifed('ember-routing-htmlbars/helpers/link-to', ['exports', 'ember-metal/core',
       var linkTitle = params.shift();
       var parseTextAsHTML = options.morph.parseTextAsHTML;
 
-      if (utils.isStream(linkTitle)) {
-        hash.linkTitle = { stream: linkTitle };
+      if (parseTextAsHTML) {
+        hash.layout = inlineUnescapedLinkTo['default'];
+      } else {
+        hash.layout = inlineEscapedLinkTo['default'];
       }
 
-      options.template = {
-        isHTMLBars: true,
-        revision: 'Ember@1.11.0-beta.3.780ac356',
-        render: function(view, env) {
-          var value = utils.read(linkTitle) || "";
-          if (parseTextAsHTML) {
-            return value;
-          } else {
-            return env.dom.createTextNode(value);
-          }
-        }
-      };
+      hash.linkTitle = linkTitle;
     }
 
     for (var i = 0; i < params.length; i++) {
@@ -18588,6 +18682,7 @@ enifed('ember-routing-htmlbars/helpers/outlet', ['exports', 'ember-metal/core'],
     var viewName;
     var viewClass;
     var viewFullName;
+    var view = env.data.view;
 
     Ember['default'].assert(
       "Using {{outlet}} with an unquoted name is not supported.",
@@ -18609,11 +18704,11 @@ enifed('ember-routing-htmlbars/helpers/outlet', ['exports', 'ember-metal/core'],
       );
       Ember['default'].assert(
         "The view name you supplied '" + viewName + "' did not resolve to a view.",
-        this.container._registry.has(viewFullName)
+        view.container._registry.has(viewFullName)
       );
     }
 
-    viewClass = viewName ? this.container.lookupFactory(viewFullName) : hash.viewClass || this.container.lookupFactory('view:-outlet');
+    viewClass = viewName ? view.container.lookupFactory(viewFullName) : hash.viewClass || view.container.lookupFactory('view:-outlet');
     hash._outletName = property;
     options.helperName = options.helperName || 'outlet';
     return env.helpers.view.helperFunction.call(this, [viewClass], hash, options, env);
@@ -18652,12 +18747,13 @@ enifed('ember-routing-htmlbars/helpers/render', ['exports', 'ember-metal/core',
   */
 
   function renderHelper(params, hash, options, env) {
+    var currentView = env.data.view;
     var container, router, controller, view, initialContext;
 
     var name = params[0];
     var context = params[1];
 
-    container = this._keywords.controller.value().container;
+    container = currentView._keywords.controller.value().container;
     router = container.lookup('router:main');
 
     Ember['default'].assert(
@@ -18711,7 +18807,7 @@ enifed('ember-routing-htmlbars/helpers/render', ['exports', 'ember-metal/core',
       controllerFullName = 'controller:' + controllerName;
     }
 
-    var parentController = this._keywords.controller.value();
+    var parentController = currentView._keywords.controller.value();
 
     // choose name
     if (params.length > 1) {
@@ -18757,8 +18853,8 @@ enifed('ember-routing-htmlbars/helpers/render', ['exports', 'ember-metal/core',
       helperName: 'render "' + name + '"'
     };
 
-    mergeViewBindings['default'](this, props, hash);
-    appendTemplatedView['default'](this, options.morph, view, props);
+    mergeViewBindings['default'](currentView, props, hash);
+    appendTemplatedView['default'](currentView, options.morph, view, props);
   }
 
 });
@@ -19011,14 +19107,8 @@ enifed('ember-routing-views/views/link', ['exports', 'ember-metal/core', 'ember-
     _setupPathObservers: function() {
       var params = this.params;
 
-      var scheduledRerender = this._wrapAsScheduled(this.rerender);
       var scheduledParamsChanged = this._wrapAsScheduled(this._paramsChanged);
 
-      if (this.linkTitle) {
-        var linkTitle = this.linkTitle.stream || this.linkTitle;
-        streams__utils.subscribe(linkTitle, scheduledRerender, this);
-      }
-
       for (var i = 0; i < params.length; i++) {
         streams__utils.subscribe(params[i], scheduledParamsChanged, this);
       }
@@ -20877,7 +20967,14 @@ enifed('ember-routing/system/dsl', ['exports', 'ember-metal/core'], function (ex
       }
 
       var type = options.resetNamespace === true ? 'resource' : 'route';
-      Ember['default'].assert("'" + name + "' cannot be used as a " + type + " name.", name !== 'array' && name !== 'basic' && name !== 'object');
+      Ember['default'].assert(
+        "'" + name + "' cannot be used as a " + type + " name.",
+        (function() {
+          if (options.overrideNameAssertion === true) { return true; }
+
+          return ['array', 'basic', 'object', 'application'].indexOf(name) === -1;
+        })()
+      );
 
       
         if (this.enableLoadingSubstates) {
@@ -23101,7 +23198,7 @@ enifed('ember-routing/system/router', ['exports', 'ember-metal/core', 'ember-met
       });
 
       function generateDSL() {
-        this.resource('application', { path: "/" }, function() {
+        this.resource('application', { path: "/", overrideNameAssertion: true }, function() {
           for (var i=0; i < dslCallbacks.length; i++) {
             dslCallbacks[i].call(this);
           }
@@ -34410,7 +34507,7 @@ enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-meta
     var disableComponentGeneration = true;
     
     return {
-      revision: 'Ember@1.11.0-beta.3.780ac356',
+      revision: 'Ember@1.11.0-beta.4.a4140e29',
 
       disableComponentGeneration: disableComponentGeneration,
 
@@ -35771,6 +35868,7 @@ enifed('ember-views/attr_nodes/attr_node', ['exports', 'ember-metal/streams/util
     this.isDirty = true;
     this.isDestroying = false;
     this.lastValue = null;
+    this.hasRenderedInitially = false;
 
     utils.subscribe(this.attrValue, this.rerender, this);
   };
@@ -35798,13 +35896,15 @@ enifed('ember-views/attr_nodes/attr_node', ['exports', 'ember-metal/streams/util
     }
 
     // If user is typing in a value we don't want to rerender and loose cursor position.
-    if (this.attrName === 'value' && this._morph.element.value === value) {
+    if (this.hasRenderedInitially && this.attrName === 'value' && this._morph.element.value === value) {
+      this.lastValue = value;
       return;
     }
 
     if (this.lastValue !== null || value !== null) {
       this._morph.setContent(value);
       this.lastValue = value;
+      this.hasRenderedInitially = true;
     }
   };
 
@@ -40185,7 +40285,7 @@ enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', '
 
   var selectOptionDefaultTemplate = {
     isHTMLBars: true,
-    revision: 'Ember@1.11.0-beta.3.780ac356',
+    revision: 'Ember@1.11.0-beta.4.a4140e29',
     render: function(context, env, contextualElement) {
       var lazyValue = context.getStream('view.label');
 
@@ -42272,6 +42372,7 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-runtime/
       @return {jQuery} the jQuery object for the DOM node
     */
     $: function(sel) {
+      Ember['default'].assert('You cannot access this.$() on a component with `tagName: \'\'` specified.', this.tagName !== '');
       return this.currentState.$(this, sel);
     },