Skip to content

Commit

Permalink
Use const/let in more places (facebook#11467)
Browse files Browse the repository at this point in the history 
* Convert BeforeInputEventPlugin to const/let
* Convert BrowserEventConstats to const/let
* Convert ChangeEventPlugin to const/let
* Convert DOMEventPluginOrder to const/let
* Convert EnterLeaveEventPlugin to const/let
* Convert FallbackCompositionState to const/let
* Convert getEventCharCode to const/let
* Convert getEventKey to const/let
  • Loading branch information
@raphamorim
raphamorim committed Nov 23, 2017
1 parent e949d57 commit 9546519
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 65 deletions.
46 changes: 23 additions & 23 deletions packages/react-dom/src/events/BeforeInputEventPlugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ import * as FallbackCompositionState from './FallbackCompositionState';
import SyntheticCompositionEvent from './SyntheticCompositionEvent';
import SyntheticInputEvent from './SyntheticInputEvent';

var END_KEYCODES = [9, 13, 27, 32]; // Tab, Return, Esc, Space
var START_KEYCODE = 229;
const END_KEYCODES = [9, 13, 27, 32]; // Tab, Return, Esc, Space
const START_KEYCODE = 229;

var canUseCompositionEvent =
const canUseCompositionEvent =
ExecutionEnvironment.canUseDOM && 'CompositionEvent' in window;

var documentMode = null;
let documentMode = null;
if (ExecutionEnvironment.canUseDOM && 'documentMode' in document) {
documentMode = document.documentMode;
}

// Webkit offers a very useful `textInput` event that can be used to
// directly represent `beforeInput`. The IE `textinput` event is not as
// useful, so we don't use it.
var canUseTextInputEvent =
const canUseTextInputEvent =
ExecutionEnvironment.canUseDOM &&
'TextEvent' in window &&
!documentMode &&
Expand All @@ -37,7 +37,7 @@ var canUseTextInputEvent =
// In IE9+, we have access to composition events, but the data supplied
// by the native compositionend event may be incorrect. Japanese ideographic
// spaces, for instance (\u3000) are not recorded correctly.
var useFallbackCompositionData =
const useFallbackCompositionData =
ExecutionEnvironment.canUseDOM &&
(!canUseCompositionEvent ||
(documentMode && documentMode > 8 && documentMode <= 11));
Expand All @@ -47,19 +47,19 @@ var useFallbackCompositionData =
* text input events. Rely on keypress instead.
*/
function isPresto() {
var opera = window.opera;
const {opera} = window;
return (
typeof opera === 'object' &&
typeof opera.version === 'function' &&
parseInt(opera.version(), 10) <= 12
);
}

var SPACEBAR_CODE = 32;
var SPACEBAR_CHAR = String.fromCharCode(SPACEBAR_CODE);
const SPACEBAR_CODE = 32;
const SPACEBAR_CHAR = String.fromCharCode(SPACEBAR_CODE);

// Events and their corresponding property names.
var eventTypes = {
const eventTypes = {
beforeInput: {
phasedRegistrationNames: {
bubbled: 'onBeforeInput',
Expand Down Expand Up @@ -117,7 +117,7 @@ var eventTypes = {
};

// Track whether we've ever handled a keypress on the space key.
var hasSpaceKeypress = false;
let hasSpaceKeypress = false;

/**
* Return whether a native keypress event is assumed to be a command.
Expand Down Expand Up @@ -197,15 +197,15 @@ function isFallbackCompositionEnd(topLevelType, nativeEvent) {
* @return {?string}
*/
function getDataFromCustomEvent(nativeEvent) {
var detail = nativeEvent.detail;
const detail = nativeEvent.detail;
if (typeof detail === 'object' && 'data' in detail) {
return detail.data;
}
return null;
}

// Track the current IME composition status, if any.
var isComposing = false;
let isComposing = false;

/**
* @return {?object} A SyntheticCompositionEvent.
Expand All @@ -216,8 +216,8 @@ function extractCompositionEvent(
nativeEvent,
nativeEventTarget,
) {
var eventType;
var fallbackData;
let eventType;
let fallbackData;

if (canUseCompositionEvent) {
eventType = getCompositionEventType(topLevelType);
Expand Down Expand Up @@ -245,7 +245,7 @@ function extractCompositionEvent(
}
}

var event = SyntheticCompositionEvent.getPooled(
const event = SyntheticCompositionEvent.getPooled(
eventType,
targetInst,
nativeEvent,
Expand All @@ -257,7 +257,7 @@ function extractCompositionEvent(
// This matches the property of native CompositionEventInterface.
event.data = fallbackData;
} else {
var customData = getDataFromCustomEvent(nativeEvent);
const customData = getDataFromCustomEvent(nativeEvent);
if (customData !== null) {
event.data = customData;
}
Expand Down Expand Up @@ -291,7 +291,7 @@ function getNativeBeforeInputChars(topLevelType: TopLevelTypes, nativeEvent) {
* To avoid this issue, use the keypress event as if no `textInput`
* event is available.
*/
var which = nativeEvent.which;
const which = nativeEvent.which;
if (which !== SPACEBAR_CODE) {
return null;
}
Expand All @@ -301,7 +301,7 @@ function getNativeBeforeInputChars(topLevelType: TopLevelTypes, nativeEvent) {

case 'topTextInput':
// Record the characters to be added to the DOM.
var chars = nativeEvent.data;
const chars = nativeEvent.data;

// If it's a spacebar character, assume that we have already handled
// it at the keypress level and bail immediately. Android Chrome
Expand Down Expand Up @@ -337,7 +337,7 @@ function getFallbackBeforeInputChars(topLevelType: TopLevelTypes, nativeEvent) {
(!canUseCompositionEvent &&
isFallbackCompositionEnd(topLevelType, nativeEvent))
) {
var chars = FallbackCompositionState.getData();
const chars = FallbackCompositionState.getData();
FallbackCompositionState.reset();
isComposing = false;
return chars;
Expand Down Expand Up @@ -400,7 +400,7 @@ function extractBeforeInputEvent(
nativeEvent,
nativeEventTarget,
) {
var chars;
let chars;

if (canUseTextInputEvent) {
chars = getNativeBeforeInputChars(topLevelType, nativeEvent);
Expand All @@ -414,7 +414,7 @@ function extractBeforeInputEvent(
return null;
}

var event = SyntheticInputEvent.getPooled(
const event = SyntheticInputEvent.getPooled(
eventTypes.beforeInput,
targetInst,
nativeEvent,
Expand Down Expand Up @@ -444,7 +444,7 @@ function extractBeforeInputEvent(
* allowing us to share composition fallback code for both `beforeInput` and
* `composition` event types.
*/
var BeforeInputEventPlugin = {
const BeforeInputEventPlugin = {
eventTypes: eventTypes,

extractEvents: function(
Expand Down
4 changes: 2 additions & 2 deletions packages/react-dom/src/events/BrowserEventConstants.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import getVendorPrefixedEventName from './getVendorPrefixedEventName';
* trap at a lower node than `document`), binding at `document` would
* cause duplicate events so we don't include them here.
*/
var topLevelTypes = {
const topLevelTypes = {
topAbort: 'abort',
topAnimationEnd: getVendorPrefixedEventName('animationend') || 'animationend',
topAnimationIteration:
Expand Down Expand Up @@ -90,7 +90,7 @@ var topLevelTypes = {

export type TopLevelTypes = $Enum<typeof topLevelTypes>;

var BrowserEventConstants = {
const BrowserEventConstants = {
topLevelTypes,
};

Expand Down
26 changes: 13 additions & 13 deletions packages/react-dom/src/events/ChangeEventPlugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import isEventSupported from './isEventSupported';
import {getNodeFromInstance} from '../client/ReactDOMComponentTree';
import * as inputValueTracking from '../client/inputValueTracking';

var eventTypes = {
const eventTypes = {
change: {
phasedRegistrationNames: {
bubbled: 'onChange',
Expand All @@ -38,7 +38,7 @@ var eventTypes = {
};

function createAndAccumulateChangeEvent(inst, nativeEvent, target) {
var event = SyntheticEvent.getPooled(
const event = SyntheticEvent.getPooled(
eventTypes.change,
inst,
nativeEvent,
Expand All @@ -53,21 +53,21 @@ function createAndAccumulateChangeEvent(inst, nativeEvent, target) {
/**
* For IE shims
*/
var activeElement = null;
var activeElementInst = null;
let activeElement = null;
let activeElementInst = null;

/**
* SECTION: handle `change` event
*/
function shouldUseChangeEvent(elem) {
var nodeName = elem.nodeName && elem.nodeName.toLowerCase();
const nodeName = elem.nodeName && elem.nodeName.toLowerCase();
return (
nodeName === 'select' || (nodeName === 'input' && elem.type === 'file')
);
}

function manualDispatchChangeEvent(nativeEvent) {
var event = createAndAccumulateChangeEvent(
const event = createAndAccumulateChangeEvent(
activeElementInst,
nativeEvent,
getEventTarget(nativeEvent),
Expand Down Expand Up @@ -108,7 +108,7 @@ function getTargetInstForChangeEvent(topLevelType, targetInst) {
/**
* SECTION: handle `input` event
*/
var isInputEventSupported = false;
let isInputEventSupported = false;
if (ExecutionEnvironment.canUseDOM) {
// IE9 claims to support the input event but fails to trigger it when
// deleting text, so we ignore its input events.
Expand Down Expand Up @@ -201,7 +201,7 @@ function shouldUseClickEvent(elem) {
// Use the `click` event to detect changes to checkbox and radio inputs.
// This approach works across all browsers, whereas `change` does not fire
// until `blur` in IE8.
var nodeName = elem.nodeName;
const {nodeName} = elem;
return (
nodeName &&
nodeName.toLowerCase() === 'input' &&
Expand Down Expand Up @@ -251,7 +251,7 @@ function handleControlledInputBlur(inst, node) {
* - textarea
* - select
*/
var ChangeEventPlugin = {
const ChangeEventPlugin = {
eventTypes: eventTypes,

_isInputEventSupported: isInputEventSupported,
Expand All @@ -262,9 +262,9 @@ var ChangeEventPlugin = {
nativeEvent,
nativeEventTarget,
) {
var targetNode = targetInst ? getNodeFromInstance(targetInst) : window;
const targetNode = targetInst ? getNodeFromInstance(targetInst) : window;

var getTargetInstFunc, handleEventFunc;
let getTargetInstFunc, handleEventFunc;
if (shouldUseChangeEvent(targetNode)) {
getTargetInstFunc = getTargetInstForChangeEvent;
} else if (isTextInputElement(targetNode)) {
Expand All @@ -279,9 +279,9 @@ var ChangeEventPlugin = {
}

if (getTargetInstFunc) {
var inst = getTargetInstFunc(topLevelType, targetInst);
const inst = getTargetInstFunc(topLevelType, targetInst);
if (inst) {
var event = createAndAccumulateChangeEvent(
const event = createAndAccumulateChangeEvent(
inst,
nativeEvent,
nativeEventTarget,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-dom/src/events/DOMEventPluginOrder.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* `ResponderEventPlugin` must occur before `SimpleEventPlugin` so that
* preventing default on events is convenient in `SimpleEventPlugin` handlers.
*/
var DOMEventPluginOrder = [
const DOMEventPluginOrder = [
'ResponderEventPlugin',
'SimpleEventPlugin',
'TapEventPlugin',
Expand Down
22 changes: 11 additions & 11 deletions packages/react-dom/src/events/EnterLeaveEventPlugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
getNodeFromInstance,
} from '../client/ReactDOMComponentTree';

var eventTypes = {
const eventTypes = {
mouseEnter: {
registrationName: 'onMouseEnter',
dependencies: ['topMouseOut', 'topMouseOver'],
Expand All @@ -24,7 +24,7 @@ var eventTypes = {
},
};

var EnterLeaveEventPlugin = {
const EnterLeaveEventPlugin = {
eventTypes: eventTypes,

/**
Expand All @@ -51,25 +51,25 @@ var EnterLeaveEventPlugin = {
return null;
}

var win;
let win;
if (nativeEventTarget.window === nativeEventTarget) {
// `nativeEventTarget` is probably a window object.
win = nativeEventTarget;
} else {
// TODO: Figure out why `ownerDocument` is sometimes undefined in IE8.
var doc = nativeEventTarget.ownerDocument;
const doc = nativeEventTarget.ownerDocument;
if (doc) {
win = doc.defaultView || doc.parentWindow;
} else {
win = window;
}
}

var from;
var to;
let from;
let to;
if (topLevelType === 'topMouseOut') {
from = targetInst;
var related = nativeEvent.relatedTarget || nativeEvent.toElement;
const related = nativeEvent.relatedTarget || nativeEvent.toElement;
to = related ? getClosestInstanceFromNode(related) : null;
} else {
// Moving to a node from outside the window.
Expand All @@ -82,10 +82,10 @@ var EnterLeaveEventPlugin = {
return null;
}

var fromNode = from == null ? win : getNodeFromInstance(from);
var toNode = to == null ? win : getNodeFromInstance(to);
const fromNode = from == null ? win : getNodeFromInstance(from);
const toNode = to == null ? win : getNodeFromInstance(to);

var leave = SyntheticMouseEvent.getPooled(
const leave = SyntheticMouseEvent.getPooled(
eventTypes.mouseLeave,
from,
nativeEvent,
Expand All @@ -95,7 +95,7 @@ var EnterLeaveEventPlugin = {
leave.target = fromNode;
leave.relatedTarget = toNode;

var enter = SyntheticMouseEvent.getPooled(
const enter = SyntheticMouseEvent.getPooled(
eventTypes.mouseEnter,
to,
nativeEvent,
Expand Down
Loading

0 comments on commit 9546519

Please sign in to comment.