ember-source 2.18.0.beta.1 → 2.18.0.beta.2

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
  SHA256:
3
- metadata.gz: 0a1f07f335db8b7372bb82060ed1f93972af30747e3936b4c31fbaf1a968e4e3
4
- data.tar.gz: 182d672ee9a3b25cc581d83dea780304026b8d962cfb2b84763372312ef18627
3
+ metadata.gz: 20546095e74e0a7981ba694dc6da664d2a41f6ff9676833c5a95057dde3bd60f
4
+ data.tar.gz: 4908d952cca6d1a16d1def2999bf5b91c935f01a0442613ed86096b80c735ac6
5
5
  SHA512:
6
- metadata.gz: 536178cc4558abdeeea5ddbf3b01e1b635307d023f6eb0bfe3fb010e4e7714c71b948fb7d8c4757b13df184e9595a3acf65ef0b3b63130f0ca58e4a010f76cbf
7
- data.tar.gz: 0c94bd7e28233c9ba2a900a2f2febcd8dab734ec53dd03b33d48ac67cd1656a411c454cb580bf7706cf14954d22fd7354b17752fa9c79cdba8ce0966cf3b2100
6
+ metadata.gz: 417f6b62712f96d073b0bdefd497e212c50d8d688e71b0fc84bf4254e4ffc76be3f4c943a595fc0c426c4e2437b8d2991913253ebc134d655d143509a551198d
7
+ data.tar.gz: d31686108f27f6a334b6edc190f8f724065dc77d985f19f097510c5c9e9b62beb5d782e222e0e225090e89c8ed9c3bcd18c90becde6c9cd2018be2307d970f3d
@@ -6,7 +6,7 @@
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.18.0-beta.1
9
+ * @version 2.18.0-beta.2
10
10
  */
11
11
 
12
12
  /*global process */
@@ -6,7 +6,7 @@
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.18.0-beta.1
9
+ * @version 2.18.0-beta.2
10
10
  */
11
11
 
12
12
  /*global process */
