Skip to content

Commit 9753483

Browse files
author
Gastón I. Silva E
committed
bump ember version
1 parent 45dfab3 commit 9753483

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

app/views/master-overlay-checkbox.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ export default Ember.ContainerView.extend({
1919
var chksList = this.get('checkboxes'),
2020
_this = this;
2121
chksList.forEach(function(chkHash) {
22-
_this.pushObject( OverlayCheckbox.create( chkHash ) );
22+
// TODO: https://github.com/emberjs/ember.js/issues/9833
23+
// tests are failing when run together, individual runs are fine
24+
var view = _this.createChildView(OverlayCheckbox, chkHash);
25+
_this.pushObject( view );
2326
});
2427
}.on('init'),
2528

@@ -57,8 +60,8 @@ export default Ember.ContainerView.extend({
5760
},
5861

5962
removeOvrEnabClass: function() {
60-
$( '#' + this.get('masterCheckbox.elementId') )
61-
.removeClass('overlay_enabled');
63+
Ember.$( '#' + this.get('masterCheckbox.elementId') )
64+
.removeClass('overlay_enabled');
6265
}
6366
}
6467

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dependencies": {
44
"handlebars": "2.0.0",
55
"jquery": "^1.11.1",
6-
"ember": "1.11.0-beta.1",
6+
"ember": "1.11.0-beta.2",
77
"ember-data": "1.0.0-beta.15",
88
"ember-resolver": "~0.1.11",
99
"loader.js": "ember-cli/loader.js#1.0.1",

0 commit comments

Comments
 (0)