[MediaWiki-commits] [Gerrit] mediawiki/core[master]: watch.js: Simplify by using .map()

2018-01-15 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404235 )

Change subject: watch.js: Simplify by using .map()
..


watch.js: Simplify by using .map()

Change-Id: Idd0b4c67d05e0b300b347f2a3a6890c1f2ec88ad
---
M resources/src/mediawiki/page/watch.js
1 file changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/src/mediawiki/page/watch.js 
b/resources/src/mediawiki/page/watch.js
index 5b55bb2..5b41876 100644
--- a/resources/src/mediawiki/page/watch.js
+++ b/resources/src/mediawiki/page/watch.js
@@ -79,7 +79,7 @@
 * @return {string} The extracted action, defaults to 'view'
 */
function mwUriGetAction( url ) {
-   var action, actionPaths, key, i, m, parts;
+   var action, actionPaths, key, m, parts;
 
// TODO: Does MediaWiki give action path or query param
// precedence? If the former, move this to the bottom
@@ -92,9 +92,7 @@
for ( key in actionPaths ) {
if ( actionPaths.hasOwnProperty( key ) ) {
parts = actionPaths[ key ].split( '$1' );
-   for ( i = 0; i < parts.length; i++ ) {
-   parts[ i ] = mw.RegExp.escape( parts[ i 
] );
-   }
+   parts = parts.map( mw.RegExp.escape );
m = new RegExp( parts.join( '(.+)' ) ).exec( 
url );
if ( m && m[ 1 ] ) {
return key;

-- 
To view, visit https://gerrit.wikimedia.org/r/404235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd0b4c67d05e0b300b347f2a3a6890c1f2ec88ad
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: watch.js: Simplify by using .map()

2018-01-14 Thread Fomafix (Code Review) 
Fomafix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404235 )

Change subject: watch.js: Simplify by using .map()
..

watch.js: Simplify by using .map()

Change-Id: Idd0b4c67d05e0b300b347f2a3a6890c1f2ec88ad
---
M resources/src/mediawiki/page/watch.js
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/35/404235/1

diff --git a/resources/src/mediawiki/page/watch.js 
b/resources/src/mediawiki/page/watch.js
index 5b55bb2..88d789a 100644
--- a/resources/src/mediawiki/page/watch.js
+++ b/resources/src/mediawiki/page/watch.js
@@ -79,7 +79,7 @@
 * @return {string} The extracted action, defaults to 'view'
 */
function mwUriGetAction( url ) {
-   var action, actionPaths, key, i, m, parts;
+   var action, actionPaths, key, m, parts;
 
// TODO: Does MediaWiki give action path or query param
// precedence? If the former, move this to the bottom
@@ -92,9 +92,7 @@
for ( key in actionPaths ) {
if ( actionPaths.hasOwnProperty( key ) ) {
parts = actionPaths[ key ].split( '$1' );
-   for ( i = 0; i < parts.length; i++ ) {
-   parts[ i ] = mw.RegExp.escape( parts[ i 
] );
-   }
+   parts.map( mw.RegExp.escape );
m = new RegExp( parts.join( '(.+)' ) ).exec( 
url );
if ( m && m[ 1 ] ) {
return key;

-- 
To view, visit https://gerrit.wikimedia.org/r/404235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd0b4c67d05e0b300b347f2a3a6890c1f2ec88ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits