Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178000
Change subject: Use String#slice instead of discouraged String#substr
......................................................................
Use String#slice instead of discouraged String#substr
Aside from the confusion and differences between substr() and
substring() and IE8 bugs with substr(), substr() was removed from
the spec as of ECMAScript 5. It's been standardised in the
optional Annex B section of ES5.
Change-Id: I221ef6ae6956ce20dd9bb74510500f747d04c3b1
---
M modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
M modules/ve-mw/init/ve.init.mw.trackSubscriber.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
7 files changed, 12 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/00/178000/1
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
index b811a08..bb8413e 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
@@ -160,7 +160,7 @@
dataElement.attributes.listKey,
// Generate a name starting with ':' to
distinguish it from normal names
'literal/:'
- ).substr( 'literal/'.length );
+ ).slice( 'literal/'.length );
} else {
name = undefined;
}
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
index fd9e48f..c7470f4 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -166,8 +166,8 @@
output += input;
break;
}
- output += input.substr( 0, match.index );
- input = input.substr( match.index + match[0].length );
+ output += input.slice( 0, match.index );
+ input = input.slice( match.index + match[0].length );
if ( inNowiki ) {
if ( match[0] === '</nowiki>' ) {
inNowiki = false;
diff --git a/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
b/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
index c53d100..0906a7d 100644
--- a/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
+++ b/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
@@ -53,11 +53,14 @@
ve.trackSubscribeAll( function ( topic, data ) {
data = data || {};
- var newData, action, now = Math.floor( ve.now() ), prefix =
topic.substr( 0, topic.indexOf( '.' ) );
+ var newData, action,
+ now = Math.floor( ve.now() ),
+ prefix = topic.slice( 0, topic.indexOf( '.' ) );
+
if ( prefix === 'mwtiming' ) {
// Legacy TimingData events
// Map timing.foo --> ve.foo
- topic = 've.' + topic.substr( prefix.length + 1 );
+ topic = 've.' + topic.slice( prefix.length + 1 );
} else if ( prefix === 'mwedit' ) {
// Edit schema
action = topic.split( '.' )[1];
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 85d2c57..4993714 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -605,7 +605,7 @@
if ( namespacesWithSubpages[ namespace ] ) {
// If we are in a namespace that allows for
subpages, strip the entire
// title except for the part after the last /
- pageTitle = pageTitle.substr(
pageTitle.lastIndexOf( '/' ) + 1 );
+ pageTitle = pageTitle.slice(
pageTitle.lastIndexOf( '/' ) + 1 );
}
this.pageTitle = pageTitle;
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
index d9d7a97..364ce62 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
@@ -248,7 +248,7 @@
}
if ( this.forceCapitalization ) {
- value = value.substr( 0, 1 ).toUpperCase() + value.substr( 1 );
+ value = value.slice( 0, 1 ).toUpperCase() + value.slice( 1 );
}
return {
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js
index 4eb4be6..14613d9 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js
@@ -49,7 +49,7 @@
Object.keys( internalList.getNodeGroups() ),
function ( groupInternalName ) {
if ( groupInternalName.indexOf( 'mwReference/' ) === 0
) {
- var groupName = groupInternalName.substring(
'mwReference/'.length );
+ var groupName = groupInternalName.slice(
'mwReference/'.length );
if ( groupName ) {
return new OO.ui.MenuOptionWidget( {
data: groupName, label: groupName } );
}
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
index 55528f0..a6cabaa 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
@@ -73,7 +73,7 @@
// Dont send leading ':' to open search
if ( value.charAt( 0 ) === ':' ) {
- value = value.substr( 1 );
+ value = value.slice( 1 );
}
return ve.init.target.constructor.static.apiRequest( {
--
To view, visit https://gerrit.wikimedia.org/r/178000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I221ef6ae6956ce20dd9bb74510500f747d04c3b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
