Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221074
Change subject: Replace deprecated 'jquery.mwExtension' by 'mediawiki.RegExp'
......................................................................
Replace deprecated 'jquery.mwExtension' by 'mediawiki.RegExp'
Replace $.escapeRE from 'jquery.mwExtension' by
mw.RegExp.escape from 'mediawiki.RegExp'.
This change requires MediaWiki 1.26+
Change-Id: I5fc19e1313fc6a06726981e0365cea6d00abb5f3
---
M extension.json
M modules/jquery.wikiEditor.dialogs.config.js
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor
refs/changes/74/221074/1
diff --git a/extension.json b/extension.json
index 6f6a2da..0d0ccfe 100644
--- a/extension.json
+++ b/extension.json
@@ -80,12 +80,12 @@
"scripts": "jquery.wikiEditor.dialogs.config.js",
"styles": "jquery.wikiEditor.dialogs.config.less",
"dependencies": [
- "jquery.mwExtension",
"jquery.wikiEditor",
"jquery.wikiEditor.dialogs",
"jquery.wikiEditor.toolbar.i18n",
"jquery.suggestions",
"mediawiki.api",
+ "mediawiki.RegExp",
"mediawiki.Title",
"mediawiki.jqueryMsg"
],
diff --git a/modules/jquery.wikiEditor.dialogs.config.js
b/modules/jquery.wikiEditor.dialogs.config.js
index 31b5480..3c80637 100644
--- a/modules/jquery.wikiEditor.dialogs.config.js
+++ b/modules/jquery.wikiEditor.dialogs.config.js
@@ -536,7 +536,7 @@
var serverName = mw.config.get(
'wgServer' ).replace( /^(https?:)?\/\//, '' );
// Cache the articlepath regex
$( this ).data(
'articlePathRegex', new RegExp(
- '^https?://' +
$.escapeRE( serverName + mw.config.get( 'wgArticlePath' ) )
+ '^https?://' +
mw.RegExp.escape( serverName + mw.config.get( 'wgArticlePath' ) )
.replace(
/\\\$1/g, '(.*)' ) + '$'
) );
// Pre-fill the text fields
based on the current selection
@@ -1168,7 +1168,7 @@
}
var isRegex = $(
'#wikieditor-toolbar-replace-regex' ).is( ':checked' );
if ( !isRegex ) {
- searchStr = $.escapeRE(
searchStr );
+ searchStr =
mw.RegExp.escape( searchStr );
}
if ( mode === 'replaceAll' ) {
flags += 'g';
--
To view, visit https://gerrit.wikimedia.org/r/221074
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5fc19e1313fc6a06726981e0365cea6d00abb5f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
