ember-source 2.6.0.beta.4 → 2.6.0
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 +13 -11
- data/dist/ember-template-compiler.js +5 -5
- data/dist/ember-testing.js +1 -1
- data/dist/ember.debug.js +57 -27
- data/dist/ember.js +57 -27
- data/dist/ember.min.js +14 -14
- data/dist/ember.prod.js +48 -28
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9c41047d62f106c123098502befbe2e16b50c321
|
4
|
+
data.tar.gz: bbed62b6e3d6cfdb1bab2799d650eda43c38e044
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f18792d2b709633fcf778dc681a5551daa26252c1a970786dd1b80eb715983e77035f9cfbf760243cb19b6b6a76c7507a9b3039d2f604d3eed559e3a58dd3601
|
7
|
+
data.tar.gz: d2ac940e07f11d8ce35e0915e2b737121ff76d64136beca8a804e1216a387224b04964a71eff9573e8f2ef85a3e47c46f4be9edaf6c461277d3ace94c89bc55a
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
2.6.0
|
1
|
+
2.6.0
|
data/dist/ember-runtime.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.6.0
|
9
|
+
* @version 2.6.0
|
10
10
|
*/
|
11
11
|
|
12
12
|
var enifed, requireModule, require, Ember;
|
@@ -1484,13 +1484,15 @@ enifed('container/container', ['exports', 'ember-metal/core', 'ember-metal/debug
|
|
1484
1484
|
|
1485
1485
|
validationCache = container.validationCache;
|
1486
1486
|
|
1487
|
-
|
1488
|
-
|
1489
|
-
|
1490
|
-
|
1487
|
+
_emberMetalDebug.runInDebug(function () {
|
1488
|
+
// Ensure that all lazy injections are valid at instantiation time
|
1489
|
+
if (!validationCache[fullName] && typeof factory._lazyInjections === 'function') {
|
1490
|
+
lazyInjections = factory._lazyInjections();
|
1491
|
+
lazyInjections = container.registry.normalizeInjectionsHash(lazyInjections);
|
1491
1492
|
|
1492
|
-
|
1493
|
-
|
1493
|
+
container.registry.validateInjections(lazyInjections);
|
1494
|
+
}
|
1495
|
+
});
|
1494
1496
|
|
1495
1497
|
validationCache[fullName] = true;
|
1496
1498
|
|
@@ -4781,7 +4783,7 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
|
|
4781
4783
|
|
4782
4784
|
@class Ember
|
4783
4785
|
@static
|
4784
|
-
@version 2.6.0
|
4786
|
+
@version 2.6.0
|
4785
4787
|
@public
|
4786
4788
|
*/
|
4787
4789
|
|
@@ -4823,11 +4825,11 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
|
|
4823
4825
|
|
4824
4826
|
@property VERSION
|
4825
4827
|
@type String
|
4826
|
-
@default '2.6.0
|
4828
|
+
@default '2.6.0'
|
4827
4829
|
@static
|
4828
4830
|
@public
|
4829
4831
|
*/
|
4830
|
-
Ember.VERSION = '2.6.0
|
4832
|
+
Ember.VERSION = '2.6.0';
|
4831
4833
|
|
4832
4834
|
/**
|
4833
4835
|
The hash of environment variables used to control various configuration
|
@@ -18509,7 +18511,7 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-metal/debug', 'emb
|
|
18509
18511
|
for (var i = 0, l = props.length; i < l; i++) {
|
18510
18512
|
var properties = props[i];
|
18511
18513
|
|
18512
|
-
_emberMetalDebug.assert('Ember.Object.create no longer supports mixing in other ' + 'definitions, use .extend & .create
|
18514
|
+
_emberMetalDebug.assert('Ember.Object.create no longer supports mixing in other ' + 'definitions, use .extend & .create separately instead.', !(properties instanceof _emberMetalMixin.Mixin));
|
18513
18515
|
|
18514
18516
|
if (typeof properties !== 'object' && properties !== undefined) {
|
18515
18517
|
throw new _emberMetalError.default('Ember.Object.create only accepts objects.');
|
@@ -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.6.0
|
9
|
+
* @version 2.6.0
|
10
10
|
*/
|
11
11
|
|
12
12
|
var enifed, requireModule, require, Ember;
|
@@ -3988,7 +3988,7 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
|
|
3988
3988
|
|
3989
3989
|
@class Ember
|
3990
3990
|
@static
|
3991
|
-
@version 2.6.0
|
3991
|
+
@version 2.6.0
|
3992
3992
|
@public
|
3993
3993
|
*/
|
3994
3994
|
|
@@ -4030,11 +4030,11 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
|
|
4030
4030
|
|
4031
4031
|
@property VERSION
|
4032
4032
|
@type String
|
4033
|
-
@default '2.6.0
|
4033
|
+
@default '2.6.0'
|
4034
4034
|
@static
|
4035
4035
|
@public
|
4036
4036
|
*/
|
4037
|
-
Ember.VERSION = '2.6.0
|
4037
|
+
Ember.VERSION = '2.6.0';
|
4038
4038
|
|
4039
4039
|
/**
|
4040
4040
|
The hash of environment variables used to control various configuration
|
@@ -12826,7 +12826,7 @@ enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-meta
|
|
12826
12826
|
options.buildMeta = function buildMeta(program) {
|
12827
12827
|
return {
|
12828
12828
|
fragmentReason: fragmentReason(program),
|
12829
|
-
revision: 'Ember@2.6.0
|
12829
|
+
revision: 'Ember@2.6.0',
|
12830
12830
|
loc: program.loc,
|
12831
12831
|
moduleName: options.moduleName
|
12832
12832
|
};
|
data/dist/ember-testing.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.6.0
|
9
|
+
* @version 2.6.0
|
10
10
|
*/
|
11
11
|
|
12
12
|
var enifed, requireModule, require, Ember;
|
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.6.0
|
9
|
+
* @version 2.6.0
|
10
10
|
*/
|
11
11
|
|
12
12
|
var enifed, requireModule, require, Ember;
|
@@ -1480,13 +1480,15 @@ enifed('container/container', ['exports', 'ember-metal/core', 'ember-metal/debug
|
|
1480
1480
|
|
1481
1481
|
validationCache = container.validationCache;
|
1482
1482
|
|
1483
|
-
|
1484
|
-
|
1485
|
-
|
1486
|
-
|
1483
|
+
_emberMetalDebug.runInDebug(function () {
|
1484
|
+
// Ensure that all lazy injections are valid at instantiation time
|
1485
|
+
if (!validationCache[fullName] && typeof factory._lazyInjections === 'function') {
|
1486
|
+
lazyInjections = factory._lazyInjections();
|
1487
|
+
lazyInjections = container.registry.normalizeInjectionsHash(lazyInjections);
|
1487
1488
|
|
1488
|
-
|
1489
|
-
|
1489
|
+
container.registry.validateInjections(lazyInjections);
|
1490
|
+
}
|
1491
|
+
});
|
1490
1492
|
|
1491
1493
|
validationCache[fullName] = true;
|
1492
1494
|
|
@@ -4055,10 +4057,13 @@ enifed('ember-application/system/application-instance', ['exports', 'ember-metal
|
|
4055
4057
|
}
|
4056
4058
|
};
|
4057
4059
|
|
4060
|
+
var location = _emberMetalProperty_get.get(router, 'location');
|
4061
|
+
|
4058
4062
|
// Keeps the location adapter's internal URL in-sync
|
4059
|
-
|
4063
|
+
location.setURL(url);
|
4060
4064
|
|
4061
|
-
|
4065
|
+
// getURL returns the set url with the rootURL stripped off
|
4066
|
+
return router.handleURL(location.getURL()).then(handleResolve, handleReject);
|
4062
4067
|
}
|
4063
4068
|
});
|
4064
4069
|
|
@@ -10223,7 +10228,7 @@ enifed('ember-htmlbars/keywords/mut', ['exports', 'ember-metal/debug', 'ember-me
|
|
10223
10228
|
mutate a value. For example:
|
10224
10229
|
|
10225
10230
|
```handlebars
|
10226
|
-
{{my-child childClickCount=totalClicks click-count-change=(action (mut
|
10231
|
+
{{my-child childClickCount=totalClicks click-count-change=(action (mut totalClicks))}}
|
10227
10232
|
```
|
10228
10233
|
|
10229
10234
|
The child `Component` would invoke the action with the new click value:
|
@@ -10310,7 +10315,7 @@ enifed('ember-htmlbars/keywords/outlet', ['exports', 'ember-metal/debug', 'ember
|
|
10310
10315
|
|
10311
10316
|
'use strict';
|
10312
10317
|
|
10313
|
-
_emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.6.0
|
10318
|
+
_emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.6.0';
|
10314
10319
|
|
10315
10320
|
/**
|
10316
10321
|
The `{{outlet}}` helper lets you specify where a child route will render in
|
@@ -15237,7 +15242,7 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
|
|
15237
15242
|
|
15238
15243
|
@class Ember
|
15239
15244
|
@static
|
15240
|
-
@version 2.6.0
|
15245
|
+
@version 2.6.0
|
15241
15246
|
@public
|
15242
15247
|
*/
|
15243
15248
|
|
@@ -15279,11 +15284,11 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
|
|
15279
15284
|
|
15280
15285
|
@property VERSION
|
15281
15286
|
@type String
|
15282
|
-
@default '2.6.0
|
15287
|
+
@default '2.6.0'
|
15283
15288
|
@static
|
15284
15289
|
@public
|
15285
15290
|
*/
|
15286
|
-
Ember.VERSION = '2.6.0
|
15291
|
+
Ember.VERSION = '2.6.0';
|
15287
15292
|
|
15288
15293
|
/**
|
15289
15294
|
The hash of environment variables used to control various configuration
|
@@ -24106,8 +24111,8 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
|
|
24106
24111
|
rootURL = rootURL.replace(/\/$/, '');
|
24107
24112
|
baseURL = baseURL.replace(/\/$/, '');
|
24108
24113
|
|
24109
|
-
// remove baseURL and rootURL from path
|
24110
|
-
var url = path.replace(baseURL, '').replace(rootURL, '');
|
24114
|
+
// remove baseURL and rootURL from start of path
|
24115
|
+
var url = path.replace(new RegExp('^' + baseURL), '').replace(new RegExp('^' + rootURL), '');
|
24111
24116
|
|
24112
24117
|
var search = location.search || '';
|
24113
24118
|
url += search;
|
@@ -24264,7 +24269,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
|
|
24264
24269
|
getHash: _emberRoutingLocationApi.default._getHash
|
24265
24270
|
});
|
24266
24271
|
});
|
24267
|
-
enifed('ember-routing/location/none_location', ['exports', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-runtime/system/object'], function (exports, _emberMetalProperty_get, _emberMetalProperty_set, _emberRuntimeSystemObject) {
|
24272
|
+
enifed('ember-routing/location/none_location', ['exports', 'ember-metal/debug', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-runtime/system/object'], function (exports, _emberMetalDebug, _emberMetalProperty_get, _emberMetalProperty_set, _emberRuntimeSystemObject) {
|
24268
24273
|
'use strict';
|
24269
24274
|
|
24270
24275
|
/**
|
@@ -24287,14 +24292,35 @@ enifed('ember-routing/location/none_location', ['exports', 'ember-metal/property
|
|
24287
24292
|
implementation: 'none',
|
24288
24293
|
path: '',
|
24289
24294
|
|
24295
|
+
detect: function () {
|
24296
|
+
var rootURL = this.rootURL;
|
24297
|
+
|
24298
|
+
_emberMetalDebug.assert('rootURL must end with a trailing forward slash e.g. "/app/"', rootURL.charAt(rootURL.length - 1) === '/');
|
24299
|
+
},
|
24300
|
+
|
24290
24301
|
/**
|
24291
|
-
|
24302
|
+
Will be pre-pended to path.
|
24303
|
+
@private
|
24304
|
+
@property rootURL
|
24305
|
+
@default '/'
|
24306
|
+
*/
|
24307
|
+
rootURL: '/',
|
24308
|
+
|
24309
|
+
/**
|
24310
|
+
Returns the current path without `rootURL`.
|
24292
24311
|
@private
|
24293
24312
|
@method getURL
|
24294
24313
|
@return {String} path
|
24295
24314
|
*/
|
24296
24315
|
getURL: function () {
|
24297
|
-
|
24316
|
+
var path = _emberMetalProperty_get.get(this, 'path');
|
24317
|
+
var rootURL = _emberMetalProperty_get.get(this, 'rootURL');
|
24318
|
+
|
24319
|
+
// remove trailing slashes if they exists
|
24320
|
+
rootURL = rootURL.replace(/\/$/, '');
|
24321
|
+
|
24322
|
+
// remove rootURL from url
|
24323
|
+
return path.replace(new RegExp('^' + rootURL), '');
|
24298
24324
|
},
|
24299
24325
|
|
24300
24326
|
/**
|
@@ -24342,10 +24368,14 @@ enifed('ember-routing/location/none_location', ['exports', 'ember-metal/property
|
|
24342
24368
|
@return {String} url
|
24343
24369
|
*/
|
24344
24370
|
formatURL: function (url) {
|
24345
|
-
|
24346
|
-
|
24347
|
-
|
24348
|
-
|
24371
|
+
var rootURL = _emberMetalProperty_get.get(this, 'rootURL');
|
24372
|
+
|
24373
|
+
if (url !== '') {
|
24374
|
+
// remove trailing slashes if they exists
|
24375
|
+
rootURL = rootURL.replace(/\/$/, '');
|
24376
|
+
}
|
24377
|
+
|
24378
|
+
return rootURL + url;
|
24349
24379
|
}
|
24350
24380
|
});
|
24351
24381
|
});
|
@@ -36031,7 +36061,7 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-metal/debug', 'emb
|
|
36031
36061
|
for (var i = 0, l = props.length; i < l; i++) {
|
36032
36062
|
var properties = props[i];
|
36033
36063
|
|
36034
|
-
_emberMetalDebug.assert('Ember.Object.create no longer supports mixing in other ' + 'definitions, use .extend & .create
|
36064
|
+
_emberMetalDebug.assert('Ember.Object.create no longer supports mixing in other ' + 'definitions, use .extend & .create separately instead.', !(properties instanceof _emberMetalMixin.Mixin));
|
36035
36065
|
|
36036
36066
|
if (typeof properties !== 'object' && properties !== undefined) {
|
36037
36067
|
throw new _emberMetalError.default('Ember.Object.create only accepts objects.');
|
@@ -39144,7 +39174,7 @@ enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-meta
|
|
39144
39174
|
options.buildMeta = function buildMeta(program) {
|
39145
39175
|
return {
|
39146
39176
|
fragmentReason: fragmentReason(program),
|
39147
|
-
revision: 'Ember@2.6.0
|
39177
|
+
revision: 'Ember@2.6.0',
|
39148
39178
|
loc: program.loc,
|
39149
39179
|
moduleName: options.moduleName
|
39150
39180
|
};
|
@@ -40718,7 +40748,7 @@ enifed('ember-views/components/component', ['exports', 'ember-metal/debug', 'emb
|
|
40718
40748
|
```handlebars
|
40719
40749
|
<!-- app-profile template -->
|
40720
40750
|
<h1>{{person.title}}</h1>
|
40721
|
-
{{! Executed in the
|
40751
|
+
{{! Executed in the component's context. }}
|
40722
40752
|
{{yield}} {{! block contents }}
|
40723
40753
|
```
|
40724
40754
|
|
@@ -40769,7 +40799,7 @@ enifed('ember-views/components/component', ['exports', 'ember-metal/debug', 'emb
|
|
40769
40799
|
isComponent: true,
|
40770
40800
|
/*
|
40771
40801
|
This is set so that the proto inspection in appendTemplatedView does not
|
40772
|
-
think that it should set the
|
40802
|
+
think that it should set the component's `context` to that of the parent view.
|
40773
40803
|
*/
|
40774
40804
|
controller: null,
|
40775
40805
|
context: null,
|
data/dist/ember.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.6.0
|
9
|
+
* @version 2.6.0
|
10
10
|
*/
|
11
11
|
|
12
12
|
var enifed, requireModule, require, Ember;
|
@@ -1480,13 +1480,15 @@ enifed('container/container', ['exports', 'ember-metal/core', 'ember-metal/debug
|
|
1480
1480
|
|
1481
1481
|
validationCache = container.validationCache;
|
1482
1482
|
|
1483
|
-
|
1484
|
-
|
1485
|
-
|
1486
|
-
|
1483
|
+
_emberMetalDebug.runInDebug(function () {
|
1484
|
+
// Ensure that all lazy injections are valid at instantiation time
|
1485
|
+
if (!validationCache[fullName] && typeof factory._lazyInjections === 'function') {
|
1486
|
+
lazyInjections = factory._lazyInjections();
|
1487
|
+
lazyInjections = container.registry.normalizeInjectionsHash(lazyInjections);
|
1487
1488
|
|
1488
|
-
|
1489
|
-
|
1489
|
+
container.registry.validateInjections(lazyInjections);
|
1490
|
+
}
|
1491
|
+
});
|
1490
1492
|
|
1491
1493
|
validationCache[fullName] = true;
|
1492
1494
|
|
@@ -4055,10 +4057,13 @@ enifed('ember-application/system/application-instance', ['exports', 'ember-metal
|
|
4055
4057
|
}
|
4056
4058
|
};
|
4057
4059
|
|
4060
|
+
var location = _emberMetalProperty_get.get(router, 'location');
|
4061
|
+
|
4058
4062
|
// Keeps the location adapter's internal URL in-sync
|
4059
|
-
|
4063
|
+
location.setURL(url);
|
4060
4064
|
|
4061
|
-
|
4065
|
+
// getURL returns the set url with the rootURL stripped off
|
4066
|
+
return router.handleURL(location.getURL()).then(handleResolve, handleReject);
|
4062
4067
|
}
|
4063
4068
|
});
|
4064
4069
|
|
@@ -10223,7 +10228,7 @@ enifed('ember-htmlbars/keywords/mut', ['exports', 'ember-metal/debug', 'ember-me
|
|
10223
10228
|
mutate a value. For example:
|
10224
10229
|
|
10225
10230
|
```handlebars
|
10226
|
-
{{my-child childClickCount=totalClicks click-count-change=(action (mut
|
10231
|
+
{{my-child childClickCount=totalClicks click-count-change=(action (mut totalClicks))}}
|
10227
10232
|
```
|
10228
10233
|
|
10229
10234
|
The child `Component` would invoke the action with the new click value:
|
@@ -10310,7 +10315,7 @@ enifed('ember-htmlbars/keywords/outlet', ['exports', 'ember-metal/debug', 'ember
|
|
10310
10315
|
|
10311
10316
|
'use strict';
|
10312
10317
|
|
10313
|
-
_emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.6.0
|
10318
|
+
_emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.6.0';
|
10314
10319
|
|
10315
10320
|
/**
|
10316
10321
|
The `{{outlet}}` helper lets you specify where a child route will render in
|
@@ -15237,7 +15242,7 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
|
|
15237
15242
|
|
15238
15243
|
@class Ember
|
15239
15244
|
@static
|
15240
|
-
@version 2.6.0
|
15245
|
+
@version 2.6.0
|
15241
15246
|
@public
|
15242
15247
|
*/
|
15243
15248
|
|
@@ -15279,11 +15284,11 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
|
|
15279
15284
|
|
15280
15285
|
@property VERSION
|
15281
15286
|
@type String
|
15282
|
-
@default '2.6.0
|
15287
|
+
@default '2.6.0'
|
15283
15288
|
@static
|
15284
15289
|
@public
|
15285
15290
|
*/
|
15286
|
-
Ember.VERSION = '2.6.0
|
15291
|
+
Ember.VERSION = '2.6.0';
|
15287
15292
|
|
15288
15293
|
/**
|
15289
15294
|
The hash of environment variables used to control various configuration
|
@@ -24106,8 +24111,8 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
|
|
24106
24111
|
rootURL = rootURL.replace(/\/$/, '');
|
24107
24112
|
baseURL = baseURL.replace(/\/$/, '');
|
24108
24113
|
|
24109
|
-
// remove baseURL and rootURL from path
|
24110
|
-
var url = path.replace(baseURL, '').replace(rootURL, '');
|
24114
|
+
// remove baseURL and rootURL from start of path
|
24115
|
+
var url = path.replace(new RegExp('^' + baseURL), '').replace(new RegExp('^' + rootURL), '');
|
24111
24116
|
|
24112
24117
|
var search = location.search || '';
|
24113
24118
|
url += search;
|
@@ -24264,7 +24269,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
|
|
24264
24269
|
getHash: _emberRoutingLocationApi.default._getHash
|
24265
24270
|
});
|
24266
24271
|
});
|
24267
|
-
enifed('ember-routing/location/none_location', ['exports', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-runtime/system/object'], function (exports, _emberMetalProperty_get, _emberMetalProperty_set, _emberRuntimeSystemObject) {
|
24272
|
+
enifed('ember-routing/location/none_location', ['exports', 'ember-metal/debug', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-runtime/system/object'], function (exports, _emberMetalDebug, _emberMetalProperty_get, _emberMetalProperty_set, _emberRuntimeSystemObject) {
|
24268
24273
|
'use strict';
|
24269
24274
|
|
24270
24275
|
/**
|
@@ -24287,14 +24292,35 @@ enifed('ember-routing/location/none_location', ['exports', 'ember-metal/property
|
|
24287
24292
|
implementation: 'none',
|
24288
24293
|
path: '',
|
24289
24294
|
|
24295
|
+
detect: function () {
|
24296
|
+
var rootURL = this.rootURL;
|
24297
|
+
|
24298
|
+
_emberMetalDebug.assert('rootURL must end with a trailing forward slash e.g. "/app/"', rootURL.charAt(rootURL.length - 1) === '/');
|
24299
|
+
},
|
24300
|
+
|
24290
24301
|
/**
|
24291
|
-
|
24302
|
+
Will be pre-pended to path.
|
24303
|
+
@private
|
24304
|
+
@property rootURL
|
24305
|
+
@default '/'
|
24306
|
+
*/
|
24307
|
+
rootURL: '/',
|
24308
|
+
|
24309
|
+
/**
|
24310
|
+
Returns the current path without `rootURL`.
|
24292
24311
|
@private
|
24293
24312
|
@method getURL
|
24294
24313
|
@return {String} path
|
24295
24314
|
*/
|
24296
24315
|
getURL: function () {
|
24297
|
-
|
24316
|
+
var path = _emberMetalProperty_get.get(this, 'path');
|
24317
|
+
var rootURL = _emberMetalProperty_get.get(this, 'rootURL');
|
24318
|
+
|
24319
|
+
// remove trailing slashes if they exists
|
24320
|
+
rootURL = rootURL.replace(/\/$/, '');
|
24321
|
+
|
24322
|
+
// remove rootURL from url
|
24323
|
+
return path.replace(new RegExp('^' + rootURL), '');
|
24298
24324
|
},
|
24299
24325
|
|
24300
24326
|
/**
|
@@ -24342,10 +24368,14 @@ enifed('ember-routing/location/none_location', ['exports', 'ember-metal/property
|
|
24342
24368
|
@return {String} url
|
24343
24369
|
*/
|
24344
24370
|
formatURL: function (url) {
|
24345
|
-
|
24346
|
-
|
24347
|
-
|
24348
|
-
|
24371
|
+
var rootURL = _emberMetalProperty_get.get(this, 'rootURL');
|
24372
|
+
|
24373
|
+
if (url !== '') {
|
24374
|
+
// remove trailing slashes if they exists
|
24375
|
+
rootURL = rootURL.replace(/\/$/, '');
|
24376
|
+
}
|
24377
|
+
|
24378
|
+
return rootURL + url;
|
24349
24379
|
}
|
24350
24380
|
});
|
24351
24381
|
});
|
@@ -36031,7 +36061,7 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-metal/debug', 'emb
|
|
36031
36061
|
for (var i = 0, l = props.length; i < l; i++) {
|
36032
36062
|
var properties = props[i];
|
36033
36063
|
|
36034
|
-
_emberMetalDebug.assert('Ember.Object.create no longer supports mixing in other ' + 'definitions, use .extend & .create
|
36064
|
+
_emberMetalDebug.assert('Ember.Object.create no longer supports mixing in other ' + 'definitions, use .extend & .create separately instead.', !(properties instanceof _emberMetalMixin.Mixin));
|
36035
36065
|
|
36036
36066
|
if (typeof properties !== 'object' && properties !== undefined) {
|
36037
36067
|
throw new _emberMetalError.default('Ember.Object.create only accepts objects.');
|
@@ -39144,7 +39174,7 @@ enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-meta
|
|
39144
39174
|
options.buildMeta = function buildMeta(program) {
|
39145
39175
|
return {
|
39146
39176
|
fragmentReason: fragmentReason(program),
|
39147
|
-
revision: 'Ember@2.6.0
|
39177
|
+
revision: 'Ember@2.6.0',
|
39148
39178
|
loc: program.loc,
|
39149
39179
|
moduleName: options.moduleName
|
39150
39180
|
};
|
@@ -40718,7 +40748,7 @@ enifed('ember-views/components/component', ['exports', 'ember-metal/debug', 'emb
|
|
40718
40748
|
```handlebars
|
40719
40749
|
<!-- app-profile template -->
|
40720
40750
|
<h1>{{person.title}}</h1>
|
40721
|
-
{{! Executed in the
|
40751
|
+
{{! Executed in the component's context. }}
|
40722
40752
|
{{yield}} {{! block contents }}
|
40723
40753
|
```
|
40724
40754
|
|
@@ -40769,7 +40799,7 @@ enifed('ember-views/components/component', ['exports', 'ember-metal/debug', 'emb
|
|
40769
40799
|
isComponent: true,
|
40770
40800
|
/*
|
40771
40801
|
This is set so that the proto inspection in appendTemplatedView does not
|
40772
|
-
think that it should set the
|
40802
|
+
think that it should set the component's `context` to that of the parent view.
|
40773
40803
|
*/
|
40774
40804
|
controller: null,
|
40775
40805
|
context: null,
|