ember-source 2.11.0 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bca2b3e2f37a7cf0d05629a9f48a08a083ab01c3
-  data.tar.gz: 0fa531bded3a40613f8f91407b221fbc8054e31f
+  metadata.gz: ca9110383f1b4dec9887a5788bf91a0aeac3f77b
+  data.tar.gz: 0e58b64003aa19c5e7e3fae4838b52a45b80f1ee
 SHA512:
-  metadata.gz: 3b55e4a112cc372543e53c5dfa1b526d2f6b37588dc1a8c35219a485849862d3ce0bd8ca9ceb1387ddd89dc6955b56bfe14b76776c7e6d69af6fab3c1a684a0b
-  data.tar.gz: f8c18d7ad8510f6c41ff3000d5bcaf71fa1163f7cfbb58c755ac5251babd0393a8129b42874e9478f367c884809b43d16af99fe6f7be0304b0f7892e79994210
+  metadata.gz: 653e5bc31d6ce87614cb2f8a15daec5212b64a22b8f2dcd0704f62df7ceaf08e20e7b10545c150ad4faa7f970dd966c288091667da328a14e3619612f478a3ef
+  data.tar.gz: 4c4340814012d2a318d8380319d74da4a3a785c9cdf80650b45852f4fb7dc275d1f0dd991c0f31db79ff9f21cf5fadfe9de427e5f8ff76b52433e9fa1ca2f399

data/VERSION

@@ -1 +1 @@
-2.11.0
+2.11.1

data/dist/ember-runtime.js

@@ -6,10 +6,11 @@
  *            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   2.11.0
+ * @version   2.11.1
  */
 
 var enifed, requireModule, Ember;
