From 4c292facc9fa176cd0a8a094b38fc1800650325f Mon Sep 17 00:00:00 2001 From: Nathan Hunzaker Date: Thu, 30 Mar 2017 06:01:29 -0400 Subject: [PATCH] Remove captured scroll feature check (#9283) * Remove captured scroll feature check IE8 was the only browser that did not support captured scroll. We no longer have that constraint. * Remove WINDOW_HANDLE const --- .../dom/shared/ReactBrowserEventEmitter.js | 18 +++++------------- src/renderers/dom/shared/ReactEventListener.js | 3 --- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/renderers/dom/shared/ReactBrowserEventEmitter.js b/src/renderers/dom/shared/ReactBrowserEventEmitter.js index 60311a170e..8af3dff9d6 100644 --- a/src/renderers/dom/shared/ReactBrowserEventEmitter.js +++ b/src/renderers/dom/shared/ReactBrowserEventEmitter.js @@ -262,19 +262,11 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, { ); } } else if (dependency === 'topScroll') { - if (isEventSupported('scroll', true)) { - ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent( - 'topScroll', - 'scroll', - mountAt, - ); - } else { - ReactBrowserEventEmitter.ReactEventListener.trapBubbledEvent( - 'topScroll', - 'scroll', - ReactBrowserEventEmitter.ReactEventListener.WINDOW_HANDLE, - ); - } + ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent( + 'topScroll', + 'scroll', + mountAt, + ); } else if (dependency === 'topFocus' || dependency === 'topBlur') { if (isEventSupported('focus', true)) { ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent( diff --git a/src/renderers/dom/shared/ReactEventListener.js b/src/renderers/dom/shared/ReactEventListener.js index 50f4f10edb..64a72b381f 100644 --- a/src/renderers/dom/shared/ReactEventListener.js +++ b/src/renderers/dom/shared/ReactEventListener.js @@ -12,7 +12,6 @@ 'use strict'; var EventListener = require('fbjs/lib/EventListener'); -var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); var PooledClass = require('PooledClass'); var ReactDOMComponentTree = require('ReactDOMComponentTree'); var ReactGenericBatching = require('ReactGenericBatching'); @@ -111,8 +110,6 @@ var ReactEventListener = { _enabled: true, _handleTopLevel: null, - WINDOW_HANDLE: ExecutionEnvironment.canUseDOM ? window : null, - setHandleTopLevel: function(handleTopLevel) { ReactEventListener._handleTopLevel = handleTopLevel; },