From 426cdbb3aeca313784af25bff8bfb6d7ad7b1b38 Mon Sep 17 00:00:00 2001 From: Ben Alpert Date: Fri, 23 Aug 2013 00:40:03 -0700 Subject: [PATCH] Remove all uses of ExecutionEnvironment.global Closes #271. All three of these files are DOM-specific so it should be fine to use window. (ReactEventTopLevelCallback isn't obviously DOM-specific but it calls getEventTarget which is so I think we're fine here.) Test Plan: grunt test, tried events in a real browser and they seemed to work still. --- src/core/ReactEventTopLevelCallback.js | 3 +-- src/dom/getEventTarget.js | 7 +------ src/eventPlugins/EnterLeaveEventPlugin.js | 5 ++--- src/test/ReactPerf.js | 5 +---- src/vendor/core/ExecutionEnvironment.js | 4 +--- 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/core/ReactEventTopLevelCallback.js b/src/core/ReactEventTopLevelCallback.js index b3e93a8c62..e4be87b685 100644 --- a/src/core/ReactEventTopLevelCallback.js +++ b/src/core/ReactEventTopLevelCallback.js @@ -19,7 +19,6 @@ "use strict"; -var ExecutionEnvironment = require('ExecutionEnvironment'); var ReactEventEmitter = require('ReactEventEmitter'); var ReactMount = require('ReactMount'); @@ -74,7 +73,7 @@ var ReactEventTopLevelCallback = { } var topLevelTarget = ReactMount.getFirstReactDOM( getEventTarget(nativeEvent) - ) || ExecutionEnvironment.global; + ) || window; var topLevelTargetID = ReactMount.getID(topLevelTarget) || ''; ReactEventEmitter.handleTopLevel( topLevelType, diff --git a/src/dom/getEventTarget.js b/src/dom/getEventTarget.js index e1b10aebc4..82bfb46386 100644 --- a/src/dom/getEventTarget.js +++ b/src/dom/getEventTarget.js @@ -19,8 +19,6 @@ "use strict"; -var ExecutionEnvironment = require('ExecutionEnvironment'); - /** * Gets the target node from a native browser event by accounting for * inconsistencies in browser DOM APIs. @@ -29,10 +27,7 @@ var ExecutionEnvironment = require('ExecutionEnvironment'); * @return {DOMEventTarget} Target node. */ function getEventTarget(nativeEvent) { - var target = - nativeEvent.target || - nativeEvent.srcElement || - ExecutionEnvironment.global; + var target = nativeEvent.target || nativeEvent.srcElement || window; // Safari may fire events on text nodes (Node.TEXT_NODE is 3). // @see http://www.quirksmode.org/js/events_properties.html return target.nodeType === 3 ? target.parentNode : target; diff --git a/src/eventPlugins/EnterLeaveEventPlugin.js b/src/eventPlugins/EnterLeaveEventPlugin.js index 3a3af3fd51..55855e7a5f 100644 --- a/src/eventPlugins/EnterLeaveEventPlugin.js +++ b/src/eventPlugins/EnterLeaveEventPlugin.js @@ -21,7 +21,6 @@ var EventConstants = require('EventConstants'); var EventPropagators = require('EventPropagators'); -var ExecutionEnvironment = require('ExecutionEnvironment'); var SyntheticMouseEvent = require('SyntheticMouseEvent'); var ReactMount = require('ReactMount'); @@ -73,9 +72,9 @@ var EnterLeaveEventPlugin = { from = topLevelTarget; to = getFirstReactDOM(nativeEvent.relatedTarget || nativeEvent.toElement) || - ExecutionEnvironment.global; + window; } else { - from = ExecutionEnvironment.global; + from = window; to = topLevelTarget; } diff --git a/src/test/ReactPerf.js b/src/test/ReactPerf.js index f8670de20d..4f0d749cad 100644 --- a/src/test/ReactPerf.js +++ b/src/test/ReactPerf.js @@ -67,10 +67,7 @@ var ReactPerf = { if (__DEV__) { var ExecutionEnvironment = require('ExecutionEnvironment'); - var URL = ExecutionEnvironment.global && - ExecutionEnvironment.global.location && - ExecutionEnvironment.global.location.href || - ''; + var URL = ExecutionEnvironment.canUseDOM ? window.location.href : ''; ReactPerf.enableMeasure = ReactPerf.enableMeasure || !!URL.match(/[?&]react_perf\b/); } diff --git a/src/vendor/core/ExecutionEnvironment.js b/src/vendor/core/ExecutionEnvironment.js index e1bc6c9c60..e03557cbe6 100644 --- a/src/vendor/core/ExecutionEnvironment.js +++ b/src/vendor/core/ExecutionEnvironment.js @@ -34,9 +34,7 @@ var ExecutionEnvironment = { canUseWorkers: typeof Worker !== 'undefined', - isInWorker: !canUseDOM, // For now, this is true - might change in the future. - - global: new Function('return this;')() + isInWorker: !canUseDOM // For now, this is true - might change in the future. };