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.
This commit is contained in:
Ben Alpert committed 2013-09-09 15:51:06 -07:00
1 parent 61b38b9f05
commit 426cdbb3ae
5 files changed
+6 -18

No files matched your search

+1 -2
View File
@@ -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,
+1 -6
View File
@@ -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;
+2 -3
View File
@@ -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;
}
+1 -4
View File
@@ -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/);
}
+1 -3
View File
@@ -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.
};