+var mainContext = this; // Used in ember-environment/lib/global.js
 
 (function() {
   var isNode = typeof window === 'undefined' &&
@@ -19413,7 +19414,7 @@ enifed("ember/features", ["exports"], function (exports) {
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.11.0";
+  exports.default = "2.11.1";
 });
 enifed('rsvp', ['exports'], function (exports) {
   'use strict';

data/dist/ember-template-compiler.js

@@ -6,10 +6,11 @@
  *            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   2.11.0
+ * @version   2.11.1
  */
 
 var enifed, requireModule, Ember;
+var mainContext = this; // Used in ember-environment/lib/global.js
 
 (function() {
   var isNode = typeof window === 'undefined' &&
@@ -12023,7 +12024,7 @@ enifed("ember/features", ["exports"], function (exports) {
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.11.0";
+  exports.default = "2.11.1";
 });
 enifed("glimmer-compiler/index", ["exports", "glimmer-compiler/lib/compiler", "glimmer-compiler/lib/template-visitor"], function (exports, _glimmerCompilerLibCompiler, _glimmerCompilerLibTemplateVisitor) {
   "use strict";

data/dist/ember-testing.js

@@ -6,10 +6,11 @@
  *            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   2.11.0
+ * @version   2.11.1
  */
 
 var enifed, requireModule, Ember;
+var mainContext = this; // Used in ember-environment/lib/global.js
 
 (function() {
   var isNode = typeof window === 'undefined' &&

data/dist/ember-tests.js

@@ -6,10 +6,11 @@
  *            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   2.11.0
+ * @version   2.11.1
  */
 
 var enifed, requireModule, Ember;
+var mainContext = this; // Used in ember-environment/lib/global.js
 
 (function() {
   var isNode = typeof window === 'undefined' &&
@@ -71329,7 +71330,7 @@ enifed('ember/tests/routing/query_params_test/model_dependent_state_with_query_p
     return _class3;
   })(ModelDependentQPTestCase));
 });
-enifed('ember/tests/routing/query_params_test/overlapping_query_params_test', ['exports', 'ember-runtime', 'ember-metal', 'internal-test-helpers'], function (exports, _emberRuntime, _emberMetal, _internalTestHelpers) {
+enifed('ember/tests/routing/query_params_test/overlapping_query_params_test', ['exports', 'ember-runtime', 'ember-routing', 'ember-metal', 'internal-test-helpers'], function (exports, _emberRuntime, _emberRouting, _emberMetal, _internalTestHelpers) {
   'use strict';
 
   _internalTestHelpers.moduleFor('Query Params - overlapping query param property names', (function (_QueryParamTestCase) {
@@ -71452,21 +71453,38 @@ enifed('ember/tests/routing/query_params_test/overlapping_query_params_test', ['
       });
     };
 
-    _class.prototype['@test query params in the same route hierarchy with the same url key get auto-scoped'] = function testQueryParamsInTheSameRouteHierarchyWithTheSameUrlKeyGetAutoScoped(assert) {
+    _class.prototype['@test query params does not error when a query parameter exists for route instances that share a controller'] = function testQueryParamsDoesNotErrorWhenAQueryParameterExistsForRouteInstancesThatShareAController(assert) {
       var _this5 = this;
 
       assert.expect(1);
 
+      var parentController = _emberRuntime.Controller.extend({
+        queryParams: { page: 'page' }
+      });
+      this.registerController('parent', parentController);
+      this.registerRoute('parent.child', _emberRouting.Route.extend({ controllerName: 'parent' }));
+
+      return this.setupBase('/parent').then(function () {
+        _this5.transitionTo('parent.child', { queryParams: { page: 2 } });
+        _this5.assertCurrentPath('/parent/child?page=2');
+      });
+    };
+
+    _class.prototype['@test query params in the same route hierarchy with the same url key get auto-scoped'] = function testQueryParamsInTheSameRouteHierarchyWithTheSameUrlKeyGetAutoScoped(assert) {
+      var _this6 = this;
+
+      assert.expect(1);
+
       this.setMappedQPController('parent');
       this.setMappedQPController('parent.child');
 
       expectAssertion(function () {
-        _this5.setupBase();
+        _this6.setupBase();
       }, 'You\'re not allowed to have more than one controller property map to the same query param key, but both `parent:page` and `parent.child:page` map to `parentPage`. You can fix this by mapping one of the controller properties to a different query param key via the `as` config option, e.g. `page: { as: \'other-page\' }`');
     };
 
     _class.prototype['@test Support shared but overridable mixin pattern'] = function testSupportSharedButOverridableMixinPattern(assert) {
-      var _this6 = this;
+      var _this7 = this;
 
       assert.expect(7);
 
@@ -71482,18 +71500,18 @@ enifed('ember/tests/routing/query_params_test/overlapping_query_params_test', ['
       this.registerController('parent.child', _emberRuntime.Controller.extend(HasPage));
 
       return this.setupBase().then(function () {
-        _this6.assertCurrentPath('/parent/child');
+        _this7.assertCurrentPath('/parent/child');
 
-        var parentController = _this6.getController('parent');
-        var parentChildController = _this6.getController('parent.child');
+        var parentController = _this7.getController('parent');
+        var parentChildController = _this7.getController('parent.child');
 
-        _this6.setAndFlush(parentChildController, 'page', 2);
-        _this6.assertCurrentPath('/parent/child?page=2');
+        _this7.setAndFlush(parentChildController, 'page', 2);
+        _this7.assertCurrentPath('/parent/child?page=2');
         assert.equal(parentController.get('page'), 1);
         assert.equal(parentChildController.get('page'), 2);
 
-        _this6.setAndFlush(parentController, 'page', 2);
-        _this6.assertCurrentPath('/parent/child?page=2&yespage=2');
+        _this7.setAndFlush(parentController, 'page', 2);
+        _this7.assertCurrentPath('/parent/child?page=2&yespage=2');
         assert.equal(parentController.get('page'), 2);
         assert.equal(parentChildController.get('page'), 2);
       });

data/dist/ember-tests.prod.js

@@ -6,10 +6,11 @@
  *            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   2.11.0
+ * @version   2.11.1
  */
 
 var enifed, requireModule, Ember;
+var mainContext = this; // Used in ember-environment/lib/global.js
 
 (function() {
   var isNode = typeof window === 'undefined' &&
@@ -70858,7 +70859,7 @@ enifed('ember/tests/routing/query_params_test/model_dependent_state_with_query_p
     return _class3;
   })(ModelDependentQPTestCase));
 });
-enifed('ember/tests/routing/query_params_test/overlapping_query_params_test', ['exports', 'ember-runtime', 'ember-metal', 'internal-test-helpers'], function (exports, _emberRuntime, _emberMetal, _internalTestHelpers) {
+enifed('ember/tests/routing/query_params_test/overlapping_query_params_test', ['exports', 'ember-runtime', 'ember-routing', 'ember-metal', 'internal-test-helpers'], function (exports, _emberRuntime, _emberRouting, _emberMetal, _internalTestHelpers) {
   'use strict';
 
   _internalTestHelpers.moduleFor('Query Params - overlapping query param property names', (function (_QueryParamTestCase) {
@@ -70979,21 +70980,38 @@ enifed('ember/tests/routing/query_params_test/overlapping_query_params_test', ['
       });
     };
 
-    _class.prototype['@test query params in the same route hierarchy with the same url key get auto-scoped'] = function testQueryParamsInTheSameRouteHierarchyWithTheSameUrlKeyGetAutoScoped(assert) {
+    _class.prototype['@test query params does not error when a query parameter exists for route instances that share a controller'] = function testQueryParamsDoesNotErrorWhenAQueryParameterExistsForRouteInstancesThatShareAController(assert) {
       var _this5 = this;
 
       assert.expect(1);
 
+      var parentController = _emberRuntime.Controller.extend({
+        queryParams: { page: 'page' }
+      });
+      this.registerController('parent', parentController);
+      this.registerRoute('parent.child', _emberRouting.Route.extend({ controllerName: 'parent' }));
+
+      return this.setupBase('/parent').then(function () {
+        _this5.transitionTo('parent.child', { queryParams: { page: 2 } });
+        _this5.assertCurrentPath('/parent/child?page=2');
+      });
+    };
+
+    _class.prototype['@test query params in the same route hierarchy with the same url key get auto-scoped'] = function testQueryParamsInTheSameRouteHierarchyWithTheSameUrlKeyGetAutoScoped(assert) {
+      var _this6 = this;
+
+      assert.expect(1);
+
       this.setMappedQPController('parent');
       this.setMappedQPController('parent.child');
 
       expectAssertion(function () {
-        _this5.setupBase();
+        _this6.setupBase();
       }, 'You\'re not allowed to have more than one controller property map to the same query param key, but both `parent:page` and `parent.child:page` map to `parentPage`. You can fix this by mapping one of the controller properties to a different query param key via the `as` config option, e.g. `page: { as: \'other-page\' }`');
     };
 
     _class.prototype['@test Support shared but overridable mixin pattern'] = function testSupportSharedButOverridableMixinPattern(assert) {
-      var _this6 = this;
+      var _this7 = this;
 
       assert.expect(7);
 
@@ -71009,18 +71027,18 @@ enifed('ember/tests/routing/query_params_test/overlapping_query_params_test', ['
       this.registerController('parent.child', _emberRuntime.Controller.extend(HasPage));
 
       return this.setupBase().then(function () {
-        _this6.assertCurrentPath('/parent/child');
+        _this7.assertCurrentPath('/parent/child');
 
-        var parentController = _this6.getController('parent');
-        var parentChildController = _this6.getController('parent.child');
+        var parentController = _this7.getController('parent');
+        var parentChildController = _this7.getController('parent.child');
 
-        _this6.setAndFlush(parentChildController, 'page', 2);
-        _this6.assertCurrentPath('/parent/child?page=2');
+        _this7.setAndFlush(parentChildController, 'page', 2);
+        _this7.assertCurrentPath('/parent/child?page=2');
         assert.equal(parentController.get('page'), 1);
         assert.equal(parentChildController.get('page'), 2);
 
-        _this6.setAndFlush(parentController, 'page', 2);
-        _this6.assertCurrentPath('/parent/child?page=2&yespage=2');
+        _this7.setAndFlush(parentController, 'page', 2);
+        _this7.assertCurrentPath('/parent/child?page=2&yespage=2');
         assert.equal(parentController.get('page'), 2);
         assert.equal(parentChildController.get('page'), 2);
       });

data/dist/ember.debug.js

@@ -6,10 +6,11 @@
  *            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   2.11.0
+ * @version   2.11.1
  */
 
 var enifed, requireModule, Ember;
+var mainContext = this; // Used in ember-environment/lib/global.js
 
 (function() {
   var isNode = typeof window === 'undefined' &&
@@ -11186,9 +11187,7 @@ enifed('ember-glimmer/helpers/unbound', ['exports', 'ember-metal', 'ember-glimme
 });
 enifed('ember-glimmer/index', ['exports', 'ember-glimmer/helpers/action', 'ember-glimmer/templates/root', 'ember-glimmer/syntax', 'ember-glimmer/template', 'ember-glimmer/components/checkbox', 'ember-glimmer/components/text_field', 'ember-glimmer/components/text_area', 'ember-glimmer/components/link-to', 'ember-glimmer/component', 'ember-glimmer/helper', 'ember-glimmer/environment', 'ember-glimmer/make-bound-helper', 'ember-glimmer/utils/string', 'ember-glimmer/renderer', 'ember-glimmer/template_registry', 'ember-glimmer/setup-registry', 'ember-glimmer/dom'], function (exports, _emberGlimmerHelpersAction, _emberGlimmerTemplatesRoot, _emberGlimmerSyntax, _emberGlimmerTemplate, _emberGlimmerComponentsCheckbox, _emberGlimmerComponentsText_field, _emberGlimmerComponentsText_area, _emberGlimmerComponentsLinkTo, _emberGlimmerComponent, _emberGlimmerHelper, _emberGlimmerEnvironment, _emberGlimmerMakeBoundHelper, _emberGlimmerUtilsString, _emberGlimmerRenderer, _emberGlimmerTemplate_registry, _emberGlimmerSetupRegistry, _emberGlimmerDom) {
   /**
-    [Glimmer](https://github.com/tildeio/glimmer) is a [Handlebars](http://handlebarsjs.com/)
-    compatible templating engine used by Ember.js.
-    Any valid Handlebars syntax is valid in an Ember template.
+    [Glimmer](https://github.com/tildeio/glimmer) is a templating engine used by Ember.js that is compatible with a subset of the [Handlebars](http://handlebarsjs.com/) syntax.
   
     ### Showing a property
   
@@ -11196,15 +11195,13 @@ enifed('ember-glimmer/index', ['exports', 'ember-glimmer/helpers/action', 'ember
     the DOM) to a user. For example, given a component with the property "name",
     that component's template can use the name in several ways:
   
-    ```javascript
-      // app/components/person.js
+    ```app/components/person.js
       export default Ember.Component.extend({
         name: 'Jill'
       });
     ```
   
-    ```handlebars
-    {{! app/components/person.hbs }}
+    ```app/components/person.hbs
     {{name}}
     <div>{{name}}</div>
     <span data-name={{name}}></span>
@@ -28260,8 +28257,9 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
         for (var _i = 0; _i < qpMeta.qps.length; _i++) {
           var qp = qpMeta.qps[_i];
           var urlKey = qp.urlKey;
+          var qpOther = qpsByUrlKey[urlKey];
 
-          if (qpsByUrlKey[urlKey]) {
+          if (qpOther && qpOther.controllerName !== qp.controllerName) {
             var otherQP = qpsByUrlKey[urlKey];
             _emberMetal.assert('You\'re not allowed to have more than one controller property map to the same query param key, but both `' + otherQP.scopedPropertyName + '` and `' + qp.scopedPropertyName + '` map to `' + urlKey + '`. You can fix this by mapping one of the controller properties to a different query param key via the `as` config option, e.g. `' + otherQP.prop + ': { as: \'other-' + otherQP.prop + '\' }`', false);
           }
@@ -42995,7 +42993,7 @@ enifed('ember/index', ['exports', 'require', 'ember-environment', 'ember-utils',
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.11.0";
+  exports.default = "2.11.1";
 });
 enifed('internal-test-helpers/apply-mixins', ['exports', 'ember-utils'], function (exports, _emberUtils) {
   'use strict';

data/dist/ember.js

@@ -6,10 +6,11 @@
  *            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   2.11.0
+ * @version   2.11.1
  */
 
 var enifed, requireModule, Ember;
+var mainContext = this; // Used in ember-environment/lib/global.js
 
 (function() {
   var isNode = typeof window === 'undefined' &&
@@ -11186,9 +11187,7 @@ enifed('ember-glimmer/helpers/unbound', ['exports', 'ember-metal', 'ember-glimme
 });
 enifed('ember-glimmer/index', ['exports', 'ember-glimmer/helpers/action', 'ember-glimmer/templates/root', 'ember-glimmer/syntax', 'ember-glimmer/template', 'ember-glimmer/components/checkbox', 'ember-glimmer/components/text_field', 'ember-glimmer/components/text_area', 'ember-glimmer/components/link-to', 'ember-glimmer/component', 'ember-glimmer/helper', 'ember-glimmer/environment', 'ember-glimmer/make-bound-helper', 'ember-glimmer/utils/string', 'ember-glimmer/renderer', 'ember-glimmer/template_registry', 'ember-glimmer/setup-registry', 'ember-glimmer/dom'], function (exports, _emberGlimmerHelpersAction, _emberGlimmerTemplatesRoot, _emberGlimmerSyntax, _emberGlimmerTemplate, _emberGlimmerComponentsCheckbox, _emberGlimmerComponentsText_field, _emberGlimmerComponentsText_area, _emberGlimmerComponentsLinkTo, _emberGlimmerComponent, _emberGlimmerHelper, _emberGlimmerEnvironment, _emberGlimmerMakeBoundHelper, _emberGlimmerUtilsString, _emberGlimmerRenderer, _emberGlimmerTemplate_registry, _emberGlimmerSetupRegistry, _emberGlimmerDom) {
   /**
-    [Glimmer](https://github.com/tildeio/glimmer) is a [Handlebars](http://handlebarsjs.com/)
-    compatible templating engine used by Ember.js.
-    Any valid Handlebars syntax is valid in an Ember template.
+    [Glimmer](https://github.com/tildeio/glimmer) is a templating engine used by Ember.js that is compatible with a subset of the [Handlebars](http://handlebarsjs.com/) syntax.
   
     ### Showing a property
   
@@ -11196,15 +11195,13 @@ enifed('ember-glimmer/index', ['exports', 'ember-glimmer/helpers/action', 'ember
     the DOM) to a user. For example, given a component with the property "name",
     that component's template can use the name in several ways:
   
-    ```javascript
-      // app/components/person.js
+    ```app/components/person.js
       export default Ember.Component.extend({
         name: 'Jill'
       });
     ```
   
-    ```handlebars
-    {{! app/components/person.hbs }}
+    ```app/components/person.hbs
     {{name}}
     <div>{{name}}</div>
     <span data-name={{name}}></span>
@@ -28260,8 +28257,9 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
         for (var _i = 0; _i < qpMeta.qps.length; _i++) {
           var qp = qpMeta.qps[_i];
           var urlKey = qp.urlKey;
+          var qpOther = qpsByUrlKey[urlKey];
 
-          if (qpsByUrlKey[urlKey]) {
+          if (qpOther && qpOther.controllerName !== qp.controllerName) {
             var otherQP = qpsByUrlKey[urlKey];
             _emberMetal.assert('You\'re not allowed to have more than one controller property map to the same query param key, but both `' + otherQP.scopedPropertyName + '` and `' + qp.scopedPropertyName + '` map to `' + urlKey + '`. You can fix this by mapping one of the controller properties to a different query param key via the `as` config option, e.g. `' + otherQP.prop + ': { as: \'other-' + otherQP.prop + '\' }`', false);
           }
@@ -42995,7 +42993,7 @@ enifed('ember/index', ['exports', 'require', 'ember-environment', 'ember-utils',
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.11.0";
+  exports.default = "2.11.1";
 });
 enifed('internal-test-helpers/apply-mixins', ['exports', 'ember-utils'], function (exports, _emberUtils) {
   'use strict';

data/dist/ember.min.js

@@ -1,7 +1,7 @@
 (function(){function e(e,t){e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):o(e,t))}function t(e,t){return e.raw=t,e}function n(e,t){for(var n=0;n<t.length;n++){var r=t[n]
 r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function r(e,t,r){return t&&n(e.prototype,t),r&&n(e,r),e}function i(e,t){var n=t({},e)
 return delete n.default,n}function o(e,t){for(var n=Object.getOwnPropertyNames(t),r=0;r<n.length;r++){var i=n[r],o=Object.getOwnPropertyDescriptor(t,i)
-o&&o.configurable&&void 0===e[i]&&Object.defineProperty(e,i,o)}return e}var s,a,u;(function(){function e(e,t){throw t?new Error("Could not find module "+e+" required by: "+t):new Error("Could not find module "+e)}function t(n,o){var s=n,u=r[s]
+o&&o.configurable&&void 0===e[i]&&Object.defineProperty(e,i,o)}return e}var s,a,u,l=this;(function(){function e(e,t){throw t?new Error("Could not find module "+e+" required by: "+t):new Error("Could not find module "+e)}function t(n,o){var s=n,u=r[s]
 u||(s+="/index",u=r[s])
 var l=i[s]
 if(void 0!==l)return l
@@ -297,7 +297,7 @@ function n(){}function r(e){var n=void 0
 t.context.imports.console?n=t.context.imports.console:"undefined"!=typeof console&&(n=console)
 var r="object"==typeof n?n[e]:null
 if("function"==typeof r)return"function"==typeof r.bind?r.bind(n):function(){r.apply(n,arguments)}}function i(e,t){if(!e)try{throw new Error("assertion failed: "+t)}catch(e){setTimeout(function(){throw e},0)}}e.default={log:r("log")||n,warn:r("warn")||n,error:r("error")||n,info:r("info")||n,debug:r("debug")||r("info")||n,assert:r("assert")||i}}),s("ember-environment/global",["exports"],function(e){"use strict"
-function t(e){return e&&e.Object===Object?e:void 0}function n(e){return e&&void 0===e.nodeType?e:void 0}e.default=t(n("object"==typeof global&&global))||t("object"==typeof self&&self)||t("object"==typeof window&&window)||mainContext||new Function("return this")()}),s("ember-environment/index",["exports","ember-environment/global","ember-environment/utils"],function(e,t,n){"use strict"
+function t(e){return e&&e.Object===Object?e:void 0}function n(e){return e&&void 0===e.nodeType?e:void 0}e.default=t(n("object"==typeof global&&global))||t("object"==typeof self&&self)||t("object"==typeof window&&window)||l||new Function("return this")()}),s("ember-environment/index",["exports","ember-environment/global","ember-environment/utils"],function(e,t,n){"use strict"
 var r="object"==typeof t.default.EmberENV&&t.default.EmberENV||"object"==typeof t.default.ENV&&t.default.ENV||{}
 e.ENV=r,r.ENABLE_ALL_FEATURES&&(r.ENABLE_OPTIONAL_FEATURES=!0),r.EXTEND_PROTOTYPES=n.normalizeExtendPrototypes(r.EXTEND_PROTOTYPES),r.LOG_STACKTRACE_ON_DEPRECATION=n.defaultTrue(r.LOG_STACKTRACE_ON_DEPRECATION),r.LOG_VERSION=n.defaultTrue(r.LOG_VERSION),r.MODEL_FACTORY_INJECTIONS=n.defaultFalse(r.MODEL_FACTORY_INJECTIONS),r.LOG_BINDINGS=n.defaultFalse(r.LOG_BINDINGS),r.RAISE_ON_DEPRECATION=n.defaultFalse(r.RAISE_ON_DEPRECATION)
 var i="undefined"!=typeof window&&window===t.default&&window.document&&window.document.createElement&&!r.disableBrowserEnvironment,o=t.default.Ember||{},s={imports:o.imports||t.default,exports:o.exports||t.default,lookup:o.lookup||t.default}
@@ -1560,9 +1560,9 @@ this._hydrateUnsuppliedQueryParams(r,n),this._serializeQueryParams(r.handlerInfo
 return t&&r.get(t,"_qp")},_queryParamsFor:function(e){var n=e[e.length-1].name
 if(this._qpCache[n])return this._qpCache[n]
 for(var r=!0,i={},o={},s=[],a=0;a<e.length;++a){var u=this._getQPMeta(e[a])
-if(u){for(var l=0;l<u.qps.length;l++){var c=u.qps[l],p=c.urlKey
-if(i[p]){i[p]}i[p]=c,s.push(c)}t.assign(o,u.map)}else r=!1}var h={qps:s,map:o}
-return r&&(this._qpCache[n]=h),h},_fullyScopeQueryParams:function(e,t,n){for(var r=y(this,e,t),i=r.handlerInfos,o=0,s=i.length;o<s;++o){var a=this._getQPMeta(i[o])
+if(u){for(var l=0;l<u.qps.length;l++){var c=u.qps[l],p=c.urlKey,h=i[p]
+if(h&&h.controllerName!==c.controllerName){i[p]}i[p]=c,s.push(c)}t.assign(o,u.map)}else r=!1}var f={qps:s,map:o}
+return r&&(this._qpCache[n]=f),f},_fullyScopeQueryParams:function(e,t,n){for(var r=y(this,e,t),i=r.handlerInfos,o=0,s=i.length;o<s;++o){var a=this._getQPMeta(i[o])
 if(a)for(var u=0,l=a.qps.length;u<l;++u){var c=a.qps[u],p=c.prop in n&&c.prop||c.scopedPropertyName in n&&c.scopedPropertyName||c.urlKey in n&&c.urlKey
 p&&p!==c.scopedPropertyName&&(n[c.scopedPropertyName]=n[p],delete n[p])}}},_hydrateUnsuppliedQueryParams:function(e,t){for(var n=e.handlerInfos,r=this._bucketCache,i=0;i<n.length;++i){var o=this._getQPMeta(n[i])
 if(o)for(var s=0,a=o.qps.length;s<a;++s){var l=o.qps[s],c=l.prop in t&&l.prop||l.scopedPropertyName in t&&l.scopedPropertyName||l.urlKey in t&&l.urlKey
@@ -2161,7 +2161,7 @@ d.setDiff=u.setDiff,d.mapBy=u.mapBy,d.filter=u.filter,d.filterBy=u.filterBy,d.un
 var g=o.default.Handlebars=o.default.Handlebars||{},v=o.default.HTMLBars=o.default.HTMLBars||{},y=g.Utils=g.Utils||{}
 if(Object.defineProperty(g,"SafeString",{get:l._getSafeString}),v.template=g.template=l.template,y.escapeExpression=l.escapeExpression,u.String.htmlSafe=l.htmlSafe,u.String.isHTMLSafe=l.isHTMLSafe,v.makeBoundHelper=l.makeBoundHelper,Object.defineProperty(o.default,"TEMPLATES",{get:l.getTemplates,set:l.setTemplates,configurable:!1,enumerable:!1}),e.VERSION=c.default,o.default.VERSION=c.default,o.libraries.registerCoreLibrary("Ember",c.default),o.default.create=o.deprecateFunc("Ember.create is deprecated in favor of Object.create",{id:"ember-metal.ember-create",until:"3.0.0"},Object.create),o.default.keys=o.deprecateFunc("Ember.keys is deprecated in favor of Object.keys",{id:"ember-metal.ember.keys",until:"3.0.0"},Object.keys),o.default.$=p.jQuery,o.default.ViewTargetActionSupport=p.ViewTargetActionSupport,o.default.ViewUtils={isSimpleClick:p.isSimpleClick,getViewElement:p.getViewElement,getViewBounds:p.getViewBounds,getViewClientRects:p.getViewClientRects,getViewBoundingClientRect:p.getViewBoundingClientRect,getRootViews:p.getRootViews,getChildViews:p.getChildViews},o.default.TextSupport=p.TextSupport,o.default.ComponentLookup=p.ComponentLookup,o.default.EventDispatcher=p.EventDispatcher,o.default.Location=h.Location,o.default.AutoLocation=h.AutoLocation,o.default.HashLocation=h.HashLocation,o.default.HistoryLocation=h.HistoryLocation,o.default.NoneLocation=h.NoneLocation,o.default.controllerFor=h.controllerFor,o.default.generateControllerFactory=h.generateControllerFactory,o.default.generateController=h.generateController,o.default.RouterDSL=h.RouterDSL,o.default.Router=h.Router,o.default.Route=h.Route,o.default.Application=f.Application,o.default.ApplicationInstance=f.ApplicationInstance,o.default.Engine=f.Engine,o.default.EngineInstance=f.EngineInstance,o.default.DefaultResolver=o.default.Resolver=f.Resolver,u.runLoadHooks("Ember.Application",f.Application),o.default.DataAdapter=m.DataAdapter,o.default.ContainerDebugAdapter=m.ContainerDebugAdapter,t.has("ember-template-compiler")&&t.default("ember-template-compiler"),t.has("ember-testing")){var b=t.default("ember-testing")
 o.default.Test=b.Test,o.default.Test.Adapter=b.Adapter,o.default.Test.QUnitAdapter=b.QUnitAdapter,o.default.setupForTesting=b.setupForTesting}u.runLoadHooks("Ember"),e.default=o.default,"object"==typeof module&&module.exports?module.exports=o.default:n.context.exports.Ember=n.context.exports.Em=o.default}),s("ember/version",["exports"],function(e){"use strict"
-e.default="2.11.0"}),s("internal-test-helpers/apply-mixins",["exports","ember-utils"],function(e,t){"use strict"
+e.default="2.11.1"}),s("internal-test-helpers/apply-mixins",["exports","ember-utils"],function(e,t){"use strict"
 function n(e){return Array.isArray(e.cases)&&"function"==typeof e.generate}function r(e){for(var r=arguments.length,i=Array(r>1?r-1:0),o=1;o<r;o++)i[o-1]=arguments[o]
 return i.forEach(function(r){var i=void 0
 n(r)?function(){var e=r

data/dist/ember.prod.js

@@ -6,10 +6,11 @@
  *            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   2.11.0
+ * @version   2.11.1
  */
 
 var enifed, requireModule, Ember;
+var mainContext = this; // Used in ember-environment/lib/global.js
 
 (function() {
   var isNode = typeof window === 'undefined' &&
@@ -10410,9 +10411,7 @@ enifed('ember-glimmer/helpers/unbound', ['exports', 'ember-metal', 'ember-glimme
 });
 enifed('ember-glimmer/index', ['exports', 'ember-glimmer/helpers/action', 'ember-glimmer/templates/root', 'ember-glimmer/syntax', 'ember-glimmer/template', 'ember-glimmer/components/checkbox', 'ember-glimmer/components/text_field', 'ember-glimmer/components/text_area', 'ember-glimmer/components/link-to', 'ember-glimmer/component', 'ember-glimmer/helper', 'ember-glimmer/environment', 'ember-glimmer/make-bound-helper', 'ember-glimmer/utils/string', 'ember-glimmer/renderer', 'ember-glimmer/template_registry', 'ember-glimmer/setup-registry', 'ember-glimmer/dom'], function (exports, _emberGlimmerHelpersAction, _emberGlimmerTemplatesRoot, _emberGlimmerSyntax, _emberGlimmerTemplate, _emberGlimmerComponentsCheckbox, _emberGlimmerComponentsText_field, _emberGlimmerComponentsText_area, _emberGlimmerComponentsLinkTo, _emberGlimmerComponent, _emberGlimmerHelper, _emberGlimmerEnvironment, _emberGlimmerMakeBoundHelper, _emberGlimmerUtilsString, _emberGlimmerRenderer, _emberGlimmerTemplate_registry, _emberGlimmerSetupRegistry, _emberGlimmerDom) {
   /**
-    [Glimmer](https://github.com/tildeio/glimmer) is a [Handlebars](http://handlebarsjs.com/)
-    compatible templating engine used by Ember.js.
-    Any valid Handlebars syntax is valid in an Ember template.
+    [Glimmer](https://github.com/tildeio/glimmer) is a templating engine used by Ember.js that is compatible with a subset of the [Handlebars](http://handlebarsjs.com/) syntax.
   
     ### Showing a property
   
@@ -10420,15 +10419,13 @@ enifed('ember-glimmer/index', ['exports', 'ember-glimmer/helpers/action', 'ember
     the DOM) to a user. For example, given a component with the property "name",
     that component's template can use the name in several ways:
   
-    ```javascript
-      // app/components/person.js
+    ```app/components/person.js
       export default Ember.Component.extend({
         name: 'Jill'
       });
     ```
   
-    ```handlebars
-    {{! app/components/person.hbs }}
+    ```app/components/person.hbs
     {{name}}
     <div>{{name}}</div>
     <span data-name={{name}}></span>
@@ -26866,8 +26863,9 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
         for (var _i = 0; _i < qpMeta.qps.length; _i++) {
           var qp = qpMeta.qps[_i];
           var urlKey = qp.urlKey;
+          var qpOther = qpsByUrlKey[urlKey];
 
-          if (qpsByUrlKey[urlKey]) {
+          if (qpOther && qpOther.controllerName !== qp.controllerName) {
             var otherQP = qpsByUrlKey[urlKey];
           }
 
@@ -39776,7 +39774,7 @@ enifed('ember/index', ['exports', 'require', 'ember-environment', 'ember-utils',
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.11.0";
+  exports.default = "2.11.1";
 });
 enifed('internal-test-helpers/apply-mixins', ['exports', 'ember-utils'], function (exports, _emberUtils) {
   'use strict';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember-source
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.1
 platform: ruby
 authors:
 - Yehuda Katz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies: []
 description: Ember.js source code wrapper for use with Ruby libs.
 email: