ember.js in ember-source-2.11.1

- old
+ new

@@ -4,14 +4,15 @@
  * @copyright Copyright 2011-2017 Tilde Inc. and contributors
  *            Portions Copyright 2006-2011 Strobe Inc.
  *            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' &&
     typeof process !== 'undefined' && {}.toString.call(process) === '[object process]';
 
@@ -11184,29 +11185,25 @@
     return _emberGlimmerUtilsReferences.UnboundReference.create(args.positional.at(0).value());
   };
 });
 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
   
     Templates manage the flow of an application's UI, and display state (through
     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>
     ```
   
@@ -28258,12 +28255,13 @@
 
         // Loop over each QP to make sure we don't have any collisions by urlKey
         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);
           }
 
           qpsByUrlKey[urlKey] = qp;
@@ -42993,10 +42991,10 @@
 
 // reduced computed macros
 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';
 
   exports.default = applyMixins;