From 1880850d260ac159cf92c3a839f39592d3afa67f Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Sat, 12 Nov 2016 08:59:16 -0800 Subject: [PATCH] [Refactor] use `slice` instead of deprecated `substr` or `substring` --- src/MountedTraversal.js | 4 ++-- src/ShallowTraversal.js | 4 ++-- src/Utils.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/MountedTraversal.js b/src/MountedTraversal.js index c8b7504b8..6723fc229 100644 --- a/src/MountedTraversal.js +++ b/src/MountedTraversal.js @@ -202,9 +202,9 @@ export function buildInstPredicate(selector) { switch (selectorType(selector)) { case SELECTOR.CLASS_TYPE: - return inst => hasClassName(inst, selector.substr(1)); + return inst => hasClassName(inst, selector.slice(1)); case SELECTOR.ID_TYPE: - return inst => instHasId(inst, selector.substr(1)); + return inst => instHasId(inst, selector.slice(1)); case SELECTOR.PROP_TYPE: { const propKey = selector.split(/\[([a-zA-Z][a-zA-Z_\d\-:]*?)(=|])/)[1]; const propValue = selector.split(/=(.*?)]/)[1]; diff --git a/src/ShallowTraversal.js b/src/ShallowTraversal.js index 80f08f531..49f3c44d0 100644 --- a/src/ShallowTraversal.js +++ b/src/ShallowTraversal.js @@ -104,10 +104,10 @@ export function buildPredicate(selector) { switch (selectorType(selector)) { case SELECTOR.CLASS_TYPE: - return node => hasClassName(node, selector.substr(1)); + return node => hasClassName(node, selector.slice(1)); case SELECTOR.ID_TYPE: - return node => nodeHasId(node, selector.substr(1)); + return node => nodeHasId(node, selector.slice(1)); case SELECTOR.PROP_TYPE: { const propKey = selector.split(/\[([a-zA-Z-]*?)(=|])/)[1]; diff --git a/src/Utils.js b/src/Utils.js index 32b29f622..3ae53d4fc 100644 --- a/src/Utils.js +++ b/src/Utils.js @@ -155,7 +155,7 @@ export function isReactElementAlike(arg) { // 'mouseEnter' => 'onMouseEnter' export function propFromEvent(event) { const nativeEvent = mapNativeEventNames(event); - return `on${nativeEvent[0].toUpperCase()}${nativeEvent.substring(1)}`; + return `on${nativeEvent[0].toUpperCase()}${nativeEvent.slice(1)}`; } export function withSetStateAllowed(fn) {