Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/187859
Change subject: Update HTML deserialization for jQuery 1.9+ requirements
......................................................................
Update HTML deserialization for jQuery 1.9+ requirements
* Use parseHTML when HTML content is not hard-coded.
* When it is hard-coded, make sure the string starts with <.
Bug: T85507
Change-Id: Ied96dcbbd2db012dbd1edc42699c0bc4bce328aa
---
M modules/ext.moodBar.dashboard/ext.moodBar.dashboard.js
M modules/ext.moodBar/ext.moodBar.core.js
2 files changed, 48 insertions(+), 61 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MoodBar
refs/changes/59/187859/1
diff --git a/modules/ext.moodBar.dashboard/ext.moodBar.dashboard.js
b/modules/ext.moodBar.dashboard/ext.moodBar.dashboard.js
index 45d2aeb..1da6da5 100644
--- a/modules/ext.moodBar.dashboard/ext.moodBar.dashboard.js
+++ b/modules/ext.moodBar.dashboard/ext.moodBar.dashboard.js
@@ -242,7 +242,7 @@
if ( data && data.query &&
data.query.moodbarcomments &&
data.query.moodbarcomments.length > 0
) {
- var $content = $(
data.query.moodbarcomments[0].formatted );
+ var $content = $( $.parseHTML(
data.query.moodbarcomments[0].formatted ) );
$item.replaceWith( $content );
} else {
// Failure, just remove the link.
diff --git a/modules/ext.moodBar/ext.moodBar.core.js
b/modules/ext.moodBar/ext.moodBar.core.js
index cb2cb4d..822d73f 100644
--- a/modules/ext.moodBar/ext.moodBar.core.js
+++ b/modules/ext.moodBar/ext.moodBar.core.js
@@ -12,14 +12,12 @@
$.extend( mb, {
tpl: {
- overlayBase: '\
- <div id="mw-moodBar-overlayWrap"><div
id="mw-moodBar-overlay">\
- <div id="mw-moodBar-pokey"></div>\
- <span
class="mw-moodBar-overlayClose"><a href="#"><html:msg key="moodbar-close"
/></a></span>\
- <div
class="mw-moodBar-overlayContent"></div>\
- </div></div>',
- userinput: '\
- <div
class="mw-moodBar-overlayTitle"><span><html:msg key="INTROTITLE"
/></span></div>\
+ overlayBase: '<div id="mw-moodBar-overlayWrap"><div
id="mw-moodBar-overlay">\
+ <div
id="mw-moodBar-pokey"></div>\
+ <span
class="mw-moodBar-overlayClose"><a href="#"><html:msg key="moodbar-close"
/></a></span>\
+ <div
class="mw-moodBar-overlayContent"></div>\
+ </div></div>',
+ userinput: '<div
class="mw-moodBar-overlayTitle"><span><html:msg key="INTROTITLE"
/></span></div>\
<div
class="mw-moodBar-types-container">\
<div
class="mw-moodBar-types"></div>\
</div>\
@@ -41,23 +39,21 @@
</a>\
<div
class="mw-moodBar-overlayWhatContent"></div>\
</span>',
- emailinput: '\
- <div
class="mw-moodBar-overlayTitle"><span><html:msg key="moodbar-email-title"
/></span></div>\
- <div class="mw-moodBar-form">\
- <div
class="mw-moodBar-desc">\
- <html:msg
key="moodbar-email-desc" />\
+ emailinput: '<div
class="mw-moodBar-overlayTitle"><span><html:msg key="moodbar-email-title"
/></span></div>\
+ <div class="mw-moodBar-form">\
+ <div class="mw-moodBar-desc">\
+ <html:msg
key="moodbar-email-desc" />\
+ </div>\
+ <div
class="mw-moodBar-formInputs">\
+ <div>\
+ <html:msg
key="moodbar-email-input" />\
+ <input
type="text" id="mw-moodBar-emailInput" class="mw-moodBar-emailInput" />\
</div>\
- <div
class="mw-moodBar-formInputs">\
- <div>\
-
<html:msg key="moodbar-email-input" />\
- <input
type="text" id="mw-moodBar-emailInput" class="mw-moodBar-emailInput" />\
- </div>\
- <input
type="button" class="mw-moodBar-emailSubmit" disabled="disabled" />\
- <input
type="button" class="mw-moodBar-emailOptOut" />\
- </div>\
- </div>',
- emailconfirmation: '\
- <div
class="mw-moodBar-overlayTitle"><span><html:msg
key="moodbar-email-confirm-title" /></span></div>\
+ <input type="button"
class="mw-moodBar-emailSubmit" disabled="disabled" />\
+ <input type="button"
class="mw-moodBar-emailOptOut" />\
+ </div>\
+ </div>',
+ emailconfirmation: '<div
class="mw-moodBar-overlayTitle"><span><html:msg
key="moodbar-email-confirm-title" /></span></div>\
<div class="mw-moodBar-form">\
<div
class="mw-moodBar-desc">\
<html:msg
key="moodbar-email-confirm-desc" />\
@@ -67,51 +63,42 @@
<input
type="button" class="mw-moodBar-emailOptOut" />\
</div>\
</div>',
- type: '\
- <span class="mw-moodBar-type
mw-moodBar-type-$1" rel="$1">\
+ type: '<span class="mw-moodBar-type
mw-moodBar-type-$1" rel="$1">\
</span>',
- loading: '\
- <div class="mw-moodBar-state
mw-moodBar-state-loading">\
- <div
class="mw-moodBar-state-title"><html:msg key="moodbar-loading-title" /></div>\
- <div
class="mw-moodBar-state-subtitle"><html:msg key="moodbar-loading-subtitle"
/></div>\
- </div>',
+ loading: '<div class="mw-moodBar-state
mw-moodBar-state-loading">\
+ <div
class="mw-moodBar-state-title"><html:msg key="moodbar-loading-title" /></div>\
+ <div
class="mw-moodBar-state-subtitle"><html:msg key="moodbar-loading-subtitle"
/></div>\
+ </div>',
disabling: '\
<div class="mw-moodBar-state
mw-moodBar-state-loading">\
<div
class="mw-moodBar-state-title"><html:msg key="moodbar-disabling-title" /></div>\
<div
class="mw-moodBar-state-subtitle"><html:msg key="moodbar-disabling-subtitle"
/></div>\
</div>',
- updatingEmail: '\
- <div class="mw-moodBar-state
mw-moodBar-state-loading">\
- <div
class="mw-moodBar-state-title"><html:msg key="moodbar-updating-title" /></div>\
- <div
class="mw-moodBar-state-subtitle"><html:msg key="moodbar-updating-subtitle"
/></div>\
- </div>',
- success: '\
- <div class="mw-moodBar-state
mw-moodBar-state-success">\
- <div
class="mw-moodBar-state-title"><html:msg key="moodbar-success-title" /></div>\
- <div
class="mw-moodBar-state-subtitle"><html:msg key="moodbar-success-subtitle"
/></div>\
- </div>',
- error: '\
- <div class="mw-moodBar-state
mw-moodBar-state-error">\
+ updatingEmail: '<div class="mw-moodBar-state
mw-moodBar-state-loading">\
+ <div
class="mw-moodBar-state-title"><html:msg key="moodbar-updating-title" /></div>\
+ <div
class="mw-moodBar-state-subtitle"><html:msg key="moodbar-updating-subtitle"
/></div>\
+ </div>',
+ success: '<div class="mw-moodBar-state
mw-moodBar-state-success">\
+ <div
class="mw-moodBar-state-title"><html:msg key="moodbar-success-title" /></div>\
+ <div
class="mw-moodBar-state-subtitle"><html:msg key="moodbar-success-subtitle"
/></div>\
+ </div>',
+ error: '<div class="mw-moodBar-state
mw-moodBar-state-error">\
<div
class="mw-moodBar-state-title"><html:msg key="moodbar-error-title" /></div>\
<div
class="mw-moodBar-state-subtitle"><html:msg key="moodbar-error-subtitle"
/></div>\
</div>',
- disablingError: '\
- <div class="mw-moodBar-state
mw-moodBar-state-error">\
- <div
class="mw-moodBar-state-title"><html:msg key="moodbar-error-title" /></div>\
- <div
class="mw-moodBar-state-subtitle"><html:msg
key="moodbar-disable-error-subtitle" /></div>\
- </div>',
- blocked: '\
- <div class="mw-moodBar-state
mw-moodBar-state-error">\
- <div
class="mw-moodBar-state-title"><html:msg key="moodbar-blocked-title" /></div>\
- <div
class="mw-moodBar-state-subtitle"><html:msg key="moodbar-blocked-subtitle"
/></div>\
- </div>',
- ratelimited: '\
- <div class="mw-moodBar-state
mw-moodBar-state-error">\
- <div
class="mw-moodBar-state-title"><html:msg key="moodbar-ratelimited-title"
/></div>\
- <div
class="mw-moodBar-state-subtitle"><html:msg key="moodbar-ratelimited-subtitle"
/></div>\
- </div>',
- abuse: '\
- <div class="mw-moodBar-state
mw-moodBar-state-error">\
+ disablingError: '<div class="mw-moodBar-state
mw-moodBar-state-error">\
+ <div
class="mw-moodBar-state-title"><html:msg key="moodbar-error-title" /></div>\
+ <div
class="mw-moodBar-state-subtitle"><html:msg
key="moodbar-disable-error-subtitle" /></div>\
+ </div>',
+ blocked: '<div class="mw-moodBar-state
mw-moodBar-state-error">\
+ <div
class="mw-moodBar-state-title"><html:msg key="moodbar-blocked-title" /></div>\
+ <div
class="mw-moodBar-state-subtitle"><html:msg key="moodbar-blocked-subtitle"
/></div>\
+ </div>',
+ ratelimited: '<div class="mw-moodBar-state
mw-moodBar-state-error">\
+ <div
class="mw-moodBar-state-title"><html:msg key="moodbar-ratelimited-title"
/></div>\
+ <div
class="mw-moodBar-state-subtitle"><html:msg key="moodbar-ratelimited-subtitle"
/></div>\
+ </div>',
+ abuse: '<div class="mw-moodBar-state
mw-moodBar-state-error">\
<div
class="mw-moodBar-state-title"><html:msg key="moodbar-abuse-title" /></div>\
<div
class="mw-moodBar-state-subtitle"><html:msg key="moodbar-abuse-subtitle"
/></div>\
</div>'
--
To view, visit https://gerrit.wikimedia.org/r/187859
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied96dcbbd2db012dbd1edc42699c0bc4bce328aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MoodBar
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
