From 6bbcbc08cf5e2af9e9c0d0cde75148880df69fd8 Mon Sep 17 00:00:00 2001 From: CommitSyncScript Date: Mon, 24 Jun 2013 16:49:16 -0700 Subject: [PATCH] Rename `BrowserEnv` to `ViewportMetrics` Becuase that's what it is. --- src/core/ReactEventEmitter.js | 4 ++-- .../BrowserEnv.js => dom/ViewportMetrics.js} | 20 +++++++++---------- src/event/synthetic/SyntheticMouseEvent.js | 6 +++--- src/eventPlugins/TapEventPlugin.js | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) rename src/{core/BrowserEnv.js => dom/ViewportMetrics.js} (73%) diff --git a/src/core/ReactEventEmitter.js b/src/core/ReactEventEmitter.js index ed552fc4d9..65f5072bbf 100644 --- a/src/core/ReactEventEmitter.js +++ b/src/core/ReactEventEmitter.js @@ -19,11 +19,11 @@ "use strict"; -var BrowserEnv = require('BrowserEnv'); var EventConstants = require('EventConstants'); var EventListener = require('EventListener'); var EventPluginHub = require('EventPluginHub'); var ExecutionEnvironment = require('ExecutionEnvironment'); +var ViewportMetrics = require('ViewportMetrics'); var invariant = require('invariant'); var isEventSupported = require('isEventSupported'); @@ -126,7 +126,7 @@ function trapCapturedEvent(topLevelType, handlerBaseName, element) { * @see http://www.quirksmode.org/dom/events/scroll.html */ function registerScrollValueMonitoring() { - var refresh = BrowserEnv.refreshAuthoritativeScrollValues; + var refresh = ViewportMetrics.refreshScrollValues; EventListener.listen(window, 'scroll', refresh); EventListener.listen(window, 'resize', refresh); } diff --git a/src/core/BrowserEnv.js b/src/dom/ViewportMetrics.js similarity index 73% rename from src/core/BrowserEnv.js rename to src/dom/ViewportMetrics.js index 53937a4ada..e9f2d3d1e0 100644 --- a/src/core/BrowserEnv.js +++ b/src/dom/ViewportMetrics.js @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * @providesModule BrowserEnv + * @providesModule ViewportMetrics */ "use strict"; -/** - * A place to share/cache browser/chrome level computations. - */ -var BrowserEnv = { +var ViewportMetrics = { + currentScrollLeft: 0, + currentScrollTop: 0, - browserInfo: null, - refreshAuthoritativeScrollValues: function() { - BrowserEnv.currentScrollLeft = + + refreshScrollValues: function() { + ViewportMetrics.currentScrollLeft = document.body.scrollLeft + document.documentElement.scrollLeft; - BrowserEnv.currentScrollTop = + ViewportMetrics.currentScrollTop = document.body.scrollTop + document.documentElement.scrollTop; } + }; -module.exports = BrowserEnv; +module.exports = ViewportMetrics; diff --git a/src/event/synthetic/SyntheticMouseEvent.js b/src/event/synthetic/SyntheticMouseEvent.js index 6272fbb83a..5e5dd8ded8 100644 --- a/src/event/synthetic/SyntheticMouseEvent.js +++ b/src/event/synthetic/SyntheticMouseEvent.js @@ -19,8 +19,8 @@ "use strict"; -var BrowserEnv = require('BrowserEnv'); var SyntheticUIEvent = require('SyntheticUIEvent'); +var ViewportMetrics = require('ViewportMetrics'); /** * @interface MouseEvent @@ -61,12 +61,12 @@ var MouseEventInterface = { pageX: function(event) { return 'pageX' in event ? event.pageX : - event.clientX + BrowserEnv.currentPageScrollLeft; + event.clientX + ViewportMetrics.currentPageScrollLeft; }, pageY: function(event) { return 'pageY' in event ? event.pageY : - event.clientY + BrowserEnv.currentPageScrollTop; + event.clientY + ViewportMetrics.currentPageScrollTop; } }; diff --git a/src/eventPlugins/TapEventPlugin.js b/src/eventPlugins/TapEventPlugin.js index 03293eaf16..75409ab4b3 100644 --- a/src/eventPlugins/TapEventPlugin.js +++ b/src/eventPlugins/TapEventPlugin.js @@ -19,11 +19,11 @@ "use strict"; -var BrowserEnv = require('BrowserEnv'); var EventPluginUtils = require('EventPluginUtils'); var EventPropagators = require('EventPropagators'); var SyntheticUIEvent = require('SyntheticUIEvent'); var TouchEventUtils = require('TouchEventUtils'); +var ViewportMetrics = require('ViewportMetrics'); var keyOf = require('keyOf'); @@ -49,7 +49,7 @@ function getAxisCoordOfEvent(axis, nativeEvent) { } return axis.page in nativeEvent ? nativeEvent[axis.page] : - nativeEvent[axis.client] + BrowserEnv[axis.envScroll]; + nativeEvent[axis.client] + ViewportMetrics[axis.envScroll]; } function getDistance(coords, nativeEvent) {