Skip to content

Commit 3c1dad6

Browse files
Merge pull request #296 from canjs/ie11-compat
Ie11 compat
2 parents adac8a9 + ecb5dd0 commit 3c1dad6

5 files changed

+357
-357
lines changed

can-component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ var Component = Construct.extend(
487487
});
488488
} else {
489489
var removalDisposal = domMutate.onNodeRemoval(el, function () {
490-
if (!el.ownerDocument.contains(el)) {
490+
if (!el.ownerDocument.documentElement.contains(el)) {
491491
removalDisposal();
492492
callTeardownFunctions();
493493
}

test/component-define-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ QUnit.test("ViewModel properties default to DefineList if set to an Array (#225)
204204
view: "Hello, World",
205205
ViewModel: {
206206
items: {
207-
default() {
207+
default: function() {
208208
return [ "one", "two" ];
209209
}
210210
}

test/component-slot-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ QUnit.test("able to pass individual values (#291)", function() {
486486

487487
var frag = template();
488488

489-
var passValuesToSlots = frag.firstElementChild;
489+
var passValuesToSlots = frag.firstElementChild || frag.firstChild;
490490
passValuesToSlots.viewModel.add(5);
491491
var count = passValuesToSlots.querySelector(".count");
492492

test/component-view-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ helpers.makeTests("can-component views", function(doc, runTestInOnlyDocument){
170170
Component.extend({
171171
tag: 'child-tag',
172172

173-
ViewModel: SimpleMap.extend({
173+
ViewModel: DefineMap.extend({
174174
init: function () {
175175
inited++;
176176
}
@@ -187,8 +187,8 @@ helpers.makeTests("can-component views", function(doc, runTestInOnlyDocument){
187187

188188
view: stache('{{#shown}}<child-tag></child-tag>{{/shown}}'),
189189

190-
viewModel: observe.Object.extend("ParentTag",{},{
191-
shown: false
190+
viewModel: DefineMap.extend("ParentTag",{},{
191+
shown: { default: false }
192192
}),
193193
events: {
194194
' inserted': function () {

0 commit comments

Comments
 (0)