jenkins-bot has submitted this change and it was merged.
Change subject: Use String#slice instead of discouraged String#substr
......................................................................
Use String#slice instead of discouraged String#substr
Follows-up 7004717af5.
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: I1f9f46f73ea0c79ec7e4c726a86bfe3ffa1924d3
---
M build/tasks/git-build.js
M src/ui/widgets/ve.ui.LanguageResultWidget.js
M tests/ce/ve.ce.TestRunner.js
3 files changed, 6 insertions(+), 5 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/build/tasks/git-build.js b/build/tasks/git-build.js
index 6053b5c..7d34e06 100644
--- a/build/tasks/git-build.js
+++ b/build/tasks/git-build.js
@@ -13,7 +13,7 @@
done( false );
return;
}
- grunt.config.set( 'pkg.version', grunt.config(
'pkg.version' ) + '-pre (' + stout.substr( 0, 10 ) + ')' );
+ grunt.config.set( 'pkg.version', grunt.config(
'pkg.version' ) + '-pre (' + stout.slice( 0, 10 ) + ')' );
grunt.verbose.writeln( 'Added git HEAD to pgk.version'
);
done();
} );
diff --git a/src/ui/widgets/ve.ui.LanguageResultWidget.js
b/src/ui/widgets/ve.ui.LanguageResultWidget.js
index 2ae6b60..254b1a9 100644
--- a/src/ui/widgets/ve.ui.LanguageResultWidget.js
+++ b/src/ui/widgets/ve.ui.LanguageResultWidget.js
@@ -75,7 +75,7 @@
document.createTextNode( text.slice( 0, offset ) ),
this.$( '<span>' )
.addClass( 've-ui-languageResultWidget-highlight' )
- .text( text.substr( offset, query.length ) ),
+ .text( text.slice( offset, offset + query.length ) ),
document.createTextNode( text.slice( offset + query.length ) )
);
return $result.contents();
diff --git a/tests/ce/ve.ce.TestRunner.js b/tests/ce/ve.ce.TestRunner.js
index 6706209..2ce05de 100644
--- a/tests/ce/ve.ce.TestRunner.js
+++ b/tests/ce/ve.ce.TestRunner.js
@@ -58,8 +58,8 @@
// test >= n because one more boundaries than code units
if ( node.textContent.length >= n ) {
offset = reversed ? node.textContent.length - n : n;
- slice = node.textContent.substring( 0, offset ) + '|' +
- node.textContent.substring( offset );
+ slice = node.textContent.slice( 0, offset ) + '|' +
+ node.textContent.slice( offset );
return { node: node, offset: offset, slice: slice };
} else {
return { consumed: node.textContent.length + 1 };
@@ -204,7 +204,8 @@
// FIXME: renaming startNode to startContainer revealed failing tests
if ( false && nativeRange && nativeRange.startContainer &&
text.indexOf( nativeRange.startContainer.textContent ) === 0 ) {
// We're just appending
- extra = nativeRange.startContainer.textContent.substring(
nativeRange.startContainer.textContent.length );
+ // FIXME: str.slice( tr.length ) always produces an empty
string...
+ extra = nativeRange.startContainer.textContent.slice(
nativeRange.startContainer.textContent.length );
// This is fine IF startContainer is a TextNode
nativeRange.startContainer.textContent += extra;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/177998
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f9f46f73ea0c79ec7e4c726a86bfe3ffa1924d3
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
