Skip to content

Commit cc53851

Browse files
rwjbluerwjblue
committed
Release v2.6.0-beta.4.
1 parent 13bc665 commit cc53851

File tree

12 files changed

+167
-121
lines changed

12 files changed

+167
-121
lines changed

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember",
3-
"version": "2.6.0-beta.3",
3+
"version": "2.6.0-beta.4",
44
"license": "MIT",
55
"homepage": "https://github.com/emberjs/ember.js",
66
"main": [

‎component.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ember",
33
"repo": "components/ember",
4-
"version": "2.6.0-beta.3",
4+
"version": "2.6.0-beta.4",
55
"license": "MIT",
66
"homepage": "https://github.com/emberjs/ember.js",
77
"main": "ember.debug.js",

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
}
2626
}
2727
},
28-
"version": "2.6.0-beta.3"
28+
"version": "2.6.0-beta.4"
2929
}

‎ember-docs.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "The Ember API",
44
"description": "The Ember API: a framework for building ambitious web applications",
55
"url": "http://emberjs.com/",
6-
"version": "v2.6.0-beta.3"
6+
"version": "v2.6.0-beta.4"
77
},
88
"files": {
99
"bower_components/router.js/lib/router/router.js": {
@@ -10200,7 +10200,7 @@
1020010200
},
1020110201
{
1020210202
"file": "packages/ember-metal/lib/property_get.js",
10203-
"line": 15,
10203+
"line": 21,
1020410204
"description": "Gets the value of a property on an object. If the property is computed,\nthe function will be invoked. If the property is not defined but the\nobject implements the `unknownProperty` method then that will be invoked.\n\nIf you plan to run on IE8 and older browsers then you should use this\nmethod anytime you want to retrieve a property on an object that you don't\nknow for sure is private. (Properties beginning with an underscore '_'\nare considered private.)\n\nOn all newer browsers, you only need to use this method to retrieve\nproperties if the property might not be defined on the object and you want\nto respect the `unknownProperty` handler. Otherwise you can ignore this\nmethod.\n\nNote that if the object itself is `undefined`, this method will throw\nan error.",
1020510205
"itemtype": "method",
1020610206
"name": "get",
@@ -10227,7 +10227,7 @@
1022710227
},
1022810228
{
1022910229
"file": "packages/ember-metal/lib/property_get.js",
10230-
"line": 93,
10230+
"line": 106,
1023110231
"description": "Retrieves the value of a property from an Object, or a default value in the\ncase that the property returns `undefined`.\n\n```javascript\nEmber.getWithDefault(person, 'lastName', 'Doe');\n```",
1023210232
"itemtype": "method",
1023310233
"name": "getWithDefault",

‎ember-runtime.js‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright 2008-2011 Apple Inc. All rights reserved.
77
* @license Licensed under MIT license
88
* See https://raw.github.com/emberjs/ember.js/master/LICENSE
9-
* @version 2.6.0-beta.3
9+
* @version 2.6.0-beta.4
1010
*/
1111

1212
var enifed, requireModule, require, Ember;
@@ -4781,7 +4781,7 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
47814781

47824782
@class Ember
47834783
@static
4784-
@version 2.6.0-beta.3
4784+
@version 2.6.0-beta.4
47854785
@public
47864786
*/
47874787

@@ -4823,11 +4823,11 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
48234823

48244824
@property VERSION
48254825
@type String
4826-
@default '2.6.0-beta.3'
4826+
@default '2.6.0-beta.4'
48274827
@static
48284828
@public
48294829
*/
4830-
Ember.VERSION = '2.6.0-beta.3';
4830+
Ember.VERSION = '2.6.0-beta.4';
48314831

48324832
/**
48334833
The hash of environment variables used to control various configuration
@@ -9423,6 +9423,12 @@ enifed('ember-metal/property_get', ['exports', 'ember-metal/debug', 'ember-metal
94239423
exports._getPath = _getPath;
94249424
exports.getWithDefault = getWithDefault;
94259425

9426+
var ALLOWABLE_TYPES = {
9427+
object: true,
9428+
function: true,
9429+
string: true
9430+
};
9431+
94269432
// ..........................................................
94279433
// GET AND SET
94289434
//
@@ -9491,11 +9497,10 @@ enifed('ember-metal/property_get', ['exports', 'ember-metal/debug', 'ember-metal
94919497
function _getPath(root, path) {
94929498
var obj = root;
94939499
var parts = path.split('.');
9494-
var len = parts.length;
94959500

9496-
for (var i = 0; i < len; i++) {
9497-
if (obj == null) {
9498-
return obj;
9501+
for (var i = 0; i < parts.length; i++) {
9502+
if (!isGettable(obj)) {
9503+
return undefined;
94999504
}
95009505

95019506
obj = get(obj, parts[i]);
@@ -9508,6 +9513,14 @@ enifed('ember-metal/property_get', ['exports', 'ember-metal/debug', 'ember-metal
95089513
return obj;
95099514
}
95109515

9516+
function isGettable(obj) {
9517+
if (obj == null) {
9518+
return false;
9519+
}
9520+
9521+
return ALLOWABLE_TYPES[typeof obj];
9522+
}
9523+
95119524
/**
95129525
Retrieves the value of a property from an Object, or a default value in the
95139526
case that the property returns `undefined`.

‎ember-template-compiler.js‎

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright 2008-2011 Apple Inc. All rights reserved.
77
* @license Licensed under MIT license
88
* See https://raw.github.com/emberjs/ember.js/master/LICENSE
9-
* @version 2.6.0-beta.3
9+
* @version 2.6.0-beta.4
1010
*/
1111

1212
var enifed, requireModule, require, Ember;
@@ -3988,7 +3988,7 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
39883988

39893989
@class Ember
39903990
@static
3991-
@version 2.6.0-beta.3
3991+
@version 2.6.0-beta.4
39923992
@public
39933993
*/
39943994

@@ -4030,11 +4030,11 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
40304030

40314031
@property VERSION
40324032
@type String
4033-
@default '2.6.0-beta.3'
4033+
@default '2.6.0-beta.4'
40344034
@static
40354035
@public
40364036
*/
4037-
Ember.VERSION = '2.6.0-beta.3';
4037+
Ember.VERSION = '2.6.0-beta.4';
40384038

40394039
/**
40404040
The hash of environment variables used to control various configuration
@@ -8611,6 +8611,12 @@ enifed('ember-metal/property_get', ['exports', 'ember-metal/debug', 'ember-metal
86118611
exports._getPath = _getPath;
86128612
exports.getWithDefault = getWithDefault;
86138613

8614+
var ALLOWABLE_TYPES = {
8615+
object: true,
8616+
function: true,
8617+
string: true
8618+
};
8619+
86148620
// ..........................................................
86158621
// GET AND SET
86168622
//
@@ -8679,11 +8685,10 @@ enifed('ember-metal/property_get', ['exports', 'ember-metal/debug', 'ember-metal
86798685
function _getPath(root, path) {
86808686
var obj = root;
86818687
var parts = path.split('.');
8682-
var len = parts.length;
86838688

8684-
for (var i = 0; i < len; i++) {
8685-
if (obj == null) {
8686-
return obj;
8689+
for (var i = 0; i < parts.length; i++) {
8690+
if (!isGettable(obj)) {
8691+
return undefined;
86878692
}
86888693

86898694
obj = get(obj, parts[i]);
@@ -8696,6 +8701,14 @@ enifed('ember-metal/property_get', ['exports', 'ember-metal/debug', 'ember-metal
86968701
return obj;
86978702
}
86988703

8704+
function isGettable(obj) {
8705+
if (obj == null) {
8706+
return false;
8707+
}
8708+
8709+
return ALLOWABLE_TYPES[typeof obj];
8710+
}
8711+
86998712
/**
87008713
Retrieves the value of a property from an Object, or a default value in the
87018714
case that the property returns `undefined`.
@@ -12173,21 +12186,21 @@ enifed('ember-template-compiler/plugins/transform-inline-link-to', ['exports'],
1217312186
var traverse = _syntax.traverse;
1217412187
var b = _syntax.builders;
1217512188

12176-
function buildProgram(content) {
12177-
return b.program([buildStatement(content)]);
12189+
function buildProgram(content, loc) {
12190+
return b.program([buildStatement(content, loc)], null, loc);
1217812191
}
1217912192

12180-
function buildStatement(content) {
12193+
function buildStatement(content, loc) {
1218112194
switch (content.type) {
1218212195
case 'PathExpression':
12183-
return b.mustache(content);
12196+
return b.mustache(content, null, null, null, loc);
1218412197

1218512198
case 'SubExpression':
12186-
return b.mustache(content.path, content.params, content.hash);
12199+
return b.mustache(content.path, content.params, content.hash, null, loc);
1218712200

1218812201
// The default case handles literals.
1218912202
default:
12190-
return b.text('' + content.value);
12203+
return b.text('' + content.value, loc);
1219112204
}
1219212205
}
1219312206

@@ -12199,7 +12212,7 @@ enifed('ember-template-compiler/plugins/transform-inline-link-to', ['exports'],
1219912212
MustacheStatement: function (node) {
1220012213
if (node.path.original === 'link-to') {
1220112214
var content = node.escaped ? node.params[0] : unsafeHtml(node.params[0]);
12202-
return b.block('link-to', node.params.slice(1), node.hash, buildProgram(content));
12215+
return b.block('link-to', node.params.slice(1), node.hash, buildProgram(content, node.loc), null, node.loc);
1220312216
}
1220412217
}
1220512218
});
@@ -12813,7 +12826,7 @@ enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-meta
1281312826
options.buildMeta = function buildMeta(program) {
1281412827
return {
1281512828
fragmentReason: fragmentReason(program),
12816-
revision: 'Ember@2.6.0-beta.3',
12829+
revision: 'Ember@2.6.0-beta.4',
1281712830
loc: program.loc,
1281812831
moduleName: options.moduleName
1281912832
};

‎ember-testing.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright 2008-2011 Apple Inc. All rights reserved.
77
* @license Licensed under MIT license
88
* See https://raw.github.com/emberjs/ember.js/master/LICENSE
9-
* @version 2.6.0-beta.3
9+
* @version 2.6.0-beta.4
1010
*/
1111

1212
var enifed, requireModule, require, Ember;

0 commit comments

Comments
 (0)