Merge pull request #405 from webcomponents/fix-broken-customevent-ie

dfreedm · dfreedm · commit f9508eb3a4a7 · 2015-09-28T16:48:46.000-07:00
Fix for broken CustomEvent shim in IE
diff --git a/src/CustomElements/boot.js b/src/CustomElements/boot.js
@@ -104,8 +104,7 @@ function bootstrap() {
 }
 
 // CustomEvent shim
-// NOTE: we can't check that typeof isn't `function` since Safari has a type `object` CustomEvent
-if (!window.CustomEvent) {
+if (!window.CustomEvent || isIE && (typeof window.CustomEvent !== 'function')) {
   window.CustomEvent = function(inType, params) {
     params = params || {};
     var e = document.createEvent('CustomEvent');
diff --git a/src/HTMLImports/boot.js b/src/HTMLImports/boot.js
@@ -27,8 +27,7 @@ if (scope.useNative) {
 }
 
 // CustomEvent shim
-// NOTE: we can't check that typeof isn't `function` since Safari has a type `object` CustomEvent
-if (!window.CustomEvent) {
+if (!window.CustomEvent || isIE && (typeof window.CustomEvent !== 'function')) {
   window.CustomEvent = function(inType, params) {
     params = params || {};
     var e = document.createEvent('CustomEvent');

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,7 @@ function bootstrap() {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`// CustomEvent shim`
`107`		-// NOTE: we can't check that typeof isn't `function` since Safari has a type `object` CustomEvent
`108`		`-if (!window.CustomEvent) {`
	`107`	`+if (!window.CustomEvent \|\| isIE && (typeof window.CustomEvent !== 'function')) {`
`109`	`108`	`window.CustomEvent = function(inType, params) {`
`110`	`109`	`params = params \|\| {};`
`111`	`110`	`var e = document.createEvent('CustomEvent');`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ if (scope.useNative) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`// CustomEvent shim`
`30`		-// NOTE: we can't check that typeof isn't `function` since Safari has a type `object` CustomEvent
`31`		`-if (!window.CustomEvent) {`
	`30`	`+if (!window.CustomEvent \|\| isIE && (typeof window.CustomEvent !== 'function')) {`
`32`	`31`	`window.CustomEvent = function(inType, params) {`
`33`	`32`	`params = params \|\| {};`
`34`	`33`	`var e = document.createEvent('CustomEvent');`