ember-source 2.12.0.beta.2 → 2.12.0.beta.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/dist/ember-runtime.js +19 -13
- data/dist/ember-template-compiler.js +10 -6
- data/dist/ember-testing.js +2 -2
- data/dist/ember-tests.js +103 -20
- data/dist/ember-tests.prod.js +101 -20
- data/dist/ember.debug.js +47 -32
- data/dist/ember.js +47 -32
- data/dist/ember.min.js +746 -742
- data/dist/ember.prod.js +45 -30
- metadata +2 -2
data/dist/ember-tests.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.12.0-beta.
|
9
|
+
* @version 2.12.0-beta.3
|
10
10
|
*/
|
11
11
|
|
12
12
|
var enifed, requireModule, Ember;
|
@@ -164,7 +164,7 @@ function defaults(obj, defaults) {
|
|
164
164
|
return obj;
|
165
165
|
}
|
166
166
|
|
167
|
-
babelHelpers = {
|
167
|
+
var babelHelpers = {
|
168
168
|
inherits: inherits,
|
169
169
|
taggedTemplateLiteralLoose: taggedTemplateLiteralLoose,
|
170
170
|
slice: Array.prototype.slice,
|
@@ -7721,6 +7721,14 @@ enifed('ember-extension-support/tests/data_adapter_test', ['exports', 'ember-met
|
|
7721
7721
|
_emberMetal.set(post, 'title', 'New Title');
|
7722
7722
|
equal(updatesCalled, 1, 'Release function removes observers');
|
7723
7723
|
});
|
7724
|
+
|
7725
|
+
QUnit.test('_nameToClass does not error when not found', function (assert) {
|
7726
|
+
adapter = App.__container__.lookup('data-adapter:main');
|
7727
|
+
|
7728
|
+
var klass = adapter._nameToClass('App.Foo');
|
7729
|
+
|
7730
|
+
assert.equal(klass, undefined, 'returns undefined');
|
7731
|
+
});
|
7724
7732
|
});
|
7725
7733
|
enifed('ember-extension-support/tests/data_adapter_test.lint-test', ['exports'], function (exports) {
|
7726
7734
|
'use strict';
|
@@ -16562,6 +16570,48 @@ enifed('ember-glimmer/tests/integration/components/curly-components-test.lint-te
|
|
16562
16570
|
assert.ok(true, 'ember-glimmer/tests/integration/components/curly-components-test.js should pass ESLint\n\n');
|
16563
16571
|
});
|
16564
16572
|
});
|
16573
|
+
enifed('ember-glimmer/tests/integration/components/destroy-test', ['exports', 'ember-metal', 'ember-glimmer/tests/utils/helpers', 'ember-glimmer/tests/utils/test-case'], function (exports, _emberMetal, _emberGlimmerTestsUtilsHelpers, _emberGlimmerTestsUtilsTestCase) {
|
16574
|
+
'use strict';
|
16575
|
+
|
16576
|
+
_emberGlimmerTestsUtilsTestCase.moduleFor('Component destroy', (function (_RenderingTest) {
|
16577
|
+
babelHelpers.inherits(_class, _RenderingTest);
|
16578
|
+
|
16579
|
+
function _class() {
|
16580
|
+
_RenderingTest.apply(this, arguments);
|
16581
|
+
}
|
16582
|
+
|
16583
|
+
_class.prototype['@test it correctly releases the destroyed components'] = function testItCorrectlyReleasesTheDestroyedComponents(assert) {
|
16584
|
+
var _this = this;
|
16585
|
+
|
16586
|
+
var FooBarComponent = _emberGlimmerTestsUtilsHelpers.Component.extend({});
|
16587
|
+
|
16588
|
+
this.registerComponent('foo-bar', { ComponentClass: FooBarComponent, template: 'hello' });
|
16589
|
+
|
16590
|
+
this.render('{{#if switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', { switch: true });
|
16591
|
+
|
16592
|
+
this.assertComponentElement(this.firstChild, { content: 'hello' });
|
16593
|
+
|
16594
|
+
this.runTask(function () {
|
16595
|
+
return _emberMetal.set(_this.context, 'switch', false);
|
16596
|
+
});
|
16597
|
+
|
16598
|
+
this.assertText('');
|
16599
|
+
|
16600
|
+
assert.equal(this.env.destroyedComponents.length, 0, 'enviroment.destroyedComponents should be empty');
|
16601
|
+
};
|
16602
|
+
|
16603
|
+
return _class;
|
16604
|
+
})(_emberGlimmerTestsUtilsTestCase.RenderingTest));
|
16605
|
+
});
|
16606
|
+
enifed('ember-glimmer/tests/integration/components/destroy-test.lint-test', ['exports'], function (exports) {
|
16607
|
+
'use strict';
|
16608
|
+
|
16609
|
+
QUnit.module('ESLint | ember-glimmer/tests/integration/components/destroy-test.js');
|
16610
|
+
QUnit.test('should pass ESLint', function (assert) {
|
16611
|
+
assert.expect(1);
|
16612
|
+
assert.ok(true, 'ember-glimmer/tests/integration/components/destroy-test.js should pass ESLint\n\n');
|
16613
|
+
});
|
16614
|
+
});
|
16565
16615
|
enifed('ember-glimmer/tests/integration/components/dynamic-components-test', ['exports', 'ember-metal', 'ember-glimmer/tests/utils/helpers', 'ember-glimmer/tests/utils/abstract-test-case', 'ember-glimmer/tests/utils/test-case'], function (exports, _emberMetal, _emberGlimmerTestsUtilsHelpers, _emberGlimmerTestsUtilsAbstractTestCase, _emberGlimmerTestsUtilsTestCase) {
|
16566
16616
|
'use strict';
|
16567
16617
|
|
@@ -22285,8 +22335,8 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
|
|
22285
22335
|
_emberMetal.setDebugFunction('warn', originalWarn);
|
22286
22336
|
};
|
22287
22337
|
|
22288
|
-
StyleTest.prototype.assertStyleWarning = function assertStyleWarning() {
|
22289
|
-
this.assert.deepEqual(warnings, [_emberViews.
|
22338
|
+
StyleTest.prototype.assertStyleWarning = function assertStyleWarning(style) {
|
22339
|
+
this.assert.deepEqual(warnings, [_emberViews.constructStyleDeprecationMessage(style)]);
|
22290
22340
|
};
|
22291
22341
|
|
22292
22342
|
StyleTest.prototype.assertNoWarning = function assertNoWarning() {
|
@@ -22381,11 +22431,12 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
|
|
22381
22431
|
}
|
22382
22432
|
|
22383
22433
|
_class9.prototype['@test specifying <div style={{userValue}}></div> generates a warning'] = function testSpecifyingDivStyleUserValueDivGeneratesAWarning(assert) {
|
22434
|
+
var userValue = 'width: 42px';
|
22384
22435
|
this.render('<div style={{userValue}}></div>', {
|
22385
|
-
userValue:
|
22436
|
+
userValue: userValue
|
22386
22437
|
});
|
22387
22438
|
|
22388
|
-
this.assertStyleWarning();
|
22439
|
+
this.assertStyleWarning(userValue);
|
22389
22440
|
};
|
22390
22441
|
|
22391
22442
|
_class9.prototype['@test specifying `attributeBindings: ["style"]` generates a warning'] = function testSpecifyingAttributeBindingsStyleGeneratesAWarning(assert) {
|
@@ -22394,12 +22445,12 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
|
|
22394
22445
|
});
|
22395
22446
|
|
22396
22447
|
this.registerComponent('foo-bar', { ComponentClass: FooBarComponent, template: 'hello' });
|
22397
|
-
|
22448
|
+
var userValue = 'width: 42px';
|
22398
22449
|
this.render('{{foo-bar style=userValue}}', {
|
22399
|
-
userValue:
|
22450
|
+
userValue: userValue
|
22400
22451
|
});
|
22401
22452
|
|
22402
|
-
this.assertStyleWarning();
|
22453
|
+
this.assertStyleWarning(userValue);
|
22403
22454
|
};
|
22404
22455
|
|
22405
22456
|
_class9.prototype['@test specifying `<div style={{{userValue}}}></div>` works properly without a warning'] = function testSpecifyingDivStyleUserValueDivWorksProperlyWithoutAWarning(assert) {
|
@@ -22449,35 +22500,39 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
|
|
22449
22500
|
};
|
22450
22501
|
|
22451
22502
|
_class9.prototype['@test binding warning is triggered when an unsafe string is quoted'] = function testBindingWarningIsTriggeredWhenAnUnsafeStringIsQuoted(assert) {
|
22503
|
+
var userValue = 'width: 42px';
|
22452
22504
|
this.render('<div style="{{userValue}}"></div>', {
|
22453
|
-
userValue:
|
22505
|
+
userValue: userValue
|
22454
22506
|
});
|
22455
22507
|
|
22456
|
-
this.assertStyleWarning();
|
22508
|
+
this.assertStyleWarning(userValue);
|
22457
22509
|
};
|
22458
22510
|
|
22459
22511
|
_class9.prototype['@test binding warning is triggered when a safe string for a complete property is concatenated in place'] = function testBindingWarningIsTriggeredWhenASafeStringForACompletePropertyIsConcatenatedInPlace(assert) {
|
22512
|
+
var userValue = 'width: 42px';
|
22460
22513
|
this.render('<div style="color: green; {{userValue}}"></div>', {
|
22461
22514
|
userValue: new _emberGlimmerTestsUtilsHelpers.SafeString('width: 42px')
|
22462
22515
|
});
|
22463
22516
|
|
22464
|
-
this.assertStyleWarning();
|
22517
|
+
this.assertStyleWarning('color: green; ' + userValue);
|
22465
22518
|
};
|
22466
22519
|
|
22467
22520
|
_class9.prototype['@test binding warning is triggered when a safe string for a value is concatenated in place'] = function testBindingWarningIsTriggeredWhenASafeStringForAValueIsConcatenatedInPlace(assert) {
|
22521
|
+
var userValue = '42px';
|
22468
22522
|
this.render('<div style="color: green; width: {{userValue}}"></div>', {
|
22469
|
-
userValue: new _emberGlimmerTestsUtilsHelpers.SafeString(
|
22523
|
+
userValue: new _emberGlimmerTestsUtilsHelpers.SafeString(userValue)
|
22470
22524
|
});
|
22471
22525
|
|
22472
|
-
this.assertStyleWarning();
|
22526
|
+
this.assertStyleWarning('color: green; width: ' + userValue);
|
22473
22527
|
};
|
22474
22528
|
|
22475
22529
|
_class9.prototype['@test binding warning is triggered when a safe string for a property name is concatenated in place'] = function testBindingWarningIsTriggeredWhenASafeStringForAPropertyNameIsConcatenatedInPlace(assert) {
|
22530
|
+
var userValue = 'width';
|
22476
22531
|
this.render('<div style="color: green; {{userProperty}}: 42px"></div>', {
|
22477
|
-
userProperty: new _emberGlimmerTestsUtilsHelpers.SafeString(
|
22532
|
+
userProperty: new _emberGlimmerTestsUtilsHelpers.SafeString(userValue)
|
22478
22533
|
});
|
22479
22534
|
|
22480
|
-
this.assertStyleWarning();
|
22535
|
+
this.assertStyleWarning('color: green; ' + userValue + ': 42px');
|
22481
22536
|
};
|
22482
22537
|
|
22483
22538
|
return _class9;
|
@@ -45285,7 +45340,7 @@ enifed('ember-metal/tests/run_loop/once_test.lint-test', ['exports'], function (
|
|
45285
45340
|
assert.ok(true, 'ember-metal/tests/run_loop/once_test.js should pass ESLint\n\n');
|
45286
45341
|
});
|
45287
45342
|
});
|
45288
|
-
enifed('ember-metal/tests/run_loop/onerror_test', ['exports', 'ember-metal/run_loop', 'ember-metal/error_handler'], function (exports, _emberMetalRun_loop, _emberMetalError_handler) {
|
45343
|
+
enifed('ember-metal/tests/run_loop/onerror_test', ['exports', 'ember-metal/run_loop', 'ember-metal/error_handler', 'ember-metal/testing'], function (exports, _emberMetalRun_loop, _emberMetalError_handler, _emberMetalTesting) {
|
45289
45344
|
'use strict';
|
45290
45345
|
|
45291
45346
|
QUnit.module('system/run_loop/onerror_test');
|
@@ -45312,17 +45367,24 @@ enifed('ember-metal/tests/run_loop/onerror_test', ['exports', 'ember-metal/run_l
|
|
45312
45367
|
QUnit.test('With Ember.onerror set, errors in Ember.run are caught', function () {
|
45313
45368
|
var thrown = new Error('Boom!');
|
45314
45369
|
var original = _emberMetalError_handler.getOnerror();
|
45370
|
+
var originalDispatchOverride = _emberMetalError_handler.getDispatchOverride();
|
45371
|
+
var originalIsTesting = _emberMetalTesting.isTesting();
|
45315
45372
|
|
45316
45373
|
var caught = undefined;
|
45317
45374
|
_emberMetalError_handler.setOnerror(function (error) {
|
45318
45375
|
caught = error;
|
45319
45376
|
});
|
45377
|
+
_emberMetalError_handler.setDispatchOverride(null);
|
45378
|
+
_emberMetalTesting.setTesting(false);
|
45379
|
+
|
45320
45380
|
try {
|
45321
45381
|
_emberMetalRun_loop.default(function () {
|
45322
45382
|
throw thrown;
|
45323
45383
|
});
|
45324
45384
|
} finally {
|
45325
45385
|
_emberMetalError_handler.setOnerror(original);
|
45386
|
+
_emberMetalError_handler.setDispatchOverride(originalDispatchOverride);
|
45387
|
+
_emberMetalTesting.setTesting(originalIsTesting);
|
45326
45388
|
}
|
45327
45389
|
|
45328
45390
|
deepEqual(caught, thrown);
|
@@ -64805,9 +64867,11 @@ enifed('ember-testing/tests/adapters_test', ['exports', 'ember-metal', 'ember-te
|
|
64805
64867
|
originalQUnit = window.QUnit;
|
64806
64868
|
},
|
64807
64869
|
teardown: function () {
|
64808
|
-
|
64809
|
-
|
64810
|
-
|
64870
|
+
if (App) {
|
64871
|
+
_emberMetal.run(App, App.destroy);
|
64872
|
+
App.removeTestHelpers();
|
64873
|
+
App = null;
|
64874
|
+
}
|
64811
64875
|
|
64812
64876
|
_emberTestingTest.default.adapter = originalAdapter;
|
64813
64877
|
window.QUnit = originalQUnit;
|
@@ -64861,6 +64925,23 @@ enifed('ember-testing/tests/adapters_test', ['exports', 'ember-metal', 'ember-te
|
|
64861
64925
|
ok(_emberTestingTest.default.adapter instanceof _emberTestingAdaptersAdapter.default);
|
64862
64926
|
ok(!(_emberTestingTest.default.adapter instanceof _emberTestingAdaptersQunit.default));
|
64863
64927
|
});
|
64928
|
+
|
64929
|
+
QUnit.test('With Ember.Test.adapter set, errors in Ember.run are caught', function () {
|
64930
|
+
var thrown = new Error('Boom!');
|
64931
|
+
|
64932
|
+
var caught = undefined;
|
64933
|
+
_emberTestingTest.default.adapter = _emberTestingAdaptersQunit.default.create({
|
64934
|
+
exception: function (error) {
|
64935
|
+
caught = error;
|
64936
|
+
}
|
64937
|
+
});
|
64938
|
+
|
64939
|
+
_emberMetal.run(function () {
|
64940
|
+
throw thrown;
|
64941
|
+
});
|
64942
|
+
|
64943
|
+
deepEqual(caught, thrown);
|
64944
|
+
});
|
64864
64945
|
});
|
64865
64946
|
enifed('ember-testing/tests/adapters_test.lint-test', ['exports'], function (exports) {
|
64866
64947
|
'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.12.0-beta.
|
9
|
+
* @version 2.12.0-beta.3
|
10
10
|
*/
|
11
11
|
|
12
12
|
var enifed, requireModule, Ember;
|
@@ -174,7 +174,7 @@ function defaults(obj, defaults) {
|
|
174
174
|
return obj;
|
175
175
|
}
|
176
176
|
|
177
|
-
babelHelpers = {
|
177
|
+
var babelHelpers = {
|
178
178
|
classCallCheck: classCallCheck,
|
179
179
|
inherits: inherits,
|
180
180
|
taggedTemplateLiteralLoose: taggedTemplateLiteralLoose,
|
@@ -6732,7 +6732,8 @@ enifed('ember-extension-support/data_adapter', ['exports', 'ember-utils', 'ember
|
|
6732
6732
|
_nameToClass: function (type) {
|
6733
6733
|
if (typeof type === 'string') {
|
6734
6734
|
var owner = _emberUtils.getOwner(this);
|
6735
|
-
|
6735
|
+
var Factory = owner[_container.FACTORY_FOR]('model:' + type);
|
6736
|
+
type = Factory && Factory.class;
|
6736
6737
|
}
|
6737
6738
|
return type;
|
6738
6739
|
},
|
@@ -9186,7 +9187,7 @@ enifed('ember-glimmer/environment', ['exports', 'ember-utils', 'ember-metal', 'e
|
|
9186
9187
|
this.isInteractive = owner.lookup('-environment:main').isInteractive;
|
9187
9188
|
|
9188
9189
|
// can be removed once https://github.com/tildeio/glimmer/pull/305 lands
|
9189
|
-
this.destroyedComponents =
|
9190
|
+
this.destroyedComponents = [];
|
9190
9191
|
|
9191
9192
|
_emberGlimmerProtocolForUrl.default(this);
|
9192
9193
|
|
@@ -9574,16 +9575,16 @@ enifed('ember-glimmer/environment', ['exports', 'ember-utils', 'ember-metal', 'e
|
|
9574
9575
|
this.inTransaction = true;
|
9575
9576
|
|
9576
9577
|
_GlimmerEnvironment.prototype.begin.call(this);
|
9577
|
-
|
9578
|
-
this.destroyedComponents = [];
|
9579
9578
|
};
|
9580
9579
|
|
9581
9580
|
Environment.prototype.commit = function commit() {
|
9581
|
+
var destroyedComponents = this.destroyedComponents;
|
9582
|
+
this.destroyedComponents = [];
|
9582
9583
|
// components queued for destruction must be destroyed before firing
|
9583
9584
|
// `didCreate` to prevent errors when removing and adding a component
|
9584
9585
|
// with the same name (would throw an error when added to view registry)
|
9585
|
-
for (var i = 0; i <
|
9586
|
-
|
9586
|
+
for (var i = 0; i < destroyedComponents.length; i++) {
|
9587
|
+
destroyedComponents[i].destroy();
|
9587
9588
|
}
|
9588
9589
|
|
9589
9590
|
_GlimmerEnvironment.prototype.commit.call(this);
|
@@ -9609,7 +9610,7 @@ enifed('ember-glimmer/environment', ['exports', 'ember-utils', 'ember-metal', 'e
|
|
9609
9610
|
StyleAttributeManager.prototype.setAttribute = function setAttribute(dom, element, value) {
|
9610
9611
|
var _AttributeManager$prototype$setAttribute;
|
9611
9612
|
|
9612
|
-
_emberMetal.warn(_emberViews.
|
9613
|
+
_emberMetal.warn(_emberViews.constructStyleDeprecationMessage(value), (function () {
|
9613
9614
|
if (value === null || value === undefined || _glimmerRuntime.isSafeString(value)) {
|
9614
9615
|
return true;
|
9615
9616
|
}
|
@@ -9621,7 +9622,7 @@ enifed('ember-glimmer/environment', ['exports', 'ember-utils', 'ember-metal', 'e
|
|
9621
9622
|
StyleAttributeManager.prototype.updateAttribute = function updateAttribute(dom, element, value) {
|
9622
9623
|
var _AttributeManager$prototype$updateAttribute;
|
9623
9624
|
|
9624
|
-
_emberMetal.warn(_emberViews.
|
9625
|
+
_emberMetal.warn(_emberViews.constructStyleDeprecationMessage(value), (function () {
|
9625
9626
|
if (value === null || value === undefined || _glimmerRuntime.isSafeString(value)) {
|
9626
9627
|
return true;
|
9627
9628
|
}
|
@@ -10350,7 +10351,7 @@ enifed('ember-glimmer/helpers/component', ['exports', 'ember-utils', 'ember-glim
|
|
10350
10351
|
)}}
|
10351
10352
|
```
|
10352
10353
|
|
10353
|
-
When yielding the component via the `hash` helper, the component is
|
10354
|
+
When yielding the component via the `hash` helper, the component is invoked directly.
|
10354
10355
|
See the following snippet:
|
10355
10356
|
|
10356
10357
|
```
|
@@ -17934,6 +17935,7 @@ enifed('ember-metal/error_handler', ['exports', 'ember-console', 'ember-metal/te
|
|
17934
17935
|
exports.getOnerror = getOnerror;
|
17935
17936
|
exports.setOnerror = setOnerror;
|
17936
17937
|
exports.dispatchError = dispatchError;
|
17938
|
+
exports.getDispatchOverride = getDispatchOverride;
|
17937
17939
|
exports.setDispatchOverride = setDispatchOverride;
|
17938
17940
|
|
17939
17941
|
// To maintain stacktrace consistency across browsers
|
@@ -17974,6 +17976,10 @@ enifed('ember-metal/error_handler', ['exports', 'ember-console', 'ember-metal/te
|
|
17974
17976
|
|
17975
17977
|
// allows testing adapter to override dispatch
|
17976
17978
|
|
17979
|
+
function getDispatchOverride() {
|
17980
|
+
return dispatchOverride;
|
17981
|
+
}
|
17982
|
+
|
17977
17983
|
function setDispatchOverride(handler) {
|
17978
17984
|
dispatchOverride = handler;
|
17979
17985
|
}
|
@@ -22606,7 +22612,7 @@ enifed('ember-metal/run_loop', ['exports', 'ember-utils', 'ember-metal/debug', '
|
|
22606
22612
|
|
22607
22613
|
var onErrorTarget = {
|
22608
22614
|
get onerror() {
|
22609
|
-
return _emberMetalError_handler.
|
22615
|
+
return _emberMetalError_handler.dispatchError;
|
22610
22616
|
},
|
22611
22617
|
set onerror(handler) {
|
22612
22618
|
return _emberMetalError_handler.setOnerror(handler);
|
@@ -35263,9 +35269,9 @@ enifed('ember-runtime/mixins/observable', ['exports', 'ember-metal'], function (
|
|
35263
35269
|
only a sender and key value as parameters or, if you aren't interested in
|
35264
35270
|
any of these values, to write an observer that has no parameters at all.
|
35265
35271
|
@method addObserver
|
35266
|
-
@param {String} key The key to
|
35272
|
+
@param {String} key The key to observe
|
35267
35273
|
@param {Object} target The target object to invoke
|
35268
|
-
@param {String|Function} method The method to invoke
|
35274
|
+
@param {String|Function} method The method to invoke
|
35269
35275
|
@public
|
35270
35276
|
*/
|
35271
35277
|
addObserver: function (key, target, method) {
|
@@ -35277,9 +35283,9 @@ enifed('ember-runtime/mixins/observable', ['exports', 'ember-metal'], function (
|
|
35277
35283
|
the same key, target, and method you passed to `addObserver()` and your
|
35278
35284
|
target will no longer receive notifications.
|
35279
35285
|
@method removeObserver
|
35280
|
-
@param {String} key The key to
|
35286
|
+
@param {String} key The key to observe
|
35281
35287
|
@param {Object} target The target object to invoke
|
35282
|
-
@param {String|Function} method The method to invoke
|
35288
|
+
@param {String|Function} method The method to invoke
|
35283
35289
|
@public
|
35284
35290
|
*/
|
35285
35291
|
removeObserver: function (key, target, method) {
|
@@ -40727,8 +40733,7 @@ enifed('ember-utils/owner', ['exports', 'ember-utils/symbol'], function (exports
|
|
40727
40733
|
For example, this component dynamically looks up a service based on the
|
40728
40734
|
`audioType` passed as an attribute:
|
40729
40735
|
|
40730
|
-
```
|
40731
|
-
// app/components/play-audio.js
|
40736
|
+
```app/components/play-audio.js
|
40732
40737
|
import Ember from 'ember';
|
40733
40738
|
|
40734
40739
|
// Usage:
|
@@ -40952,7 +40957,7 @@ enifed('ember-views/index', ['exports', 'ember-views/system/ext', 'ember-views/s
|
|
40952
40957
|
exports.getViewId = _emberViewsSystemUtils.getViewId;
|
40953
40958
|
exports.getViewElement = _emberViewsSystemUtils.getViewElement;
|
40954
40959
|
exports.setViewElement = _emberViewsSystemUtils.setViewElement;
|
40955
|
-
exports.
|
40960
|
+
exports.constructStyleDeprecationMessage = _emberViewsSystemUtils.constructStyleDeprecationMessage;
|
40956
40961
|
exports.EventDispatcher = _emberViewsSystemEvent_dispatcher.default;
|
40957
40962
|
exports.ComponentLookup = _emberViewsComponent_lookup.default;
|
40958
40963
|
exports.TextSupport = _emberViewsMixinsText_support.default;
|
@@ -42275,9 +42280,11 @@ enifed('ember-views/system/event_dispatcher', ['exports', 'ember-utils', 'ember-
|
|
42275
42280
|
throw new TypeError('Unable to add \'' + ROOT_ELEMENT_CLASS + '\' class to root element (' + (rootElement.selector || rootElement[0].tagName) + '). Make sure you set rootElement to the body or an element in the body.');
|
42276
42281
|
}
|
42277
42282
|
|
42283
|
+
var viewRegistry = this._getViewRegistry();
|
42284
|
+
|
42278
42285
|
for (event in events) {
|
42279
42286
|
if (events.hasOwnProperty(event)) {
|
42280
|
-
this.setupHandler(rootElement, event, events[event]);
|
42287
|
+
this.setupHandler(rootElement, event, events[event], viewRegistry);
|
42281
42288
|
}
|
42282
42289
|
}
|
42283
42290
|
},
|
@@ -42293,13 +42300,11 @@ enifed('ember-views/system/event_dispatcher', ['exports', 'ember-utils', 'ember-
|
|
42293
42300
|
@param {Element} rootElement
|
42294
42301
|
@param {String} event the browser-originated event to listen to
|
42295
42302
|
@param {String} eventName the name of the method to call on the view
|
42303
|
+
@param {Object} viewRegistry
|
42296
42304
|
*/
|
42297
|
-
setupHandler: function (rootElement, event, eventName) {
|
42305
|
+
setupHandler: function (rootElement, event, eventName, viewRegistry) {
|
42298
42306
|
var self = this;
|
42299
42307
|
|
42300
|
-
var owner = _emberUtils.getOwner(this);
|
42301
|
-
var viewRegistry = owner && owner.lookup('-view-registry:main') || _emberViewsCompatFallbackViewRegistry.default;
|
42302
|
-
|
42303
42308
|
if (eventName === null) {
|
42304
42309
|
return;
|
42305
42310
|
}
|
@@ -42340,6 +42345,13 @@ enifed('ember-views/system/event_dispatcher', ['exports', 'ember-utils', 'ember-
|
|
42340
42345
|
});
|
42341
42346
|
},
|
42342
42347
|
|
42348
|
+
_getViewRegistry: function () {
|
42349
|
+
var owner = _emberUtils.getOwner(this);
|
42350
|
+
var viewRegistry = owner && owner.lookup('-view-registry:main') || _emberViewsCompatFallbackViewRegistry.default;
|
42351
|
+
|
42352
|
+
return viewRegistry;
|
42353
|
+
},
|
42354
|
+
|
42343
42355
|
_findNearestEventManager: function (view, eventName) {
|
42344
42356
|
var manager = null;
|
42345
42357
|
|
@@ -42476,6 +42488,7 @@ enifed('ember-views/system/utils', ['exports', 'ember-utils'], function (exports
|
|
42476
42488
|
'use strict';
|
42477
42489
|
|
42478
42490
|
exports.isSimpleClick = isSimpleClick;
|
42491
|
+
exports.constructStyleDeprecationMessage = constructStyleDeprecationMessage;
|
42479
42492
|
exports.getRootViews = getRootViews;
|
42480
42493
|
exports.getViewId = getViewId;
|
42481
42494
|
exports.getViewElement = getViewElement;
|
@@ -42503,9 +42516,10 @@ enifed('ember-views/system/utils', ['exports', 'ember-utils'], function (exports
|
|
42503
42516
|
return !modifier && !secondaryClick;
|
42504
42517
|
}
|
42505
42518
|
|
42506
|
-
|
42519
|
+
function constructStyleDeprecationMessage(affectedStyle) {
|
42520
|
+
return '' + 'Binding style attributes may introduce cross-site scripting vulnerabilities; ' + 'please ensure that values being bound are properly escaped. For more information, ' + 'including how to disable this warning, see ' + 'http://emberjs.com/deprecations/v1.x/#toc_binding-style-attributes. ' + 'Style affected: "' + affectedStyle + '"';
|
42521
|
+
}
|
42507
42522
|
|
42508
|
-
exports.STYLE_WARNING = STYLE_WARNING;
|
42509
42523
|
/**
|
42510
42524
|
@private
|
42511
42525
|
@method getRootViews
|
@@ -43525,7 +43539,7 @@ enifed('ember/index', ['exports', 'require', 'ember-environment', 'ember-utils',
|
|
43525
43539
|
enifed("ember/version", ["exports"], function (exports) {
|
43526
43540
|
"use strict";
|
43527
43541
|
|
43528
|
-
exports.default = "2.12.0-beta.
|
43542
|
+
exports.default = "2.12.0-beta.3";
|
43529
43543
|
});
|
43530
43544
|
enifed('internal-test-helpers/apply-mixins', ['exports', 'ember-utils'], function (exports, _emberUtils) {
|
43531
43545
|
'use strict';
|
@@ -58911,6 +58925,7 @@ enifed('rsvp', ['exports'], function (exports) {
|
|
58911
58925
|
} else {
|
58912
58926
|
if (then$$ === GET_THEN_ERROR) {
|
58913
58927
|
reject(promise, GET_THEN_ERROR.error);
|
58928
|
+
GET_THEN_ERROR.error = null;
|
58914
58929
|
} else if (then$$ === undefined) {
|
58915
58930
|
fulfill(promise, maybeThenable);
|
58916
58931
|
} else if (isFunction(then$$)) {
|
@@ -59038,10 +59053,10 @@ enifed('rsvp', ['exports'], function (exports) {
|
|
59038
59053
|
if (value === TRY_CATCH_ERROR) {
|
59039
59054
|
failed = true;
|
59040
59055
|
error = value.error;
|
59041
|
-
value = null;
|
59056
|
+
value.error = null; // release
|
59042
59057
|
} else {
|
59043
|
-
|
59044
|
-
|
59058
|
+
succeeded = true;
|
59059
|
+
}
|
59045
59060
|
|
59046
59061
|
if (promise === value) {
|
59047
59062
|
reject(promise, withOwnPromise());
|
@@ -59825,7 +59840,7 @@ enifed('rsvp', ['exports'], function (exports) {
|
|
59825
59840
|
try {
|
59826
59841
|
return findAuthor(); // succeed or fail
|
59827
59842
|
} catch(error) {
|
59828
|
-
return
|
59843
|
+
return findOtherAuthor();
|
59829
59844
|
} finally {
|
59830
59845
|
// always runs
|
59831
59846
|
// doesn't affect the return value
|
@@ -59836,7 +59851,7 @@ enifed('rsvp', ['exports'], function (exports) {
|
|
59836
59851
|
|
59837
59852
|
```js
|
59838
59853
|
findAuthor().catch(function(reason){
|
59839
|
-
return
|
59854
|
+
return findOtherAuthor();
|
59840
59855
|
}).finally(function(){
|
59841
59856
|
// author was either found, or not
|
59842
59857
|
});
|