wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-25 23:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "mw.ViewPageTarget: Support for non-paragraphs in #showWarning"

Browse source
This commit is contained in:
jenkins-bot 2013-06-30 03:15:53 +00:00 committed by Gerrit Code Review
parent b6f6f1407f 656fd2ffd4
commit dbb11046d0
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
View file

@ -2074,17 +2074,24 @@ ve.init.mw.ViewPageTarget.prototype.restoreEditSection = function () {
/**
* Show an inline warning.
* @param {string} name Warning's unique name
* @param {string} messageHtml Warning message HTML
* @param {string|jQuery} message Warning message (string of HTML, not text, or jQuery object)
* @param {Object} [options]
* @param {boolean} [options.wrap=true] Wrap the message in a paragraph.
*/
ve.init.mw.ViewPageTarget.prototype.showWarning = function ( name, messageHtml ) {
ve.init.mw.ViewPageTarget.prototype.showWarning = function ( name, message, options ) {
var $warning;
if ( !this.warnings[name] ) {
var warning = $(
'<p class="ve-init-mw-viewPageTarget-saveDialog-warning">' + messageHtml + '</p>'
);
this.$saveDialog
.find( '.ve-init-mw-viewPageTarget-saveDialog-warnings' )
.append( warning );
this.warnings[name] = warning;
options = options || {};
$warning = $( '<div class="ve-init-mw-viewPageTarget-saveDialog-warning"></div>' );
if ( options.wrap !== false ) {
$warning.append( $( '<p>').append( message ) );
} else {
$warning.append( message );
}
this.$saveDialog.find( '.ve-init-mw-viewPageTarget-saveDialog-warnings' )
.append( $warning );
this.warnings[name] = $warning;
}
};