@@ -4746,17 +4746,20 @@ enifed('backburner', ['exports'], function (exports) {
4746
4746
  var queue = this._queue;
4747
4747
  var guid = this.guidForTarget(target);
4748
4748
  var targetQueue = guid ? this.targetQueues[guid] : undefined;
4749
+ var index = void 0;
4749
4750
  if (targetQueue !== undefined) {
4750
4751
  t = void 0;
4751
4752
 
4752
4753
  for (i = 0, l = targetQueue.length; i < l; i += 2) {
4753
4754
  t = targetQueue[i];
4754
4755
  if (t === method) {
4755
- targetQueue.splice(i, 1);
4756
+ index = targetQueue.splice(i, 2)[1];
4756
4757
  }
4757
4758
  }
4758
4759
  }
4759
- var index = findItem(target, method, queue);
4760
+ if (index === undefined) {
4761
+ index = findItem(target, method, queue);
4762
+ }
4760
4763
  if (index > -1) {
4761
4764
  queue.splice(index, 4);
4762
4765
  return true;
@@ -4827,7 +4830,7 @@ enifed('backburner', ['exports'], function (exports) {
4827
4830
  };
4828
4831
 
4829
4832
  Queue.prototype.invoke = function (target, method, args /*, onError, errorRecordedForStack */) {
4830
- if (args && args.length > 0) {
4833
+ if (args !== undefined) {
4831
4834
  method.apply(target, args);
4832
4835
  } else {
4833
4836
  method.call(target);
@@ -4836,7 +4839,7 @@ enifed('backburner', ['exports'], function (exports) {
4836
4839
 
4837
4840
  Queue.prototype.invokeWithOnError = function (target, method, args, onError, errorRecordedForStack) {
4838
4841
  try {
4839
- if (args && args.length > 0) {
4842
+ if (args !== undefined) {
4840
4843
  method.apply(target, args);
4841
4844
  } else {
4842
4845
  method.call(target);
@@ -5094,43 +5097,16 @@ enifed('backburner', ['exports'], function (exports) {
5094
5097
  method = _parseArgs[1],
5095
5098
  args = _parseArgs[2];
5096
5099
 
5097
- var onError = getOnError(this.options);
5098
- this.begin();
5099
- if (onError) {
5100
- try {
5101
- return method.apply(target, args);
5102
- } catch (error) {
5103
- onError(error);
5104
- } finally {
5105
- this.end();
5106
- }
5107
- } else {
5108
- try {
5109
- return method.apply(target, args);
5110
- } finally {
5111
- this.end();
5112
- }
5113
- }
5100
+ return this._run(target, method, args);
5114
5101
  };
5115
5102
 
5116
5103
  Backburner.prototype.join = function () {
5117
- if (this.currentInstance === null) {
5118
- return this.run.apply(this, arguments);
5119
- }
5120
-
5121
5104
  var _parseArgs2 = parseArgs.apply(undefined, arguments),
5122
5105
  target = _parseArgs2[0],
5123
5106
  method = _parseArgs2[1],
5124
5107
  args = _parseArgs2[2];
5125
5108
 
5126
- var length = arguments.length;
5127
- if (length === 1) {
5128
- return method();
5129
- } else if (length === 2) {
5130
- return method.call(target);
5131
- } else {
5132
- return method.apply(target, args);
5133
- }
5109
+ return this._join(target, method, args);
5134
5110
  };
5135
5111
 
5136
5112
  Backburner.prototype.defer = function () {
@@ -5276,12 +5252,15 @@ enifed('backburner', ['exports'], function (exports) {
5276
5252
  wait = args.pop();
5277
5253
  isImmediate = immediate === true;
5278
5254
  }
5279
- wait = parseInt(wait, 10);
5255
+ if (isString(method)) {
5256
+ method = target[method];
5257
+ }
5280
5258
  var index = findItem(target, method, this._throttlers);
5281
5259
  if (index > -1) {
5282
5260
  this._throttlers[index + 2] = args;
5283
5261
  return this._throttlers[index + 3];
5284
5262
  } // throttled
5263
+ wait = parseInt(wait, 10);
5285
5264
  var timer = this._platform.setTimeout(function () {
5286
5265
  var i = findTimer(timer, _this2._throttlers);
5287
5266
 
@@ -5291,11 +5270,11 @@ enifed('backburner', ['exports'], function (exports) {
5291
5270
  params = _throttlers$splice[2];
5292
5271
 
5293
5272
  if (isImmediate === false) {
5294
- _this2.run.apply(_this2, [context, func].concat(params));
5273
+ _this2._run(context, func, params);
5295
5274
  }
5296
5275
  }, wait);
5297
5276
  if (isImmediate) {
5298
- this.join.apply(this, [target, method].concat(args));
5277
+ this._join(target, method, args);
5299
5278
  }
5300
5279
  this._throttlers.push(target, method, args, timer);
5301
5280
  return timer;
@@ -5322,6 +5301,9 @@ enifed('backburner', ['exports'], function (exports) {
5322
5301
  wait = args.pop();
5323
5302
  isImmediate = immediate === true;
5324
5303
  }
5304
+ if (isString(method)) {
5305
+ method = target[method];
5306
+ }
5325
5307
  wait = parseInt(wait, 10);
5326
5308
  // Remove debouncee
5327
5309
  var index = findItem(target, method, this._debouncees);
@@ -5340,11 +5322,11 @@ enifed('backburner', ['exports'], function (exports) {
5340
5322
  params = _debouncees$splice[2];
5341
5323
 
5342
5324
  if (isImmediate === false) {
5343
- _this3.run.apply(_this3, [context, func].concat(params));
5325
+ _this3._run(context, func, params);
5344
5326
  }
5345
5327
  }, wait);
5346
5328
  if (isImmediate && index === -1) {
5347
- this.join.apply(this, [target, method].concat(args));
5329
+ this._join(target, method, args);
5348
5330
  }
5349
5331
  this._debouncees.push(target, method, args, timer);
5350
5332
  return timer;
@@ -5389,6 +5371,37 @@ enifed('backburner', ['exports'], function (exports) {
5389
5371
  this._ensureInstance();
5390
5372
  };
5391
5373
 
5374
+ Backburner.prototype._join = function (target, method, args) {
5375
+ if (this.currentInstance === null) {
5376
+ return this._run(target, method, args);
5377
+ }
5378
+ if (target === undefined && args === undefined) {
5379
+ return method();
5380
+ } else {
5381
+ return method.apply(target, args);
5382
+ }
5383
+ };
5384
+
5385
+ Backburner.prototype._run = function (target, method, args) {
5386
+ var onError = getOnError(this.options);
5387
+ this.begin();
5388
+ if (onError) {
5389
+ try {
5390
+ return method.apply(target, args);
5391
+ } catch (error) {
5392
+ onError(error);
5393
+ } finally {
5394
+ this.end();
5395
+ }
5396
+ } else {
5397
+ try {
5398
+ return method.apply(target, args);
5399
+ } finally {
5400
+ this.end();
5401
+ }
5402
+ }
5403
+ };
5404
+
5392
5405
  Backburner.prototype._cancelAutorun = function () {
5393
5406
  if (this._autorun !== null) {
5394
5407
  this._platform.clearNext(this._autorun);
@@ -17307,7 +17320,7 @@ enifed('ember/features', ['exports', 'ember-environment', 'ember-utils'], functi
17307
17320
  enifed("ember/version", ["exports"], function (exports) {
17308
17321
  "use strict";
17309
17322
 
17310
- exports.default = "2.18.0-beta.1";
17323
+ exports.default = "2.18.0-beta.2";
17311
17324
  });
17312
17325
  enifed("handlebars", ["exports"], function (exports) {
17313
17326
  "use strict";
@@ -6,7 +6,7 @@
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.18.0-beta.1
9
+ * @version 2.18.0-beta.2
10
10
  */
11
11
 
12
12
  /*global process */
data/dist/ember-tests.js CHANGED
@@ -6,7 +6,7 @@
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.18.0-beta.1
9
+ * @version 2.18.0-beta.2
10
10
  */
11
11
 
12
12
  /*global process */
@@ -19387,6 +19387,29 @@ enifed('ember-glimmer/tests/integration/components/link-to-test', ['ember-babel'
19387
19387
 
19388
19388
  return _class2;
19389
19389
  }(_testCase.ApplicationTest));
19390
+
19391
+ (0, _testCase.moduleFor)('Link-to component', function (_RenderingTest) {
19392
+ (0, _emberBabel.inherits)(_class3, _RenderingTest);
19393
+
19394
+ function _class3() {
19395
+ (0, _emberBabel.classCallCheck)(this, _class3);
19396
+ return (0, _emberBabel.possibleConstructorReturn)(this, _RenderingTest.apply(this, arguments));
19397
+ }
19398
+
19399
+ _class3.prototype['@test should be able to be inserted in DOM when the router is not present - block'] = function testShouldBeAbleToBeInsertedInDOMWhenTheRouterIsNotPresentBlock() {
19400
+ this.render('{{#link-to \'index\'}}Go to Index{{/link-to}}');
19401
+
19402
+ this.assertText('Go to Index');
19403
+ };
19404
+
19405
+ _class3.prototype['@test should be able to be inserted in DOM when the router is not present - inline'] = function testShouldBeAbleToBeInsertedInDOMWhenTheRouterIsNotPresentInline() {
19406
+ this.render('{{link-to \'Go to Index\' \'index\'}}');
19407
+
19408
+ this.assertText('Go to Index');
19409
+ };
19410
+
19411
+ return _class3;
19412
+ }(_testCase.RenderingTest));
19390
19413
  });
19391
19414
  QUnit.module('ESLint | ember-glimmer/tests/integration/components/link-to-test.js');
19392
19415
  QUnit.test('should pass ESLint', function(assert) {
@@ -6,7 +6,7 @@
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.18.0-beta.1
9
+ * @version 2.18.0-beta.2
10
10
  */
11
11
 
12
12
  /*global process */
@@ -18531,6 +18531,28 @@ enifed('ember-glimmer/tests/integration/components/link-to-test', ['ember-babel'
18531
18531
 
18532
18532
  return _class2;
18533
18533
  }(_testCase.ApplicationTest));
18534
+
18535
+ (0, _testCase.moduleFor)('Link-to component', function (_RenderingTest) {
18536
+ (0, _emberBabel.inherits)(_class3, _RenderingTest);
18537
+
18538
+ function _class3() {
18539
+ return (0, _emberBabel.possibleConstructorReturn)(this, _RenderingTest.apply(this, arguments));
18540
+ }
18541
+
18542
+ _class3.prototype['@test should be able to be inserted in DOM when the router is not present - block'] = function () {
18543
+ this.render('{{#link-to \'index\'}}Go to Index{{/link-to}}');
18544
+
18545
+ this.assertText('Go to Index');
18546
+ };
18547
+
18548
+ _class3.prototype['@test should be able to be inserted in DOM when the router is not present - inline'] = function () {
18549
+ this.render('{{link-to \'Go to Index\' \'index\'}}');
18550
+
18551
+ this.assertText('Go to Index');
18552
+ };
18553
+
18554
+ return _class3;
18555
+ }(_testCase.RenderingTest));
18534
18556
  });
18535
18557
  enifed('ember-glimmer/tests/integration/components/local-lookup-test', ['ember-babel', 'ember-glimmer/tests/utils/test-case', 'internal-test-helpers', 'ember-glimmer/tests/utils/helpers', 'ember-glimmer'], function (_emberBabel, _testCase, _internalTestHelpers, _helpers) {
18536
18558
  'use strict';
data/dist/ember.debug.js CHANGED
@@ -6,7 +6,7 @@
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.18.0-beta.1
9
+ * @version 2.18.0-beta.2
10
10
  */
11
11
 
12
12
  /*global process */
@@ -9259,16 +9259,19 @@ enifed('backburner', ['exports', 'ember-babel'], function (exports, _emberBabel)
9259
9259
  var queue = this._queue;
9260
9260
  var guid = this.guidForTarget(target);
9261
9261
  var targetQueue = guid ? this.targetQueues[guid] : undefined;
9262
+ var index = void 0;
9262
9263
  if (targetQueue !== undefined) {
9263
9264
  var t = void 0;
9264
9265
  for (var i = 0, l = targetQueue.length; i < l; i += 2) {
9265
9266
  t = targetQueue[i];
9266
9267
  if (t === method) {
9267
- targetQueue.splice(i, 1);
9268
+ index = targetQueue.splice(i, 2)[1];
9268
9269
  }
9269
9270
  }
9270
9271
  }
9271
- var index = findItem(target, method, queue);
9272
+ if (index === undefined) {
9273
+ index = findItem(target, method, queue);
9274
+ }
9272
9275
  if (index > -1) {
9273
9276
  queue.splice(index, 4);
9274
9277
  return true;
@@ -9333,7 +9336,7 @@ enifed('backburner', ['exports', 'ember-babel'], function (exports, _emberBabel)
9333
9336
  };
9334
9337
 
9335
9338
  Queue.prototype.invoke = function invoke(target, method, args /*, onError, errorRecordedForStack */) {
9336
- if (args && args.length > 0) {
9339
+ if (args !== undefined) {
9337
9340
  method.apply(target, args);
9338
9341
  } else {
9339
9342
  method.call(target);
@@ -9342,7 +9345,7 @@ enifed('backburner', ['exports', 'ember-babel'], function (exports, _emberBabel)
9342
9345
 
9343
9346
  Queue.prototype.invokeWithOnError = function invokeWithOnError(target, method, args, onError, errorRecordedForStack) {
9344
9347
  try {
9345
- if (args && args.length > 0) {
9348
+ if (args !== undefined) {
9346
9349
  method.apply(target, args);
9347
9350
  } else {
9348
9351
  method.call(target);
@@ -9598,43 +9601,16 @@ enifed('backburner', ['exports', 'ember-babel'], function (exports, _emberBabel)
9598
9601
  method = _parseArgs[1],
9599
9602
  args = _parseArgs[2];
9600
9603
 
9601
- var onError = getOnError(this.options);
9602
- this.begin();
9603
- if (onError) {
9604
- try {
9605
- return method.apply(target, args);
9606
- } catch (error) {
9607
- onError(error);
9608
- } finally {
9609
- this.end();
9610
- }
9611
- } else {
9612
- try {
9613
- return method.apply(target, args);
9614
- } finally {
9615
- this.end();
9616
- }
9617
- }
9604
+ return this._run(target, method, args);
9618
9605
  };
9619
9606
 
9620
9607
  Backburner.prototype.join = function join() {
9621
- if (this.currentInstance === null) {
9622
- return this.run.apply(this, arguments);
9623
- }
9624
-
9625
9608
  var _parseArgs2 = parseArgs.apply(undefined, arguments),
9626
9609
  target = _parseArgs2[0],
9627
9610
  method = _parseArgs2[1],
9628
9611
  args = _parseArgs2[2];
9629
9612
 
9630
- var length = arguments.length;
9631
- if (length === 1) {
9632
- return method();
9633
- } else if (length === 2) {
9634
- return method.call(target);
9635
- } else {
9636
- return method.apply(target, args);
9637
- }
9613
+ return this._join(target, method, args);
9638
9614
  };
9639
9615
 
9640
9616
  Backburner.prototype.defer = function defer() {
@@ -9766,12 +9742,15 @@ enifed('backburner', ['exports', 'ember-babel'], function (exports, _emberBabel)
9766
9742
  wait = args.pop();
9767
9743
  isImmediate = immediate === true;
9768
9744
  }
9769
- wait = parseInt(wait, 10);
9745
+ if (isString(method)) {
9746
+ method = target[method];
9747
+ }
9770
9748
  var index = findItem(target, method, this._throttlers);
9771
9749
  if (index > -1) {
9772
9750
  this._throttlers[index + 2] = args;
9773
9751
  return this._throttlers[index + 3];
9774
9752
  } // throttled
9753
+ wait = parseInt(wait, 10);
9775
9754
  var timer = this._platform.setTimeout(function () {
9776
9755
  var i = findTimer(timer, _this2._throttlers);
9777
9756
 
@@ -9781,11 +9760,11 @@ enifed('backburner', ['exports', 'ember-babel'], function (exports, _emberBabel)
9781
9760
  params = _throttlers$splice[2];
9782
9761
 
9783
9762
  if (isImmediate === false) {
9784
- _this2.run.apply(_this2, [context, func].concat(params));
9763
+ _this2._run(context, func, params);
9785
9764
  }
9786
9765
  }, wait);
9787
9766
  if (isImmediate) {
9788
- this.join.apply(this, [target, method].concat(args));
9767
+ this._join(target, method, args);
9789
9768
  }
9790
9769
  this._throttlers.push(target, method, args, timer);
9791
9770
  return timer;
@@ -9808,6 +9787,9 @@ enifed('backburner', ['exports', 'ember-babel'], function (exports, _emberBabel)
9808
9787
  wait = args.pop();
9809
9788
  isImmediate = immediate === true;
9810
9789
  }
9790
+ if (isString(method)) {
9791
+ method = target[method];
9792
+ }
9811
9793
  wait = parseInt(wait, 10);
9812
9794
  // Remove debouncee
9813
9795
  var index = findItem(target, method, this._debouncees);
@@ -9825,11 +9807,11 @@ enifed('backburner', ['exports', 'ember-babel'], function (exports, _emberBabel)
9825
9807
  params = _debouncees$splice[2];
9826
9808
 
9827
9809
  if (isImmediate === false) {
9828
- _this3.run.apply(_this3, [context, func].concat(params));
9810
+ _this3._run(context, func, params);
9829
9811
  }
9830
9812
  }, wait);
9831
9813
  if (isImmediate && index === -1) {
9832
- this.join.apply(this, [target, method].concat(args));
9814
+ this._join(target, method, args);
9833
9815
  }
9834
9816
  this._debouncees.push(target, method, args, timer);
9835
9817
  return timer;
@@ -9872,6 +9854,37 @@ enifed('backburner', ['exports', 'ember-babel'], function (exports, _emberBabel)
9872
9854
  this._ensureInstance();
9873
9855
  };
9874
9856
 
9857
+ Backburner.prototype._join = function _join(target, method, args) {
9858
+ if (this.currentInstance === null) {
9859
+ return this._run(target, method, args);
9860
+ }
9861
+ if (target === undefined && args === undefined) {
9862
+ return method();
9863
+ } else {
9864
+ return method.apply(target, args);
9865
+ }
9866
+ };
9867
+
9868
+ Backburner.prototype._run = function _run(target, method, args) {
9869
+ var onError = getOnError(this.options);
9870
+ this.begin();
9871
+ if (onError) {
9872
+ try {
9873
+ return method.apply(target, args);
9874
+ } catch (error) {
9875
+ onError(error);
9876
+ } finally {
9877
+ this.end();
9878
+ }
9879
+ } else {
9880
+ try {
9881
+ return method.apply(target, args);
9882
+ } finally {
9883
+ this.end();
9884
+ }
9885
+ }
9886
+ };
9887
+
9875
9888
  Backburner.prototype._cancelAutorun = function _cancelAutorun() {
9876
9889
  if (this._autorun !== null) {
9877
9890
  this._platform.clearNext(this._autorun);
@@ -16358,7 +16371,7 @@ enifed('ember-glimmer/components/link-to', ['exports', 'ember-debug', 'ember-met
16358
16371
  currentWhen: (0, _emberRuntime.deprecatingAlias)('current-when', { id: 'ember-routing-view.deprecated-current-when', until: '3.0.0' }),
16359
16372
  /**
16360
16373
  Used to determine when this `LinkComponent` is active.
16361
- @property currentWhen
16374
+ @property current-when
16362
16375
  @public
16363
16376
  */
16364
16377
  'current-when': null,
@@ -30645,7 +30658,11 @@ enifed('ember-routing/services/routing', ['exports', 'ember-utils', 'ember-runti
30645
30658
  (0, _emberMetal.get)(this, 'router')._prepareQueryParams(routeName, models, queryParams);
30646
30659
  },
30647
30660
  generateURL: function (routeName, models, queryParams) {
30648
- var _get;
30661
+ var router = (0, _emberMetal.get)(this, 'router');
30662
+ // return early when the router microlib is not present, which is the case for {{link-to}} in integration tests
30663
+ if (!router._routerMicrolib) {
30664
+ return;
30665
+ }
30649
30666
 
30650
30667
  var visibleQueryParams = {};
30651
30668
  if (queryParams) {
@@ -30653,7 +30670,7 @@ enifed('ember-routing/services/routing', ['exports', 'ember-utils', 'ember-runti
30653
30670
  this.normalizeQueryParams(routeName, models, visibleQueryParams);
30654
30671
  }
30655
30672
 
30656
- return (_get = (0, _emberMetal.get)(this, 'router')).generate.apply(_get, [routeName].concat(models, [{ queryParams: visibleQueryParams }]));
30673
+ return router.generate.apply(router, [routeName].concat(models, [{ queryParams: visibleQueryParams }]));
30657
30674
  },
30658
30675
  isActiveForRoute: function (contexts, queryParams, routeName, routerState, isCurrentWhenSpecified) {
30659
30676
  var router = (0, _emberMetal.get)(this, 'router');
@@ -36654,7 +36671,9 @@ enifed('ember-runtime/inject', ['exports', 'ember-metal', 'ember-debug'], functi
36654
36671
  @public
36655
36672
  */
36656
36673
  function inject() {
36657
- (true && !(false) && (0, _emberDebug.assert)('Injected properties must be created through helpers, see \'' + Object.keys(inject).join('"', '"') + '\''));
36674
+ (true && !(false) && (0, _emberDebug.assert)('Injected properties must be created through helpers, see \'' + Object.keys(inject).map(function (k) {
36675
+ return '\'inject.' + k + '\'';
36676
+ }).join(' or ') + '\''));
36658
36677
  }
36659
36678
 
36660
36679
  // Dictionary of injection validations by type, added to by `createInjectionHelper`
@@ -47672,7 +47691,7 @@ enifed('ember/index', ['exports', 'require', 'ember-environment', 'node-module',
47672
47691
  enifed("ember/version", ["exports"], function (exports) {
47673
47692
  "use strict";
47674
47693
 
47675
- exports.default = "2.18.0-beta.1";
47694
+ exports.default = "2.18.0-beta.2";
47676
47695
  });
47677
47696
  enifed("handlebars", ["exports"], function (exports) {
47678
47697
  "use strict";
data/dist/ember.min.js CHANGED
@@ -765,17 +765,16 @@ return i?this.pushUniqueWithGuid(i,e,t,n,r):this.pushUniqueWithoutGuid(e,t,n,r),
765
765
  this.targetQueues=Object.create(null),0===this._queueBeingFlushed.length&&(this._queueBeingFlushed=this._queue,this._queue=[]),void 0!==i&&i()
766
766
  var p=void 0,h=this._queueBeingFlushed
767
767
  if(h.length>0)for(t=a(this.globalOptions),p=t?this.invokeWithOnError:this.invoke,n=this.index;n<h.length;n+=4)if(this.index+=4,u=h[n+1],null!==u&&(s=h[n],c=h[n+2],l=h[n+3],p(s,u,c,t,l)),this.index!==this._queueBeingFlushed.length&&this.globalOptions.mustYield&&this.globalOptions.mustYield())return 1
768
- void 0!==o&&o(),this._queueBeingFlushed.length=0,this.index=0,e!==!1&&this._queue.length>0&&this.flush(!0)},e.prototype.hasWork=function(){return this._queueBeingFlushed.length>0||this._queue.length>0},e.prototype.cancel=function(e){var t,n,r,i=e.target,o=e.method,s=this._queue,a=this.guidForTarget(i),c=a?this.targetQueues[a]:void 0
769
- if(void 0!==c)for(t=void 0,n=0,r=c.length;n<r;n+=2)t=c[n],t===o&&c.splice(n,1)
770
- var l=u(i,o,s)
771
- return l>-1?(s.splice(l,4),!0):(s=this._queueBeingFlushed,l=u(i,o,s),l>-1&&(s[l+1]=null,!0))},e.prototype.guidForTarget=function(e){if(e){var t=this.globalOptions.peekGuid
768
+ void 0!==o&&o(),this._queueBeingFlushed.length=0,this.index=0,e!==!1&&this._queue.length>0&&this.flush(!0)},e.prototype.hasWork=function(){return this._queueBeingFlushed.length>0||this._queue.length>0},e.prototype.cancel=function(e){var t,n,r,i=e.target,o=e.method,s=this._queue,a=this.guidForTarget(i),c=a?this.targetQueues[a]:void 0,l=void 0
769
+ if(void 0!==c)for(t=void 0,n=0,r=c.length;n<r;n+=2)t=c[n],t===o&&(l=c.splice(n,2)[1])
770
+ return void 0===l&&(l=u(i,o,s)),l>-1?(s.splice(l,4),!0):(s=this._queueBeingFlushed,l=u(i,o,s),l>-1&&(s[l+1]=null,!0))},e.prototype.guidForTarget=function(e){if(e){var t=this.globalOptions.peekGuid
772
771
  if(t)return t(e)
773
772
  var n=this.globalOptions.GUID_KEY
774
773
  return n?e[n]:void 0}},e.prototype.pushUniqueWithoutGuid=function(e,t,n,r){var i=this._queue,o=u(e,t,i)
775
774
  o>-1?(i[o+2]=n,i[o+3]=r):i.push(e,t,n,r)},e.prototype.targetQueue=function(e,t,n,r,i){var o,s,a,u,c=this._queue
776
775
  for(o=0,s=e.length;o<s;o+=2)if(a=e[o],a===n)return u=e[o+1],c[u+2]=r,void(c[u+3]=i)
777
776
  e.push(n,c.push(t,n,r,i)-4)},e.prototype.pushUniqueWithGuid=function(e,t,n,r,i){var o=this.targetQueues[e]
778
- void 0!==o?this.targetQueue(o,t,n,r,i):this.targetQueues[e]=[n,this._queue.push(t,n,r,i)-4]},e.prototype.invoke=function(e,t,n){n&&n.length>0?t.apply(e,n):t.call(e)},e.prototype.invokeWithOnError=function(e,t,n,r,i){try{n&&n.length>0?t.apply(e,n):t.call(e)}catch(o){r(o,i)}},e}(),d=function(){function e(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],t=arguments[1]
777
+ void 0!==o?this.targetQueue(o,t,n,r,i):this.targetQueues[e]=[n,this._queue.push(t,n,r,i)-4]},e.prototype.invoke=function(e,t,n){void 0!==n?t.apply(e,n):t.call(e)},e.prototype.invokeWithOnError=function(e,t,n,r,i){try{void 0!==n?t.apply(e,n):t.call(e)}catch(o){r(o,i)}},e}(),d=function(){function e(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],t=arguments[1]
779
778
  this.queues={},this.queueNameIndex=0,this.queueNames=e,e.reduce(function(e,n){return e[n]=new f(n,t[n],t),e},this.queues)}return e.prototype.schedule=function(e,t,n,r,i,a){var u=this.queues,c=u[e]
780
779
  return c||o(e),n||s(e),i?c.pushUnique(t,n,r,a):c.push(t,n,r,a)},e.prototype.flush=function(){for(var e=void 0,t=void 0,n=this.queueNames.length;this.queueNameIndex<n;)if(t=this.queueNames[this.queueNameIndex],e=this.queues[t],e.hasWork()===!1)this.queueNameIndex++
781
780
  else{if(1===e.flush(!1))return 1
@@ -793,10 +792,9 @@ n.push(t)},e.prototype.off=function(e,t){var n,r=this._eventCallbacks[e]
793
792
  if(!e||void 0===r)throw new TypeError("Cannot off() event "+e+" because it does not exist")
794
793
  var i=!1
795
794
  if(t)for(n=0;n<r.length;n++)r[n]===t&&(i=!0,r.splice(n,1),n--)
796
- if(!i)throw new TypeError("Cannot off() callback that does not exist")},e.prototype.run=function(){var e=p.apply(void 0,arguments),t=e[0],n=e[1],r=e[2],i=a(this.options)
797
- if(this.begin(),i)try{return n.apply(t,r)}catch(o){i(o)}finally{this.end()}else try{return n.apply(t,r)}finally{this.end()}},e.prototype.join=function(){if(null===this.currentInstance)return this.run.apply(this,arguments)
798
- var e=p.apply(void 0,arguments),t=e[0],n=e[1],r=e[2],i=arguments.length
799
- return 1===i?n():2===i?n.call(t):n.apply(t,r)},e.prototype.defer=function(){return this.schedule.apply(this,arguments)},e.prototype.schedule=function(e){for(t=arguments.length,n=Array(t>1?t-1:0),r=1;r<t;r++)n[r-1]=arguments[r]
795
+ if(!i)throw new TypeError("Cannot off() callback that does not exist")},e.prototype.run=function(){var e=p.apply(void 0,arguments),t=e[0],n=e[1],r=e[2]
796
+ return this._run(t,n,r)},e.prototype.join=function(){var e=p.apply(void 0,arguments),t=e[0],n=e[1],r=e[2]
797
+ return this._join(t,n,r)},e.prototype.defer=function(){return this.schedule.apply(this,arguments)},e.prototype.schedule=function(e){for(t=arguments.length,n=Array(t>1?t-1:0),r=1;r<t;r++)n[r-1]=arguments[r]
800
798
  var t,n,r,i=p.apply(void 0,n),o=i[0],s=i[1],a=i[2],u=this.DEBUG?new Error:void 0
801
799
  return this._ensureInstance().schedule(e,o,s,a,!1,u)},e.prototype.scheduleIterable=function(e,t){var n=this.DEBUG?new Error:void 0
802
800
  return this._ensureInstance().schedule(e,null,m,[t],!1,n)},e.prototype.deferOnce=function(){return this.scheduleOnce.apply(this,arguments)},e.prototype.scheduleOnce=function(e){for(t=arguments.length,n=Array(t>1?t-1:0),r=1;r<t;r++)n[r-1]=arguments[r]
@@ -805,28 +803,30 @@ return this._ensureInstance().schedule(e,o,s,a,!0,u)},e.prototype.setTimeout=fun
805
803
  var e,r,o,s,u=r.length,c=0,l=void 0,p=void 0,h=void 0,f=void 0,d=void 0
806
804
  if(0!==u){1===u?l=r.shift():2===u?(h=r[0],f=r[1],n(f)?(p=r.shift(),l=r.shift()):null!==h&&t(f)&&f in h?(p=r.shift(),l=p[r.shift()]):i(f)?(l=r.shift(),c=parseInt(r.shift(),10)):l=r.shift()):(s=r[r.length-1],i(s)&&(c=parseInt(r.pop(),10)),h=r[0],d=r[1],n(d)?(p=r.shift(),l=r.shift()):null!==h&&t(d)&&d in h?(p=r.shift(),l=p[r.shift()]):l=r.shift())
807
805
  var m=a(this.options),g=this._platform.now()+c,y=void 0
808
- return y=m?function(){try{l.apply(p,r)}catch(e){m(e)}}:function(){l.apply(p,r)},this._setTimeout(y,g)}},e.prototype.throttle=function(e,t){var n,r,o,s=this
809
- for(n=arguments.length,r=Array(n>2?n-2:0),o=2;o<n;o++)r[o-2]=arguments[o]
810
- var a=r.pop(),l=void 0,p=void 0
811
- i(a)?(p=a,l=!0):(p=r.pop(),l=a===!0),p=parseInt(p,10)
812
- var h=u(e,t,this._throttlers)
813
- if(h>-1)return this._throttlers[h+2]=r,this._throttlers[h+3]
814
- var f=this._platform.setTimeout(function(){var e=c(f,s._throttlers),t=s._throttlers.splice(e,4),n=t[0],r=t[1],i=t[2]
815
- l===!1&&s.run.apply(s,[n,r].concat(i))},p)
816
- return l&&this.join.apply(this,[e,t].concat(r)),this._throttlers.push(e,t,r,f),f},e.prototype.debounce=function(e,t){var n,r,o,s,a=this
817
- for(n=arguments.length,r=Array(n>2?n-2:0),o=2;o<n;o++)r[o-2]=arguments[o]
818
- var l=r.pop(),p=void 0,h=void 0
819
- i(l)?(h=l,p=!1):(h=r.pop(),p=l===!0),h=parseInt(h,10)
820
- var f=u(e,t,this._debouncees)
821
- f>-1&&(s=this._debouncees[f+3],this._platform.clearTimeout(s),this._debouncees.splice(f,4))
822
- var d=this._platform.setTimeout(function(){var e=c(d,a._debouncees),t=a._debouncees.splice(e,4),n=t[0],r=t[1],i=t[2]
823
- p===!1&&a.run.apply(a,[n,r].concat(i))},h)
824
- return p&&f===-1&&this.join.apply(this,[e,t].concat(r)),this._debouncees.push(e,t,r,d),d},e.prototype.cancelTimers=function(){var e,t
806
+ return y=m?function(){try{l.apply(p,r)}catch(e){m(e)}}:function(){l.apply(p,r)},this._setTimeout(y,g)}},e.prototype.throttle=function(e,n){var r,o,s,a=this
807
+ for(r=arguments.length,o=Array(r>2?r-2:0),s=2;s<r;s++)o[s-2]=arguments[s]
808
+ var l=o.pop(),p=void 0,h=void 0
809
+ i(l)?(h=l,p=!0):(h=o.pop(),p=l===!0),t(n)&&(n=e[n])
810
+ var f=u(e,n,this._throttlers)
811
+ if(f>-1)return this._throttlers[f+2]=o,this._throttlers[f+3]
812
+ h=parseInt(h,10)
813
+ var d=this._platform.setTimeout(function(){var e=c(d,a._throttlers),t=a._throttlers.splice(e,4),n=t[0],r=t[1],i=t[2]
814
+ p===!1&&a._run(n,r,i)},h)
815
+ return p&&this._join(e,n,o),this._throttlers.push(e,n,o,d),d},e.prototype.debounce=function(e,n){var r,o,s,a,l=this
816
+ for(r=arguments.length,o=Array(r>2?r-2:0),s=2;s<r;s++)o[s-2]=arguments[s]
817
+ var p=o.pop(),h=void 0,f=void 0
818
+ i(p)?(f=p,h=!1):(f=o.pop(),h=p===!0),t(n)&&(n=e[n]),f=parseInt(f,10)
819
+ var d=u(e,n,this._debouncees)
820
+ d>-1&&(a=this._debouncees[d+3],this._platform.clearTimeout(a),this._debouncees.splice(d,4))
821
+ var m=this._platform.setTimeout(function(){var e=c(m,l._debouncees),t=l._debouncees.splice(e,4),n=t[0],r=t[1],i=t[2]
822
+ h===!1&&l._run(n,r,i)},f)
823
+ return h&&d===-1&&this._join(e,n,o),this._debouncees.push(e,n,o,m),m},e.prototype.cancelTimers=function(){var e,t
825
824
  for(e=3;e<this._throttlers.length;e+=4)this._platform.clearTimeout(this._throttlers[e])
826
825
  for(this._throttlers=[],t=3;t<this._debouncees.length;t+=4)this._platform.clearTimeout(this._debouncees[t])
827
826
  this._debouncees=[],this._clearTimerTimeout(),this._timers=[],this._cancelAutorun()},e.prototype.hasTimers=function(){return this._timers.length>0||this._debouncees.length>0||this._throttlers.length>0||null!==this._autorun},e.prototype.cancel=function(e){if(!e)return!1
828
827
  var t=typeof e
829
- return"number"===t||"string"===t?this._cancelItem(e,this._throttlers)||this._cancelItem(e,this._debouncees):"function"===t?this._cancelLaterTimer(e):!("object"!==t||!e.queue||!e.method)&&e.queue.cancel(e)},e.prototype.ensureInstance=function(){this._ensureInstance()},e.prototype._cancelAutorun=function(){null!==this._autorun&&(this._platform.clearNext(this._autorun),this._autorun=null)},e.prototype._setTimeout=function(e,t){if(0===this._timers.length)return this._timers.push(t,e),this._installTimerTimeout(),e
828
+ return"number"===t||"string"===t?this._cancelItem(e,this._throttlers)||this._cancelItem(e,this._debouncees):"function"===t?this._cancelLaterTimer(e):!("object"!==t||!e.queue||!e.method)&&e.queue.cancel(e)},e.prototype.ensureInstance=function(){this._ensureInstance()},e.prototype._join=function(e,t,n){return null===this.currentInstance?this._run(e,t,n):void 0===e&&void 0===n?t():t.apply(e,n)},e.prototype._run=function(e,t,n){var r=a(this.options)
829
+ if(this.begin(),r)try{return t.apply(e,n)}catch(i){r(i)}finally{this.end()}else try{return t.apply(e,n)}finally{this.end()}},e.prototype._cancelAutorun=function(){null!==this._autorun&&(this._platform.clearNext(this._autorun),this._autorun=null)},e.prototype._setTimeout=function(e,t){if(0===this._timers.length)return this._timers.push(t,e),this._installTimerTimeout(),e
830
830
  var n=l(t,this._timers)
831
831
  return this._timers.splice(n,0,t,e),0===n&&this._reinstallTimerTimeout(),e},e.prototype._cancelLaterTimer=function(e){var t
832
832
  for(t=1;t<this._timers.length;t+=2)if(this._timers[t]===e)return t-=1,this._timers.splice(t,2),0===t&&this._reinstallTimerTimeout(),!0
@@ -1897,8 +1897,9 @@ return!c||(this._router._prepareQueryParams(o,s,a,!0),(0,n.shallowEqual)(a,u.sta
1897
1897
  e["default"]=r}),e("ember-routing/services/routing",["exports","ember-utils","ember-runtime","ember-metal"],function(e,t,n,r){"use strict"
1898
1898
  function i(e,t){var n,r=0
1899
1899
  for(n=0;n<t.length&&(r+=t[n].names.length,t[n].handler!==e);n++);return r}e["default"]=n.Service.extend({router:null,targetState:(0,n.readOnly)("router.targetState"),currentState:(0,n.readOnly)("router.currentState"),currentRouteName:(0,n.readOnly)("router.currentRouteName"),currentPath:(0,n.readOnly)("router.currentPath"),hasRoute:function(e){return(0,r.get)(this,"router").hasRoute(e)},transitionTo:function(e,t,n,i){var o=(0,r.get)(this,"router"),s=o._doTransition(e,t,n)
1900
- return i&&s.method("replace"),s},normalizeQueryParams:function(e,t,n){(0,r.get)(this,"router")._prepareQueryParams(e,t,n)},generateURL:function(e,n,i){var o,s={}
1901
- return i&&((0,t.assign)(s,i),this.normalizeQueryParams(e,n,s)),(o=(0,r.get)(this,"router")).generate.apply(o,[e].concat(n,[{queryParams:s}]))},isActiveForRoute:function(e,t,n,o,s){var a=(0,r.get)(this,"router"),u=a._routerMicrolib.recognizer.handlersFor(n),c=u[u.length-1].handler,l=i(n,u)
1900
+ return i&&s.method("replace"),s},normalizeQueryParams:function(e,t,n){(0,r.get)(this,"router")._prepareQueryParams(e,t,n)},generateURL:function(e,n,i){var o=(0,r.get)(this,"router")
1901
+ if(o._routerMicrolib){var s={}
1902
+ return i&&((0,t.assign)(s,i),this.normalizeQueryParams(e,n,s)),o.generate.apply(o,[e].concat(n,[{queryParams:s}]))}},isActiveForRoute:function(e,t,n,o,s){var a=(0,r.get)(this,"router"),u=a._routerMicrolib.recognizer.handlersFor(n),c=u[u.length-1].handler,l=i(n,u)
1902
1903
  return e.length>l&&(n=c),o.isActiveIntent(n,e,t,!s)}})}),e("ember-routing/system/cache",["exports","ember-runtime"],function(e,t){"use strict"
1903
1904
  e["default"]=t.Object.extend({init:function(){this.cache=Object.create(null)},has:function(e){return!!this.cache[e]},stash:function(e,t,n){var r=this.cache[e]
1904
1905
  r||(r=this.cache[e]=Object.create(null)),r[t]=n},lookup:function(e,t,n){var r=this.cache
@@ -2571,7 +2572,7 @@ var b,_=s.computed
2571
2572
  _.alias=s.alias,s["default"].computed=_,s["default"].ComputedProperty=s.ComputedProperty,s["default"].cacheFor=s.cacheFor,s["default"].assert=u.assert,s["default"].warn=u.warn,s["default"].debug=u.debug,s["default"].deprecate=u.deprecate,s["default"].deprecateFunc=u.deprecateFunc,s["default"].runInDebug=u.runInDebug,s["default"].Debug={registerDeprecationHandler:u.registerDeprecationHandler,registerWarnHandler:u.registerWarnHandler},s["default"].merge=s.merge,s["default"].instrument=s.instrument,s["default"].subscribe=s.instrumentationSubscribe,s["default"].Instrumentation={instrument:s.instrument,subscribe:s.instrumentationSubscribe,unsubscribe:s.instrumentationUnsubscribe,reset:s.instrumentationReset},s["default"].Error=u.Error,s["default"].META_DESC=s.META_DESC,s["default"].meta=s.meta,s["default"].get=s.get,s["default"].getWithDefault=s.getWithDefault,s["default"]._getPath=s._getPath,s["default"].set=s.set,s["default"].trySet=s.trySet,s["default"].FEATURES=a.FEATURES,s["default"].FEATURES.isEnabled=u.isFeatureEnabled,s["default"]._Cache=s.Cache,s["default"].on=s.on,s["default"].addListener=s.addListener,s["default"].removeListener=s.removeListener,s["default"]._suspendListener=s.suspendListener,s["default"]._suspendListeners=s.suspendListeners,s["default"].sendEvent=s.sendEvent,s["default"].hasListeners=s.hasListeners,s["default"].watchedEvents=s.watchedEvents,s["default"].listenersFor=s.listenersFor,s["default"].isNone=s.isNone,s["default"].isEmpty=s.isEmpty,s["default"].isBlank=s.isBlank,s["default"].isPresent=s.isPresent,s["default"].run=s.run,s["default"]._ObserverSet=s.ObserverSet,s["default"].propertyWillChange=s.propertyWillChange,s["default"].propertyDidChange=s.propertyDidChange,s["default"].overrideChains=s.overrideChains,s["default"].beginPropertyChanges=s.beginPropertyChanges,s["default"].endPropertyChanges=s.endPropertyChanges,s["default"].changeProperties=s.changeProperties,s["default"].platform={defineProperty:!0,hasPropertyAccessors:!0},s["default"].defineProperty=s.defineProperty,s["default"].watchKey=s.watchKey,s["default"].unwatchKey=s.unwatchKey,s["default"].removeChainWatcher=s.removeChainWatcher,s["default"]._ChainNode=s.ChainNode,s["default"].finishChains=s.finishChains,s["default"].watchPath=s.watchPath,s["default"].unwatchPath=s.unwatchPath,s["default"].watch=s.watch,s["default"].isWatching=s.isWatching,s["default"].unwatch=s.unwatch,s["default"].destroy=s.deleteMeta,s["default"].libraries=s.libraries,s["default"].OrderedSet=s.OrderedSet,s["default"].Map=s.Map,s["default"].MapWithDefault=s.MapWithDefault,s["default"].getProperties=s.getProperties,s["default"].setProperties=s.setProperties,s["default"].expandProperties=s.expandProperties,s["default"].NAME_KEY=i.NAME_KEY,s["default"].addObserver=s.addObserver,s["default"].observersFor=s.observersFor,s["default"].removeObserver=s.removeObserver,s["default"]._suspendObserver=s._suspendObserver,s["default"]._suspendObservers=s._suspendObservers,s["default"].required=s.required,s["default"].aliasMethod=s.aliasMethod,s["default"].observer=s.observer,s["default"].immediateObserver=s._immediateObserver,s["default"].mixin=s.mixin,s["default"].Mixin=s.Mixin,s["default"].bind=s.bind,s["default"].Binding=s.Binding,s["default"].isGlobalPath=s.isGlobalPath,Object.defineProperty(s["default"],"ENV",{get:function(){return n.ENV},enumerable:!1}),Object.defineProperty(s["default"],"lookup",{get:function(){return n.context.lookup},set:function(e){n.context.lookup=e},enumerable:!1}),s["default"].EXTEND_PROTOTYPES=n.ENV.EXTEND_PROTOTYPES,Object.defineProperty(s["default"],"LOG_STACKTRACE_ON_DEPRECATION",{get:function(){return n.ENV.LOG_STACKTRACE_ON_DEPRECATION},set:function(e){n.ENV.LOG_STACKTRACE_ON_DEPRECATION=!!e},enumerable:!1}),Object.defineProperty(s["default"],"LOG_VERSION",{get:function(){return n.ENV.LOG_VERSION},set:function(e){n.ENV.LOG_VERSION=!!e},enumerable:!1}),Object.defineProperty(s["default"],"LOG_BINDINGS",{get:function(){return n.ENV.LOG_BINDINGS},set:function(e){n.ENV.LOG_BINDINGS=!!e},enumerable:!1}),Object.defineProperty(s["default"],"onerror",{get:s.getOnerror,set:s.setOnerror,enumerable:!1}),Object.defineProperty(s["default"],"K",{get:function(){return v}}),Object.defineProperty(s["default"],"testing",{get:u.isTesting,set:u.setTesting,enumerable:!1}),s["default"]._Backburner=c["default"],s["default"].Logger=l["default"],s["default"].String=p.String,s["default"].Object=p.Object,s["default"]._RegistryProxyMixin=p.RegistryProxyMixin,s["default"]._ContainerProxyMixin=p.ContainerProxyMixin,s["default"].compare=p.compare,s["default"].copy=p.copy,s["default"].isEqual=p.isEqual,s["default"].inject=p.inject,s["default"].Array=p.Array,s["default"].Comparable=p.Comparable,s["default"].Enumerable=p.Enumerable,s["default"].ArrayProxy=p.ArrayProxy,s["default"].ObjectProxy=p.ObjectProxy,s["default"].ActionHandler=p.ActionHandler,s["default"].CoreObject=p.CoreObject,s["default"].NativeArray=p.NativeArray,s["default"].Copyable=p.Copyable,s["default"].Freezable=p.Freezable,s["default"].FROZEN_ERROR=p.FROZEN_ERROR,s["default"].MutableEnumerable=p.MutableEnumerable,s["default"].MutableArray=p.MutableArray,s["default"].TargetActionSupport=p.TargetActionSupport,s["default"].Evented=p.Evented,s["default"].PromiseProxyMixin=p.PromiseProxyMixin,s["default"].Observable=p.Observable,s["default"].typeOf=p.typeOf,s["default"].isArray=p.isArray,s["default"].Object=p.Object,s["default"].onLoad=p.onLoad,s["default"].runLoadHooks=p.runLoadHooks,s["default"].Controller=p.Controller,s["default"].ControllerMixin=p.ControllerMixin,s["default"].Service=p.Service,s["default"]._ProxyMixin=p._ProxyMixin,s["default"].RSVP=p.RSVP,s["default"].Namespace=p.Namespace,_.empty=p.empty,_.notEmpty=p.notEmpty,_.none=p.none,_.not=p.not,_.bool=p.bool,_.match=p.match,_.equal=p.equal,_.gt=p.gt,_.gte=p.gte,_.lt=p.lt,_.lte=p.lte,_.oneWay=p.oneWay,_.reads=p.oneWay,_.readOnly=p.readOnly,_.deprecatingAlias=p.deprecatingAlias,_.and=p.and,_.or=p.or,_.any=p.any,_.sum=p.sum,_.min=p.min,_.max=p.max,_.map=p.map,_.sort=p.sort,_.setDiff=p.setDiff,_.mapBy=p.mapBy,_.filter=p.filter,_.filterBy=p.filterBy,_.uniq=p.uniq,_.uniqBy=p.uniqBy,_.union=p.union,_.intersect=p.intersect,_.collect=p.collect,Object.defineProperty(s["default"],"STRINGS",{configurable:!1,get:p.getStrings,set:p.setStrings}),Object.defineProperty(s["default"],"BOOTED",{configurable:!1,enumerable:!1,get:p.isNamespaceSearchDisabled,set:p.setNamespaceSearchDisabled}),s["default"].Component=h.Component,h.Helper.helper=h.helper,s["default"].Helper=h.Helper,s["default"].Checkbox=h.Checkbox,s["default"].TextField=h.TextField,s["default"].TextArea=h.TextArea,s["default"].LinkComponent=h.LinkComponent,n.ENV.EXTEND_PROTOTYPES.String&&(String.prototype.htmlSafe=function(){return(0,h.htmlSafe)(this)})
2572
2573
  var w=s["default"].Handlebars=s["default"].Handlebars||{},O=s["default"].HTMLBars=s["default"].HTMLBars||{},E=w.Utils=w.Utils||{}
2573
2574
  Object.defineProperty(w,"SafeString",{get:h._getSafeString}),O.template=w.template=h.template,E.escapeExpression=h.escapeExpression,p.String.htmlSafe=h.htmlSafe,p.String.isHTMLSafe=h.isHTMLSafe,Object.defineProperty(s["default"],"TEMPLATES",{get:h.getTemplates,set:h.setTemplates,configurable:!1,enumerable:!1}),e.VERSION=f["default"],s["default"].VERSION=f["default"],s.libraries.registerCoreLibrary("Ember",f["default"]),s["default"].$=d.jQuery,s["default"].ViewTargetActionSupport=d.ViewTargetActionSupport,s["default"].ViewUtils={isSimpleClick:d.isSimpleClick,getViewElement:d.getViewElement,getViewBounds:d.getViewBounds,getViewClientRects:d.getViewClientRects,getViewBoundingClientRect:d.getViewBoundingClientRect,getRootViews:d.getRootViews,getChildViews:d.getChildViews},s["default"].TextSupport=d.TextSupport,s["default"].ComponentLookup=d.ComponentLookup,s["default"].EventDispatcher=d.EventDispatcher,s["default"].Location=m.Location,s["default"].AutoLocation=m.AutoLocation,s["default"].HashLocation=m.HashLocation,s["default"].HistoryLocation=m.HistoryLocation,s["default"].NoneLocation=m.NoneLocation,s["default"].controllerFor=m.controllerFor,s["default"].generateControllerFactory=m.generateControllerFactory,s["default"].generateController=m.generateController,s["default"].RouterDSL=m.RouterDSL,s["default"].Router=m.Router,s["default"].Route=m.Route,s["default"].Application=g.Application,s["default"].ApplicationInstance=g.ApplicationInstance,s["default"].Engine=g.Engine,s["default"].EngineInstance=g.EngineInstance,s["default"].DefaultResolver=s["default"].Resolver=g.Resolver,(0,p.runLoadHooks)("Ember.Application",g.Application),s["default"].DataAdapter=y.DataAdapter,s["default"].ContainerDebugAdapter=y.ContainerDebugAdapter,(0,t.has)("ember-template-compiler")&&(0,t["default"])("ember-template-compiler"),(0,t.has)("ember-testing")&&(b=(0,t["default"])("ember-testing"),s["default"].Test=b.Test,s["default"].Test.Adapter=b.Adapter,s["default"].Test.QUnitAdapter=b.QUnitAdapter,s["default"].setupForTesting=b.setupForTesting),(0,p.runLoadHooks)("Ember"),e["default"]=s["default"],r.IS_NODE?r.module.exports=s["default"]:n.context.exports.Ember=n.context.exports.Em=s["default"]}),e("ember/version",["exports"],function(e){"use strict"
2574
- e["default"]="2.18.0-beta.1"}),e("node-module",["exports"],function(e){var t="object"==typeof module&&"function"==typeof module.require
2575
+ e["default"]="2.18.0-beta.2"}),e("node-module",["exports"],function(e){var t="object"==typeof module&&"function"==typeof module.require
2575
2576
  t?(e.require=module.require,e.module=module,e.IS_NODE=t):(e.require=null,e.module=null,e.IS_NODE=t)}),e("route-recognizer",["exports"],function(e){"use strict"
2576
2577
  function t(){var e=g(null)
2577
2578
  return e.__=void 0,delete e.__,e}function n(e,t,r){return function(i,o){var s=e+i
data/dist/ember.prod.js CHANGED
@@ -6,7 +6,7 @@
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.18.0-beta.1
9
+ * @version 2.18.0-beta.2
10
10
  */
11
11
 
12
12
  /*global process */
@@ -9595,17 +9595,20 @@ enifed('backburner', ['exports'], function (exports) {
9595
9595
  var queue = this._queue;
9596
9596
  var guid = this.guidForTarget(target);
9597
9597
  var targetQueue = guid ? this.targetQueues[guid] : undefined;
9598
+ var index = void 0;
9598
9599
  if (targetQueue !== undefined) {
9599
9600
  t = void 0;
9600
9601
 
9601
9602
  for (i = 0, l = targetQueue.length; i < l; i += 2) {
9602
9603
  t = targetQueue[i];
9603
9604
  if (t === method) {
9604
- targetQueue.splice(i, 1);
9605
+ index = targetQueue.splice(i, 2)[1];
9605
9606
  }
9606
9607
  }
9607
9608
  }
9608
- var index = findItem(target, method, queue);
9609
+ if (index === undefined) {
9610
+ index = findItem(target, method, queue);
9611
+ }
9609
9612
  if (index > -1) {
9610
9613
  queue.splice(index, 4);
9611
9614
  return true;
@@ -9676,7 +9679,7 @@ enifed('backburner', ['exports'], function (exports) {
9676
9679
  };
9677
9680
 
9678
9681
  Queue.prototype.invoke = function (target, method, args /*, onError, errorRecordedForStack */) {
9679
- if (args && args.length > 0) {
9682
+ if (args !== undefined) {
9680
9683
  method.apply(target, args);
9681
9684
  } else {
9682
9685
  method.call(target);
@@ -9685,7 +9688,7 @@ enifed('backburner', ['exports'], function (exports) {
9685
9688
 
9686
9689
  Queue.prototype.invokeWithOnError = function (target, method, args, onError, errorRecordedForStack) {
9687
9690
  try {
9688
- if (args && args.length > 0) {
9691
+ if (args !== undefined) {
9689
9692
  method.apply(target, args);
9690
9693
  } else {
9691
9694
  method.call(target);
@@ -9943,43 +9946,16 @@ enifed('backburner', ['exports'], function (exports) {
9943
9946
  method = _parseArgs[1],
9944
9947
  args = _parseArgs[2];
9945
9948
 
9946
- var onError = getOnError(this.options);
9947
- this.begin();
9948
- if (onError) {
9949
- try {
9950
- return method.apply(target, args);
9951
- } catch (error) {
9952
- onError(error);
9953
- } finally {
9954
- this.end();
9955
- }
9956
- } else {
9957
- try {
9958
- return method.apply(target, args);
9959
- } finally {
9960
- this.end();
9961
- }
9962
- }
9949
+ return this._run(target, method, args);
9963
9950
  };
9964
9951
 
9965
9952
  Backburner.prototype.join = function () {
9966
- if (this.currentInstance === null) {
9967
- return this.run.apply(this, arguments);
9968
- }
9969
-
9970
9953
  var _parseArgs2 = parseArgs.apply(undefined, arguments),
9971
9954
  target = _parseArgs2[0],
9972
9955
  method = _parseArgs2[1],
9973
9956
  args = _parseArgs2[2];
9974
9957
 
9975
- var length = arguments.length;
9976
- if (length === 1) {
9977
- return method();
9978
- } else if (length === 2) {
9979
- return method.call(target);
9980
- } else {
9981
- return method.apply(target, args);
9982
- }
9958
+ return this._join(target, method, args);
9983
9959
  };
9984
9960
 
9985
9961
  Backburner.prototype.defer = function () {
@@ -10125,12 +10101,15 @@ enifed('backburner', ['exports'], function (exports) {
10125
10101
  wait = args.pop();
10126
10102
  isImmediate = immediate === true;
10127
10103
  }
10128
- wait = parseInt(wait, 10);
10104
+ if (isString(method)) {
10105
+ method = target[method];
10106
+ }
10129
10107
  var index = findItem(target, method, this._throttlers);
10130
10108
  if (index > -1) {
10131
10109
  this._throttlers[index + 2] = args;
10132
10110
  return this._throttlers[index + 3];
10133
10111
  } // throttled
10112
+ wait = parseInt(wait, 10);
10134
10113
  var timer = this._platform.setTimeout(function () {
10135
10114
  var i = findTimer(timer, _this2._throttlers);
10136
10115
 
@@ -10140,11 +10119,11 @@ enifed('backburner', ['exports'], function (exports) {
10140
10119
  params = _throttlers$splice[2];
10141
10120
 
10142
10121
  if (isImmediate === false) {
10143
- _this2.run.apply(_this2, [context, func].concat(params));
10122
+ _this2._run(context, func, params);
10144
10123
  }
10145
10124
  }, wait);
10146
10125
  if (isImmediate) {
10147
- this.join.apply(this, [target, method].concat(args));
10126
+ this._join(target, method, args);
10148
10127
  }
10149
10128
  this._throttlers.push(target, method, args, timer);
10150
10129
  return timer;
@@ -10171,6 +10150,9 @@ enifed('backburner', ['exports'], function (exports) {
10171
10150
  wait = args.pop();
10172
10151
  isImmediate = immediate === true;
10173
10152
  }
10153
+ if (isString(method)) {
10154
+ method = target[method];
10155
+ }
10174
10156
  wait = parseInt(wait, 10);
10175
10157
  // Remove debouncee
10176
10158
  var index = findItem(target, method, this._debouncees);
@@ -10189,11 +10171,11 @@ enifed('backburner', ['exports'], function (exports) {
10189
10171
  params = _debouncees$splice[2];
10190
10172
 
10191
10173
  if (isImmediate === false) {
10192
- _this3.run.apply(_this3, [context, func].concat(params));
10174
+ _this3._run(context, func, params);
10193
10175
  }
10194
10176
  }, wait);
10195
10177
  if (isImmediate && index === -1) {
10196
- this.join.apply(this, [target, method].concat(args));
10178
+ this._join(target, method, args);
10197
10179
  }
10198
10180
  this._debouncees.push(target, method, args, timer);
10199
10181
  return timer;
@@ -10238,6 +10220,37 @@ enifed('backburner', ['exports'], function (exports) {
10238
10220
  this._ensureInstance();
10239
10221
  };
10240
10222
 
10223
+ Backburner.prototype._join = function (target, method, args) {
10224
+ if (this.currentInstance === null) {
10225
+ return this._run(target, method, args);
10226
+ }
10227
+ if (target === undefined && args === undefined) {
10228
+ return method();
10229
+ } else {
10230
+ return method.apply(target, args);
10231
+ }
10232
+ };
10233
+
10234
+ Backburner.prototype._run = function (target, method, args) {
10235
+ var onError = getOnError(this.options);
10236
+ this.begin();
10237
+ if (onError) {
10238
+ try {
10239
+ return method.apply(target, args);
10240
+ } catch (error) {
10241
+ onError(error);
10242
+ } finally {
10243
+ this.end();
10244
+ }
10245
+ } else {
10246
+ try {
10247
+ return method.apply(target, args);
10248
+ } finally {
10249
+ this.end();
10250
+ }
10251
+ }
10252
+ };
10253
+
10241
10254
  Backburner.prototype._cancelAutorun = function () {
10242
10255
  if (this._autorun !== null) {
10243
10256
  this._platform.clearNext(this._autorun);
@@ -15982,7 +15995,7 @@ enifed('ember-glimmer/components/link-to', ['exports', 'ember-debug', 'ember-met
15982
15995
  currentWhen: (0, _emberRuntime.deprecatingAlias)('current-when', { id: 'ember-routing-view.deprecated-current-when', until: '3.0.0' }),
15983
15996
  /**
15984
15997
  Used to determine when this `LinkComponent` is active.
15985
- @property currentWhen
15998
+ @property current-when
15986
15999
  @public
15987
16000
  */
15988
16001
  'current-when': null,
@@ -29720,7 +29733,11 @@ enifed('ember-routing/services/routing', ['exports', 'ember-utils', 'ember-runti
29720
29733
  (0, _emberMetal.get)(this, 'router')._prepareQueryParams(routeName, models, queryParams);
29721
29734
  },
29722
29735
  generateURL: function (routeName, models, queryParams) {
29723
- var _get;
29736
+ var router = (0, _emberMetal.get)(this, 'router');
29737
+ // return early when the router microlib is not present, which is the case for {{link-to}} in integration tests
29738
+ if (!router._routerMicrolib) {
29739
+ return;
29740
+ }
29724
29741
 
29725
29742
  var visibleQueryParams = {};
29726
29743
  if (queryParams) {
@@ -29728,7 +29745,7 @@ enifed('ember-routing/services/routing', ['exports', 'ember-utils', 'ember-runti
29728
29745
  this.normalizeQueryParams(routeName, models, visibleQueryParams);
29729
29746
  }
29730
29747
 
29731
- return (_get = (0, _emberMetal.get)(this, 'router')).generate.apply(_get, [routeName].concat(models, [{ queryParams: visibleQueryParams }]));
29748
+ return router.generate.apply(router, [routeName].concat(models, [{ queryParams: visibleQueryParams }]));
29732
29749
  },
29733
29750
  isActiveForRoute: function (contexts, queryParams, routeName, routerState, isCurrentWhenSpecified) {
29734
29751
  var router = (0, _emberMetal.get)(this, 'router');
@@ -35919,7 +35936,9 @@ enifed('ember-runtime/inject', ['exports', 'ember-metal', 'ember-debug'], functi
35919
35936
  @public
35920
35937
  */
35921
35938
  function inject() {
35922
- false && !false && (0, _emberDebug.assert)('Injected properties must be created through helpers, see \'' + Object.keys(inject).join('"', '"') + '\'');
35939
+ false && !false && (0, _emberDebug.assert)('Injected properties must be created through helpers, see \'' + Object.keys(inject).map(function (k) {
35940
+ return '\'inject.' + k + '\'';
35941
+ }).join(' or ') + '\'');
35923
35942
  }
35924
35943
 
35925
35944
  // Dictionary of injection validations by type, added to by `createInjectionHelper`
@@ -43807,7 +43826,7 @@ enifed('ember/index', ['exports', 'require', 'ember-environment', 'node-module',
43807
43826
  enifed("ember/version", ["exports"], function (exports) {
43808
43827
  "use strict";
43809
43828
 
43810
- exports.default = "2.18.0-beta.1";
43829
+ exports.default = "2.18.0-beta.2";
43811
43830
  });
43812
43831
  /*global enifed */
43813
43832
  enifed('node-module', ['exports'], function(_exports) {
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ember-source",
3
- "version": "2.18.0-beta.1",
3
+ "version": "2.18.0-beta.2",
4
4
  "description": "A JavaScript framework for creating ambitious web applications",
5
5
  "keywords": [
6
6
  "ember-addon"
@@ -78,7 +78,7 @@
78
78
  "babel-plugin-transform-es2015-template-literals": "^6.22.0",
79
79
  "babel-plugin-transform-proto-to-assign": "^6.23.0",
80
80
  "babel-template": "^6.24.1",
81
- "backburner.js": "^1.3.1",
81
+ "backburner.js": "^1.3.3",
82
82
  "broccoli-babel-transpiler": "^6.1.1",
83
83
  "broccoli-concat": "^3.2.2",
84
84
  "broccoli-debug": "^0.6.3",
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.18.0.beta.1
4
+ version: 2.18.0.beta.2
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-11-29 00:00:00.000000000 Z
11
+ date: 2017-12-04 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Ember.js source code wrapper for use with Ruby libs.
14
14
  email: