jenkins-bot has submitted this change and it was merged.
Change subject: Dialogs: Reset values of file insertion dialog properly
......................................................................
Dialogs: Reset values of file insertion dialog properly
Bug: 67111
Change-Id: I63a5cac9108cf9e6966964347407cc63fc0fb9b5
---
M modules/jquery.wikiEditor.dialogs.config.js
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/jquery.wikiEditor.dialogs.config.js
b/modules/jquery.wikiEditor.dialogs.config.js
index 3ec2641..8cd50a0 100644
--- a/modules/jquery.wikiEditor.dialogs.config.js
+++ b/modules/jquery.wikiEditor.dialogs.config.js
@@ -799,7 +799,8 @@
'wikieditor-toolbar-tool-file-insert': function () {
var fileName, caption,
fileFloat, fileFormat, fileSize, fileTitle,
options,
fileUse,
- hasPxRgx =
/.+px$/;
+ hasPxRgx =
/.+px$/,
+ magicWordsI18N
= mw.config.get( 'wgWikiEditorMagicWords' );
fileName = $(
'#wikieditor-toolbar-file-target' ).val();
caption = $(
'#wikieditor-toolbar-file-caption' ).val();
fileFloat = $(
'#wikieditor-toolbar-file-float' ).val();
@@ -844,10 +845,11 @@
// Restore form state
$(
['#wikieditor-toolbar-file-target',
'#wikieditor-toolbar-file-caption',
-
'#wikieditor-toolbar-file-size',
-
'#wikieditor-toolbar-file-float',
-
'#wikieditor-toolbar-file-format'].join( ',' )
+
'#wikieditor-toolbar-file-size'].join( ',' )
).val( '' );
+ $(
'#wikieditor-toolbar-file-float' ).val( 'default' );
+ /*jshint camelcase:
false */
+ $(
'#wikieditor-toolbar-file-format' ).val( magicWordsI18N.img_thumbnail );
},
'wikieditor-toolbar-tool-file-cancel': function () {
$( this ).dialog(
'close' );
--
To view, visit https://gerrit.wikimedia.org/r/154123
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I63a5cac9108cf9e6966964347407cc63fc0fb9b5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Helder.wiki <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
