Skip to content

Commit 13bc665

Browse files
committed
Release 2.6.0-beta.3.
1 parent b6098ba commit 13bc665

File tree

12 files changed

+252
-273
lines changed

12 files changed

+252
-273
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.2",
3+
"version": "2.6.0-beta.3",
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.2",
4+
"version": "2.6.0-beta.3",
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.2"
28+
"version": "2.6.0-beta.3"
2929
}

ember-docs.json

Lines changed: 28 additions & 28 deletions
Large diffs are not rendered by default.

ember-runtime.js

Lines changed: 12 additions & 12 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.2
9+
* @version 2.6.0-beta.3
1010
*/
1111

1212
var enifed, requireModule, require, Ember;
@@ -688,12 +688,12 @@ enifed('backburner', ['exports', 'backburner/utils', 'backburner/platform', 'bac
688688
/*
689689
Join the passed method with an existing queue and execute immediately,
690690
if there isn't one use `Backburner#run`.
691-
The join method is like the run method except that it will schedule into
691+
The join method is like the run method except that it will schedule into
692692
an existing queue if one already exists. In either case, the join method will
693693
immediately execute the passed in function and return its result.
694-
@method join
694+
@method join
695695
@param {Object} target
696-
@param {Function} method The method to be executed
696+
@param {Function} method The method to be executed
697697
@param {any} args The method arguments
698698
@return method result
699699
*/
@@ -732,10 +732,10 @@ enifed('backburner', ['exports', 'backburner/utils', 'backburner/platform', 'bac
732732

733733
/*
734734
Defer the passed function to run inside the specified queue.
735-
@method defer
736-
@param {String} queueName
735+
@method defer
736+
@param {String} queueName
737737
@param {Object} target
738-
@param {Function|String} method The method or method name to be executed
738+
@param {Function|String} method The method or method name to be executed
739739
@param {any} args The method arguments
740740
@return method result
741741
*/
@@ -861,7 +861,7 @@ enifed('backburner', ['exports', 'backburner/utils', 'backburner/platform', 'bac
861861
}
862862
}
863863

864-
var executeAt = Date.now() + parseInt(wait, 10);
864+
var executeAt = Date.now() + parseInt(wait !== wait ? 0 : wait, 10);
865865

866866
if (_backburnerUtils.isString(method)) {
867867
method = target[method];
@@ -3999,7 +3999,7 @@ enifed('ember-metal/computed', ['exports', 'ember-metal/debug', 'ember-metal/pro
39993999
The alternative syntax, with prototype extensions, might look like:
40004000

40014001
```js
4002-
fullName() {
4002+
fullName: function() {
40034003
return this.get('firstName') + ' ' + this.get('lastName');
40044004
}.property('firstName', 'lastName')
40054005
```
@@ -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.2
4784+
@version 2.6.0-beta.3
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.2'
4826+
@default '2.6.0-beta.3'
48274827
@static
48284828
@public
48294829
*/
4830-
Ember.VERSION = '2.6.0-beta.2';
4830+
Ember.VERSION = '2.6.0-beta.3';
48314831

48324832
/**
48334833
The hash of environment variables used to control various configuration

ember-template-compiler.js

Lines changed: 18 additions & 45 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.2
9+
* @version 2.6.0-beta.3
1010
*/
1111

1212
var enifed, requireModule, require, Ember;
@@ -688,12 +688,12 @@ enifed('backburner', ['exports', 'backburner/utils', 'backburner/platform', 'bac
688688
/*
689689
Join the passed method with an existing queue and execute immediately,
690690
if there isn't one use `Backburner#run`.
691-
The join method is like the run method except that it will schedule into
691+
The join method is like the run method except that it will schedule into
692692
an existing queue if one already exists. In either case, the join method will
693693
immediately execute the passed in function and return its result.
694-
@method join
694+
@method join
695695
@param {Object} target
696-
@param {Function} method The method to be executed
696+
@param {Function} method The method to be executed
697697
@param {any} args The method arguments
698698
@return method result
699699
*/
@@ -732,10 +732,10 @@ enifed('backburner', ['exports', 'backburner/utils', 'backburner/platform', 'bac
732732

733733
/*
734734
Defer the passed function to run inside the specified queue.
735-
@method defer
736-
@param {String} queueName
735+
@method defer
736+
@param {String} queueName
737737
@param {Object} target
738-
@param {Function|String} method The method or method name to be executed
738+
@param {Function|String} method The method or method name to be executed
739739
@param {any} args The method arguments
740740
@return method result
741741
*/
@@ -861,7 +861,7 @@ enifed('backburner', ['exports', 'backburner/utils', 'backburner/platform', 'bac
861861
}
862862
}
863863

864-
var executeAt = Date.now() + parseInt(wait, 10);
864+
var executeAt = Date.now() + parseInt(wait !== wait ? 0 : wait, 10);
865865

866866
if (_backburnerUtils.isString(method)) {
867867
method = target[method];
@@ -3206,7 +3206,7 @@ enifed('ember-metal/computed', ['exports', 'ember-metal/debug', 'ember-metal/pro
32063206
The alternative syntax, with prototype extensions, might look like:
32073207

32083208
```js
3209-
fullName() {
3209+
fullName: function() {
32103210
return this.get('firstName') + ' ' + this.get('lastName');
32113211
}.property('firstName', 'lastName')
32123212
```
@@ -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.2
3991+
@version 2.6.0-beta.3
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.2'
4033+
@default '2.6.0-beta.3'
40344034
@static
40354035
@public
40364036
*/
4037-
Ember.VERSION = '2.6.0-beta.2';
4037+
Ember.VERSION = '2.6.0-beta.3';
40384038

40394039
/**
40404040
The hash of environment variables used to control various configuration
@@ -12023,41 +12023,18 @@ enifed('ember-template-compiler/plugins/transform-closure-component-attrs-into-m
1202312023
*/
1202412024
TransformClosureComponentAttrsIntoMut.prototype.transform = function TransformClosureComponentAttrsIntoMut_transform(ast) {
1202512025
var b = this.syntax.builders;
12026-
var walker = new this.syntax.Walker();
1202712026

12028-
walker.visit(ast, function (node) {
12029-
if (validate(node)) {
12030-
processExpression(b, node);
12027+
this.syntax.traverse(ast, {
12028+
SubExpression: function (node) {
12029+
if (isComponentClosure(node)) {
12030+
mutParameters(b, node);
12031+
}
1203112032
}
1203212033
});
1203312034

1203412035
return ast;
1203512036
};
1203612037

12037-
function processExpression(builder, node) {
12038-
processSubExpressionsInNode(builder, node);
12039-
12040-
if (isComponentClosure(node)) {
12041-
mutParameters(builder, node);
12042-
}
12043-
}
12044-
12045-
function processSubExpressionsInNode(builder, node) {
12046-
for (var i = 0; i < node.params.length; i++) {
12047-
if (node.params[i].type === 'SubExpression') {
12048-
processExpression(builder, node.params[i]);
12049-
}
12050-
}
12051-
12052-
each(node.hash.pairs, function (pair) {
12053-
var value = pair.value;
12054-
12055-
if (value.type === 'SubExpression') {
12056-
processExpression(builder, value);
12057-
}
12058-
});
12059-
}
12060-
1206112038
function isComponentClosure(node) {
1206212039
return node.type === 'SubExpression' && node.path.original === 'component';
1206312040
}
@@ -12078,10 +12055,6 @@ enifed('ember-template-compiler/plugins/transform-closure-component-attrs-into-m
1207812055
});
1207912056
}
1208012057

12081-
function validate(node) {
12082-
return node.type === 'BlockStatement' || node.type === 'MustacheStatement';
12083-
}
12084-
1208512058
function each(list, callback) {
1208612059
for (var i = 0, l = list.length; i < l; i++) {
1208712060
callback(list[i]);
@@ -12840,7 +12813,7 @@ enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-meta
1284012813
options.buildMeta = function buildMeta(program) {
1284112814
return {
1284212815
fragmentReason: fragmentReason(program),
12843-
revision: 'Ember@2.6.0-beta.2',
12816+
revision: 'Ember@2.6.0-beta.3',
1284412817
loc: program.loc,
1284512818
moduleName: options.moduleName
1284612819
};

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.2
9+
* @version 2.6.0-beta.3
1010
*/
1111

1212
var enifed, requireModule, require, Ember;

0 commit comments

Comments
 (0)