jenkins-bot has submitted this change and it was merged.
Change subject: Replace 'jquery.mwExtension' by 'mediawiki.RegExp'
......................................................................
Replace 'jquery.mwExtension' by 'mediawiki.RegExp'
Replace $.escapeRE from 'jquery.mwExtension' by
mw.RegExp.escape from 'mediawiki.RegExp'.
Bug: T103610
Change-Id: I1d23e4c02d92828291b98a52b4e8050fbebc06d9
(cherry picked from commit 7713e343fefe4684895d7479d25265e2469508ff)
---
M Popups.hooks.php
M resources/ext.popups.core.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Popups.hooks.php b/Popups.hooks.php
index f945689..5a6a92e 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -68,13 +68,13 @@
public static function onResourceLoaderRegisterModules( ResourceLoader
$rl ) {
$moduleDependencies = array(
'mediawiki.api',
+ 'mediawiki.RegExp',
'mediawiki.Title',
'mediawiki.jqueryMsg',
'mediawiki.Uri',
'moment',
'jquery.jStorage',
'jquery.client',
- 'jquery.mwExtension',
);
// If EventLogging is present, add the schema as a dependency.
diff --git a/resources/ext.popups.core.js b/resources/ext.popups.core.js
index b9a1281..f29c52e 100644
--- a/resources/ext.popups.core.js
+++ b/resources/ext.popups.core.js
@@ -183,7 +183,7 @@
if ( !$.isEmptyObject( linkHref.query ) ) {
return undefined;
}
- titleRegex = new RegExp( $.escapeRE( mw.config.get(
'wgArticlePath' ) )
+ titleRegex = new RegExp( mw.RegExp.escape(
mw.config.get( 'wgArticlePath' ) )
.replace( '\\$1', '(.+)' ) );
matches = titleRegex.exec( linkHref.path );
return matches ? decodeURIComponent( matches[1] ) :
undefined;
--
To view, visit https://gerrit.wikimedia.org/r/221061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d23e4c02d92828291b98a52b4e8050fbebc06d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: wmf/1.26wmf11
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
