ember-source 2.11.0 → 2.11.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bca2b3e2f37a7cf0d05629a9f48a08a083ab01c3
4
- data.tar.gz: 0fa531bded3a40613f8f91407b221fbc8054e31f
3
+ metadata.gz: ca9110383f1b4dec9887a5788bf91a0aeac3f77b
4
+ data.tar.gz: 0e58b64003aa19c5e7e3fae4838b52a45b80f1ee
5
5
  SHA512:
6
- metadata.gz: 3b55e4a112cc372543e53c5dfa1b526d2f6b37588dc1a8c35219a485849862d3ce0bd8ca9ceb1387ddd89dc6955b56bfe14b76776c7e6d69af6fab3c1a684a0b
7
- data.tar.gz: f8c18d7ad8510f6c41ff3000d5bcaf71fa1163f7cfbb58c755ac5251babd0393a8129b42874e9478f367c884809b43d16af99fe6f7be0304b0f7892e79994210
6
+ metadata.gz: 653e5bc31d6ce87614cb2f8a15daec5212b64a22b8f2dcd0704f62df7ceaf08e20e7b10545c150ad4faa7f970dd966c288091667da328a14e3619612f478a3ef
7
+ data.tar.gz: 4c4340814012d2a318d8380319d74da4a3a785c9cdf80650b45852f4fb7dc275d1f0dd991c0f31db79ff9f21cf5fadfe9de427e5f8ff76b52433e9fa1ca2f399
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.11.0
1
+ 2.11.1
@@ -6,10 +6,11 @@
6
6
  * Portions Copyright 2008-2011 Apple Inc. All rights reserved.
7
7
  * @license Licensed under MIT license
8
8
  * See https://raw.github.com/emberjs/ember.js/master/LICENSE
9
- * @version 2.11.0
9
+ * @version 2.11.1
10
10
  */
11
11
 
12
12
  var enifed, requireModule, Ember;
13
+ var mainContext = this; // Used in ember-environment/lib/global.js
13
14
 
14
15
  (function() {
15
16
  var isNode = typeof window === 'undefined' &&
@@ -19413,7 +19414,7 @@ enifed("ember/features", ["exports"], function (exports) {
19413
19414
  enifed("ember/version", ["exports"], function (exports) {
19414
19415
  "use strict";
19415
19416
 
19416
- exports.default = "2.11.0";
19417
+ exports.default = "2.11.1";
19417
19418
  });
19418
19419
  enifed('rsvp', ['exports'], function (exports) {
19419
19420
  'use strict';
@@ -6,10 +6,11 @@
6
6
  * Portions Copyright 2008-2011 Apple Inc. All rights reserved.
7
7
  * @license Licensed under MIT license
8
8
  * See https://raw.github.com/emberjs/ember.js/master/LICENSE
9
- * @version 2.11.0
9
+ * @version 2.11.1
10
10
  */
11
11
 
12
12
  var enifed, requireModule, Ember;
13
+ var mainContext = this; // Used in ember-environment/lib/global.js
13
14
 
14
15
  (function() {
15
16
  var isNode = typeof window === 'undefined' &&
@@ -12023,7 +12024,7 @@ enifed("ember/features", ["exports"], function (exports) {
12023
12024
  enifed("ember/version", ["exports"], function (exports) {
12024
12025
  "use strict";
12025
12026
 
12026
- exports.default = "2.11.0";
12027
+ exports.default = "2.11.1";
12027
12028
  });
12028
12029
  enifed("glimmer-compiler/index", ["exports", "glimmer-compiler/lib/compiler", "glimmer-compiler/lib/template-visitor"], function (exports, _glimmerCompilerLibCompiler, _glimmerCompilerLibTemplateVisitor) {
12029
12030
  "use strict";
@@ -6,10 +6,11 @@
6
6
  * Portions Copyright 2008-2011 Apple Inc. All rights reserved.
7
7
  * @license Licensed under MIT license
8
8
  * See https://raw.github.com/emberjs/ember.js/master/LICENSE
9
- * @version 2.11.0
9
+ * @version 2.11.1
10
10
  */
11
11
 
12
12
  var enifed, requireModule, Ember;
13
+ var mainContext = this; // Used in ember-environment/lib/global.js
13
14
 
14
15
  (function() {
15
16
  var isNode = typeof window === 'undefined' &&
data/dist/ember-tests.js CHANGED
@@ -6,10 +6,11 @@
6
6
  * Portions Copyright 2008-2011 Apple Inc. All rights reserved.
7
7
  * @license Licensed under MIT license
8
8
  * See https://raw.github.com/emberjs/ember.js/master/LICENSE
9
- * @version 2.11.0
9
+ * @version 2.11.1
10
10
  */
11
11
 
12
12
  var enifed, requireModule, Ember;
13
+ var mainContext = this; // Used in ember-environment/lib/global.js
13
14
 
14
15
  (function() {
15
16
  var isNode = typeof window === 'undefined' &&
@@ -71329,7 +71330,7 @@ enifed('ember/tests/routing/query_params_test/model_dependent_state_with_query_p
71329
71330
  return _class3;
71330
71331
  })(ModelDependentQPTestCase));
71331
71332
  });
71332
- enifed('ember/tests/routing/query_params_test/overlapping_query_params_test', ['exports', 'ember-runtime', 'ember-metal', 'internal-test-helpers'], function (exports, _emberRuntime, _emberMetal, _internalTestHelpers) {
71333
+ 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) {
71333
71334
  'use strict';
71334
71335
 
71335
71336
  _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', ['
71452
71453
  });
71453
71454
  };
71454
71455
 
71455
- _class.prototype['@test query params in the same route hierarchy with the same url key get auto-scoped'] = function testQueryParamsInTheSameRouteHierarchyWithTheSameUrlKeyGetAutoScoped(assert) {
71456
+ _class.prototype['@test query params does not error when a query parameter exists for route instances that share a controller'] = function testQueryParamsDoesNotErrorWhenAQueryParameterExistsForRouteInstancesThatShareAController(assert) {
71456
71457
  var _this5 = this;
71457
71458
 
71458
71459
  assert.expect(1);
71459
71460
 
71461
+ var parentController = _emberRuntime.Controller.extend({
71462
+ queryParams: { page: 'page' }
71463
+ });
71464
+ this.registerController('parent', parentController);
71465
+ this.registerRoute('parent.child', _emberRouting.Route.extend({ controllerName: 'parent' }));
71466
+
71467
+ return this.setupBase('/parent').then(function () {
71468
+ _this5.transitionTo('parent.child', { queryParams: { page: 2 } });
71469
+ _this5.assertCurrentPath('/parent/child?page=2');
71470
+ });
71471
+ };
71472
+
71473
+ _class.prototype['@test query params in the same route hierarchy with the same url key get auto-scoped'] = function testQueryParamsInTheSameRouteHierarchyWithTheSameUrlKeyGetAutoScoped(assert) {
71474
+ var _this6 = this;
71475
+
71476
+ assert.expect(1);
71477
+
71460
71478
  this.setMappedQPController('parent');
71461
71479
  this.setMappedQPController('parent.child');
71462
71480
 
71463
71481
  expectAssertion(function () {
71464
- _this5.setupBase();
71482
+ _this6.setupBase();
71465
71483
  }, '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\' }`');
71466
71484
  };
71467
71485
 
71468
71486
  _class.prototype['@test Support shared but overridable mixin pattern'] = function testSupportSharedButOverridableMixinPattern(assert) {
71469
- var _this6 = this;
71487
+ var _this7 = this;
71470
71488
 
71471
71489
  assert.expect(7);
71472
71490
 
@@ -71482,18 +71500,18 @@ enifed('ember/tests/routing/query_params_test/overlapping_query_params_test', ['
71482
71500
  this.registerController('parent.child', _emberRuntime.Controller.extend(HasPage));
71483
71501
 
71484
71502
  return this.setupBase().then(function () {
71485
- _this6.assertCurrentPath('/parent/child');
71503
+ _this7.assertCurrentPath('/parent/child');
71486
71504
 
71487
- var parentController = _this6.getController('parent');
71488
- var parentChildController = _this6.getController('parent.child');
71505
+ var parentController = _this7.getController('parent');
71506
+ var parentChildController = _this7.getController('parent.child');
71489
71507
 
71490
- _this6.setAndFlush(parentChildController, 'page', 2);
71491
- _this6.assertCurrentPath('/parent/child?page=2');
71508
+ _this7.setAndFlush(parentChildController, 'page', 2);
71509
+ _this7.assertCurrentPath('/parent/child?page=2');
71492
71510
  assert.equal(parentController.get('page'), 1);
71493
71511
  assert.equal(parentChildController.get('page'), 2);
71494
71512
 
71495
- _this6.setAndFlush(parentController, 'page', 2);
71496
- _this6.assertCurrentPath('/parent/child?page=2&yespage=2');
71513
+ _this7.setAndFlush(parentController, 'page', 2);
71514
+ _this7.assertCurrentPath('/parent/child?page=2&yespage=2');
71497
71515
  assert.equal(parentController.get('page'), 2);
71498
71516
  assert.equal(parentChildController.get('page'), 2);
71499
71517
  });
@@ -6,10 +6,11 @@
6
6
  * Portions Copyright 2008-2011 Apple Inc. All rights reserved.
7
7
  * @license Licensed under MIT license
8
8
  * See https://raw.github.com/emberjs/ember.js/master/LICENSE
9
- * @version 2.11.0
9
+ * @version 2.11.1
10
10
  */
11
11
 
12
12
  var enifed, requireModule, Ember;
13
+ var mainContext = this; // Used in ember-environment/lib/global.js
13
14
 
14
15
  (function() {
15
16
  var isNode = typeof window === 'undefined' &&
@@ -70858,7 +70859,7 @@ enifed('ember/tests/routing/query_params_test/model_dependent_state_with_query_p
70858
70859
  return _class3;
70859
70860
  })(ModelDependentQPTestCase));
70860
70861
  });
70861
- enifed('ember/tests/routing/query_params_test/overlapping_query_params_test', ['exports', 'ember-runtime', 'ember-metal', 'internal-test-helpers'], function (exports, _emberRuntime, _emberMetal, _internalTestHelpers) {
70862
+ 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) {
70862
70863
  'use strict';
70863
70864
 
70864
70865
  _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', ['
70979
70980
  });
70980
70981
  };
70981
70982
 
70982
- _class.prototype['@test query params in the same route hierarchy with the same url key get auto-scoped'] = function testQueryParamsInTheSameRouteHierarchyWithTheSameUrlKeyGetAutoScoped(assert) {
70983
+ _class.prototype['@test query params does not error when a query parameter exists for route instances that share a controller'] = function testQueryParamsDoesNotErrorWhenAQueryParameterExistsForRouteInstancesThatShareAController(assert) {
70983
70984
  var _this5 = this;
70984
70985
 
70985
70986
  assert.expect(1);
70986
70987
 
70988
+ var parentController = _emberRuntime.Controller.extend({
70989
+ queryParams: { page: 'page' }
70990
+ });
70991
+ this.registerController('parent', parentController);
70992
+ this.registerRoute('parent.child', _emberRouting.Route.extend({ controllerName: 'parent' }));
70993
+
70994
+ return this.setupBase('/parent').then(function () {
70995
+ _this5.transitionTo('parent.child', { queryParams: { page: 2 } });
70996
+ _this5.assertCurrentPath('/parent/child?page=2');
70997
+ });
70998
+ };
70999
+
71000
+ _class.prototype['@test query params in the same route hierarchy with the same url key get auto-scoped'] = function testQueryParamsInTheSameRouteHierarchyWithTheSameUrlKeyGetAutoScoped(assert) {
71001
+ var _this6 = this;
71002
+
71003
+ assert.expect(1);
71004
+
70987
71005
  this.setMappedQPController('parent');
70988
71006
  this.setMappedQPController('parent.child');
70989
71007
 
70990
71008
  expectAssertion(function () {
70991
- _this5.setupBase();
71009
+ _this6.setupBase();
70992
71010
  }, '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\' }`');
70993
71011
  };
70994
71012
 
70995
71013
  _class.prototype['@test Support shared but overridable mixin pattern'] = function testSupportSharedButOverridableMixinPattern(assert) {
70996
- var _this6 = this;
71014
+ var _this7 = this;
70997
71015
 
70998
71016
  assert.expect(7);
70999
71017
 
@@ -71009,18 +71027,18 @@ enifed('ember/tests/routing/query_params_test/overlapping_query_params_test', ['
71009
71027
  this.registerController('parent.child', _emberRuntime.Controller.extend(HasPage));
71010
71028
 
71011
71029
  return this.setupBase().then(function () {
71012
- _this6.assertCurrentPath('/parent/child');
71030
+ _this7.assertCurrentPath('/parent/child');
71013
71031
 
71014
- var parentController = _this6.getController('parent');
71015
- var parentChildController = _this6.getController('parent.child');
71032
+ var parentController = _this7.getController('parent');
71033
+ var parentChildController = _this7.getController('parent.child');
71016
71034
 
71017
- _this6.setAndFlush(parentChildController, 'page', 2);
71018
- _this6.assertCurrentPath('/parent/child?page=2');
71035
+ _this7.setAndFlush(parentChildController, 'page', 2);
71036
+ _this7.assertCurrentPath('/parent/child?page=2');
71019
71037
  assert.equal(parentController.get('page'), 1);
71020
71038
  assert.equal(parentChildController.get('page'), 2);
71021
71039
 
71022
- _this6.setAndFlush(parentController, 'page', 2);
71023
- _this6.assertCurrentPath('/parent/child?page=2&yespage=2');
71040
+ _this7.setAndFlush(parentController, 'page', 2);
71041
+ _this7.assertCurrentPath('/parent/child?page=2&yespage=2');
71024
71042
  assert.equal(parentController.get('page'), 2);
71025
71043
  assert.equal(parentChildController.get('page'), 2);
71026
71044
  });
data/dist/ember.debug.js CHANGED
@@ -6,10 +6,11 @@
6
6
  * Portions Copyright 2008-2011 Apple Inc. All rights reserved.
7
7
  * @license Licensed under MIT license
8
8
  * See https://raw.github.com/emberjs/ember.js/master/LICENSE
9
- * @version 2.11.0
9
+ * @version 2.11.1
10
10
  */
11
11
 
12
12
  var enifed, requireModule, Ember;
13
+ var mainContext = this; // Used in ember-environment/lib/global.js
13
14
 
14
15
  (function() {
15
16
  var isNode = typeof window === 'undefined' &&
@@ -11186,9 +11187,7 @@ enifed('ember-glimmer/helpers/unbound', ['exports', 'ember-metal', 'ember-glimme
11186
11187
  });
11187
11188
  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) {
11188
11189
  /**
11189
- [Glimmer](https://github.com/tildeio/glimmer) is a [Handlebars](http://handlebarsjs.com/)
11190
- compatible templating engine used by Ember.js.
11191
- Any valid Handlebars syntax is valid in an Ember template.
11190
+ [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.
11192
11191
 
11193
11192
  ### Showing a property
11194
11193
 
@@ -11196,15 +11195,13 @@ enifed('ember-glimmer/index', ['exports', 'ember-glimmer/helpers/action', 'ember
11196
11195
  the DOM) to a user. For example, given a component with the property "name",
11197
11196
  that component's template can use the name in several ways:
11198
11197
 
11199
- ```javascript
11200
- // app/components/person.js
11198
+ ```app/components/person.js
11201
11199
  export default Ember.Component.extend({
11202
11200
  name: 'Jill'
11203
11201
  });
11204
11202
  ```
11205
11203
 
11206
- ```handlebars
11207
- {{! app/components/person.hbs }}
11204
+ ```app/components/person.hbs
11208
11205
  {{name}}
11209
11206
  <div>{{name}}</div>
11210
11207
  <span data-name={{name}}></span>
@@ -28260,8 +28257,9 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
28260
28257
  for (var _i = 0; _i < qpMeta.qps.length; _i++) {
28261
28258
  var qp = qpMeta.qps[_i];
28262
28259
  var urlKey = qp.urlKey;
28260
+ var qpOther = qpsByUrlKey[urlKey];
28263
28261
 
28264
- if (qpsByUrlKey[urlKey]) {
28262
+ if (qpOther && qpOther.controllerName !== qp.controllerName) {
28265
28263
  var otherQP = qpsByUrlKey[urlKey];
28266
28264
  _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);
28267
28265
  }
@@ -42995,7 +42993,7 @@ enifed('ember/index', ['exports', 'require', 'ember-environment', 'ember-utils',
42995
42993
  enifed("ember/version", ["exports"], function (exports) {
42996
42994
  "use strict";
42997
42995
 
42998
- exports.default = "2.11.0";
42996
+ exports.default = "2.11.1";
42999
42997
  });
43000
42998
  enifed('internal-test-helpers/apply-mixins', ['exports', 'ember-utils'], function (exports, _emberUtils) {
43001
42999
  'use strict';
data/dist/ember.js CHANGED
@@ -6,10 +6,11 @@
6
6
  * Portions Copyright 2008-2011 Apple Inc. All rights reserved.
7
7
  * @license Licensed under MIT license
8
8
  * See https://raw.github.com/emberjs/ember.js/master/LICENSE
9
- * @version 2.11.0
9
+ * @version 2.11.1
10
10
  */
11
11
 
12
12
  var enifed, requireModule, Ember;
13
+ var mainContext = this; // Used in ember-environment/lib/global.js
13
14
 
14
15
  (function() {
15
16
  var isNode = typeof window === 'undefined' &&
@@ -11186,9 +11187,7 @@ enifed('ember-glimmer/helpers/unbound', ['exports', 'ember-metal', 'ember-glimme
11186
11187
  });
11187
11188
  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) {
11188
11189
  /**
11189
- [Glimmer](https://github.com/tildeio/glimmer) is a [Handlebars](http://handlebarsjs.com/)
11190
- compatible templating engine used by Ember.js.
11191
- Any valid Handlebars syntax is valid in an Ember template.
11190
+ [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.
11192
11191
 
11193
11192
  ### Showing a property
11194
11193
 
@@ -11196,15 +11195,13 @@ enifed('ember-glimmer/index', ['exports', 'ember-glimmer/helpers/action', 'ember
11196
11195
  the DOM) to a user. For example, given a component with the property "name",
11197
11196
  that component's template can use the name in several ways:
11198
11197
 
11199
- ```javascript
11200
- // app/components/person.js
11198
+ ```app/components/person.js
11201
11199
  export default Ember.Component.extend({
11202
11200
  name: 'Jill'
11203
11201
  });
11204
11202
  ```
11205
11203
 
11206
- ```handlebars
11207
- {{! app/components/person.hbs }}
11204
+ ```app/components/person.hbs
11208
11205
  {{name}}
11209
11206
  <div>{{name}}</div>
11210
11207
  <span data-name={{name}}></span>
@@ -28260,8 +28257,9 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
28260
28257
  for (var _i = 0; _i < qpMeta.qps.length; _i++) {
28261
28258
  var qp = qpMeta.qps[_i];
28262
28259
  var urlKey = qp.urlKey;
28260
+ var qpOther = qpsByUrlKey[urlKey];
28263
28261
 
28264
- if (qpsByUrlKey[urlKey]) {
28262
+ if (qpOther && qpOther.controllerName !== qp.controllerName) {
28265
28263
  var otherQP = qpsByUrlKey[urlKey];
28266
28264
  _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);
28267
28265
  }
@@ -42995,7 +42993,7 @@ enifed('ember/index', ['exports', 'require', 'ember-environment', 'ember-utils',
42995
42993
  enifed("ember/version", ["exports"], function (exports) {
42996
42994
  "use strict";
42997
42995
 
42998
- exports.default = "2.11.0";
42996
+ exports.default = "2.11.1";
42999
42997
  });
43000
42998
  enifed('internal-test-helpers/apply-mixins', ['exports', 'ember-utils'], function (exports, _emberUtils) {
43001
42999
  'use strict';
data/dist/ember.min.js CHANGED
@@ -1,7 +1,7 @@
1
1
  (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]
2
2
  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)
3
3
  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)
4
- 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]
4
+ 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]
5
5
  u||(s+="/index",u=r[s])
6
6
  var l=i[s]
7
7
  if(void 0!==l)return l
@@ -297,7 +297,7 @@ function n(){}function r(e){var n=void 0
297
297
  t.context.imports.console?n=t.context.imports.console:"undefined"!=typeof console&&(n=console)
298
298
  var r="object"==typeof n?n[e]:null
299
299
  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"
300
- 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"
300
+ 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"
301
301
  var r="object"==typeof t.default.EmberENV&&t.default.EmberENV||"object"==typeof t.default.ENV&&t.default.ENV||{}
302
302
  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)
303
303
  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
1560
1560
  return t&&r.get(t,"_qp")},_queryParamsFor:function(e){var n=e[e.length-1].name
1561
1561
  if(this._qpCache[n])return this._qpCache[n]
1562
1562
  for(var r=!0,i={},o={},s=[],a=0;a<e.length;++a){var u=this._getQPMeta(e[a])
1563
- if(u){for(var l=0;l<u.qps.length;l++){var c=u.qps[l],p=c.urlKey
1564
- 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}
1565
- 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])
1563
+ if(u){for(var l=0;l<u.qps.length;l++){var c=u.qps[l],p=c.urlKey,h=i[p]
1564
+ 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}
1565
+ 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])
1566
1566
  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
1567
1567
  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])
1568
1568
  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
2161
2161
  var g=o.default.Handlebars=o.default.Handlebars||{},v=o.default.HTMLBars=o.default.HTMLBars||{},y=g.Utils=g.Utils||{}
2162
2162
  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")
2163
2163
  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"
2164
- e.default="2.11.0"}),s("internal-test-helpers/apply-mixins",["exports","ember-utils"],function(e,t){"use strict"
2164
+ e.default="2.11.1"}),s("internal-test-helpers/apply-mixins",["exports","ember-utils"],function(e,t){"use strict"
2165
2165
  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]
2166
2166
  return i.forEach(function(r){var i=void 0
2167
2167
  n(r)?function(){var e=r
data/dist/ember.prod.js CHANGED
@@ -6,10 +6,11 @@
6
6
  * Portions Copyright 2008-2011 Apple Inc. All rights reserved.
7
7
  * @license Licensed under MIT license
8
8
  * See https://raw.github.com/emberjs/ember.js/master/LICENSE
9
- * @version 2.11.0
9
+ * @version 2.11.1
10
10
  */
11
11
 
12
12
  var enifed, requireModule, Ember;
13
+ var mainContext = this; // Used in ember-environment/lib/global.js
13
14
 
14
15
  (function() {
15
16
  var isNode = typeof window === 'undefined' &&
@@ -10410,9 +10411,7 @@ enifed('ember-glimmer/helpers/unbound', ['exports', 'ember-metal', 'ember-glimme
10410
10411
  });
10411
10412
  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) {
10412
10413
  /**
10413
- [Glimmer](https://github.com/tildeio/glimmer) is a [Handlebars](http://handlebarsjs.com/)
10414
- compatible templating engine used by Ember.js.
10415
- Any valid Handlebars syntax is valid in an Ember template.
10414
+ [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.
10416
10415
 
10417
10416
  ### Showing a property
10418
10417
 
@@ -10420,15 +10419,13 @@ enifed('ember-glimmer/index', ['exports', 'ember-glimmer/helpers/action', 'ember
10420
10419
  the DOM) to a user. For example, given a component with the property "name",
10421
10420
  that component's template can use the name in several ways:
10422
10421
 
10423
- ```javascript
10424
- // app/components/person.js
10422
+ ```app/components/person.js
10425
10423
  export default Ember.Component.extend({
10426
10424
  name: 'Jill'
10427
10425
  });
10428
10426
  ```
10429
10427
 
10430
- ```handlebars
10431
- {{! app/components/person.hbs }}
10428
+ ```app/components/person.hbs
10432
10429
  {{name}}
10433
10430
  <div>{{name}}</div>
10434
10431
  <span data-name={{name}}></span>
@@ -26866,8 +26863,9 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
26866
26863
  for (var _i = 0; _i < qpMeta.qps.length; _i++) {
26867
26864
  var qp = qpMeta.qps[_i];
26868
26865
  var urlKey = qp.urlKey;
26866
+ var qpOther = qpsByUrlKey[urlKey];
26869
26867
 
26870
- if (qpsByUrlKey[urlKey]) {
26868
+ if (qpOther && qpOther.controllerName !== qp.controllerName) {
26871
26869
  var otherQP = qpsByUrlKey[urlKey];
26872
26870
  }
26873
26871
 
@@ -39776,7 +39774,7 @@ enifed('ember/index', ['exports', 'require', 'ember-environment', 'ember-utils',
39776
39774
  enifed("ember/version", ["exports"], function (exports) {
39777
39775
  "use strict";
39778
39776
 
39779
- exports.default = "2.11.0";
39777
+ exports.default = "2.11.1";
39780
39778
  });
39781
39779
  enifed('internal-test-helpers/apply-mixins', ['exports', 'ember-utils'], function (exports, _emberUtils) {
39782
39780
  'use strict';
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ember-source
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.11.0
4
+ version: 2.11.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yehuda Katz
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-01-24 00:00:00.000000000 Z
11
+ date: 2017-02-16 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Ember.js source code wrapper for use with Ruby libs.
14
14
  email: