Remove support for legacy attachEvent API

remix-run · Nov 20, 2017 · 5f9ae0d · 5f9ae0d
1 parent d8d399b
commit 5f9ae0d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/modules/DOMUtils.js b/modules/DOMUtils.js
@@ -2,16 +2,6 @@ export const canUseDOM = !!(
   typeof window !== 'undefined' && window.document && window.document.createElement
 )
 
-export const addEventListener = (node, event, listener) =>
-  node.addEventListener
-    ? node.addEventListener(event, listener, false)
-    : node.attachEvent('on' + event, listener)
-
-export const removeEventListener = (node, event, listener) =>
-  node.removeEventListener
-    ? node.removeEventListener(event, listener, false)
-    : node.detachEvent('on' + event, listener)
-
 export const getConfirmation = (message, callback) =>
   callback(window.confirm(message)) // eslint-disable-line no-alert
 

diff --git a/modules/createBrowserHistory.js b/modules/createBrowserHistory.js
@@ -11,8 +11,6 @@ import {
 import createTransitionManager from './createTransitionManager'
 import {
   canUseDOM,
-  addEventListener,
-  removeEventListener,
   getConfirmation,
   supportsHistory,
   supportsPopStateOnHashChange,
@@ -90,7 +88,7 @@ const createBrowserHistory = (props = {}) => {
   const handlePopState = (event) => {
     // Ignore extraneous popstate events in WebKit.
     if (isExtraneousPopstateEvent(event))
-      return 
+      return
 
     handlePop(getDOMLocation(event.state))
   }
@@ -250,15 +248,15 @@ const createBrowserHistory = (props = {}) => {
     listenerCount += delta
 
     if (listenerCount === 1) {
-      addEventListener(window, PopStateEvent, handlePopState)
+      window.addEventListener(PopStateEvent, handlePopState)
 
       if (needsHashChangeListener)
-        addEventListener(window, HashChangeEvent, handleHashChange)
+        window.addEventListener(HashChangeEvent, handleHashChange)
     } else if (listenerCount === 0) {
-      removeEventListener(window, PopStateEvent, handlePopState)
+      window.removeEventListener(PopStateEvent, handlePopState)
 
       if (needsHashChangeListener)
-        removeEventListener(window, HashChangeEvent, handleHashChange)
+        window.removeEventListener(HashChangeEvent, handleHashChange)
     }
   }
 

diff --git a/modules/createHashHistory.js b/modules/createHashHistory.js
@@ -12,8 +12,6 @@ import {
 import createTransitionManager from './createTransitionManager'
 import {
   canUseDOM,
-  addEventListener,
-  removeEventListener,
   getConfirmation,
   supportsGoWithoutReloadUsingHash
 } from './DOMUtils'
@@ -279,9 +277,9 @@ const createHashHistory = (props = {}) => {
     listenerCount += delta
 
     if (listenerCount === 1) {
-      addEventListener(window, HashChangeEvent, handleHashChange)
+      window.addEventListener(HashChangeEvent, handleHashChange)
     } else if (listenerCount === 0) {
-      removeEventListener(window, HashChangeEvent, handleHashChange)
+      window.removeEventListener(HashChangeEvent, handleHashChange)
     }
   }