jenkins-bot has submitted this change and it was merged.
Change subject: HTMLForm: Avoid usage of non-standard 'flags' parameter of
String#replace
......................................................................
HTMLForm: Avoid usage of non-standard 'flags' parameter of String#replace
Chrome (and most other browser) don't support the non-standard 'flags'
argument to String#replace (implemented by Mozilla Firefox). Instead pass
a RegExp object with those flags.
Bug: 68050
Change-Id: Ia463002e708975eed1a5c3657f2e1a4d6b4e74de
---
M resources/Resources.php
M resources/src/mediawiki/mediawiki.htmlform.js
2 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/Resources.php b/resources/Resources.php
index d3f8f7d..a66faa6 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -862,6 +862,9 @@
),
'mediawiki.htmlform' => array(
'scripts' => 'resources/src/mediawiki/mediawiki.htmlform.js',
+ 'dependencies' => array(
+ 'jquery.mwExtension',
+ ),
'messages' => array( 'htmlform-chosen-placeholder' ),
),
'mediawiki.icon' => array(
diff --git a/resources/src/mediawiki/mediawiki.htmlform.js
b/resources/src/mediawiki/mediawiki.htmlform.js
index 9eea492..5027f7a 100644
--- a/resources/src/mediawiki/mediawiki.htmlform.js
+++ b/resources/src/mediawiki/mediawiki.htmlform.js
@@ -363,7 +363,8 @@
$ul = $( this ).prev( 'ul.mw-htmlform-cloner-ul' );
html = $ul.data( 'template' ).replace(
- $ul.data( 'uniqueId' ), 'clone' + (
++cloneCounter ), 'g'
+ new RegExp( $.escapeRE( $ul.data( 'uniqueId' )
), 'g' ),
+ 'clone' + ( ++cloneCounter )
);
$li = $( '<li>' )
--
To view, visit https://gerrit.wikimedia.org/r/146931
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia463002e708975eed1a5c3657f2e1a4d6b4e74de
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Spage <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
