jenkins-bot has submitted this change and it was merged.
Change subject: Use mw.Upload.Dialog to upload and insert file
......................................................................
Use mw.Upload.Dialog to upload and insert file
Bug: T115748
Change-Id: I2427cd959f0d9b6872866e120e7bd0e7e298ec27
---
M .jshintrc
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/jquery.wikiEditor.dialogs.config.js
5 files changed, 29 insertions(+), 4 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshintrc b/.jshintrc
index 81d1fa7..5595507 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -29,6 +29,7 @@
"globals": {
"mediaWiki": false,
"jQuery": false,
- "QUnit": false
+ "QUnit": false,
+ "OO": true
}
}
diff --git a/extension.json b/extension.json
index b7762b2..97246f9 100644
--- a/extension.json
+++ b/extension.json
@@ -84,6 +84,8 @@
"jquery.wikiEditor.dialogs",
"jquery.wikiEditor.toolbar.i18n",
"jquery.suggestions",
+ "mediawiki.Upload.Dialog",
+
"mediawiki.ForeignStructuredUpload.BookletLayout",
"mediawiki.api",
"mediawiki.RegExp",
"mediawiki.Title",
@@ -99,7 +101,8 @@
"wikieditor-toolbar-file-format-none",
"wikieditor-toolbar-file-format",
"wikieditor-toolbar-tool-file-insert",
- "wikieditor-toolbar-tool-file-cancel"
+ "wikieditor-toolbar-tool-file-cancel",
+ "wikieditor-toolbar-tool-file-upload"
],
"templates": {
"dialogInsertFile.html":
"templates/dialogInsertFile.html",
diff --git a/i18n/en.json b/i18n/en.json
index a53e2c4..0697fc1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -69,6 +69,7 @@
"wikieditor-toolbar-file-format-none": "none",
"wikieditor-toolbar-tool-file-insert": "Insert",
"wikieditor-toolbar-tool-file-cancel": "Cancel",
+ "wikieditor-toolbar-tool-file-upload": "Upload",
"wikieditor-toolbar-tool-reference": "Reference",
"wikieditor-toolbar-tool-reference-example": "Insert footnote text
here",
"wikieditor-toolbar-tool-reference-cancel": "Cancel",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 56748af..56dd551 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -91,6 +91,7 @@
"wikieditor-toolbar-file-format-none": "Option in file dialog for no
format for the added image.\n{{Identical|None}}",
"wikieditor-toolbar-tool-file-insert": "{{Identical|Insert}}",
"wikieditor-toolbar-tool-file-cancel": "{{Identical|Cancel}}",
+ "wikieditor-toolbar-tool-file-upload": "Label for button that opens the
upload dialog",
"wikieditor-toolbar-tool-reference": "{{Identical|Reference}}",
"wikieditor-toolbar-tool-reference-example": "Used as example text when
inserting a reference into the editbox from the toolbar",
"wikieditor-toolbar-tool-reference-cancel": "{{Identical|Cancel}}",
diff --git a/modules/jquery.wikiEditor.dialogs.config.js
b/modules/jquery.wikiEditor.dialogs.config.js
index 857828b..203b2f3 100644
--- a/modules/jquery.wikiEditor.dialogs.config.js
+++ b/modules/jquery.wikiEditor.dialogs.config.js
@@ -3,7 +3,7 @@
*/
/*jshint curly:false, noarg:false, quotmark:false, onevar:false */
/*global alert */
-( function ( $, mw ) {
+( function ( $, mw, OO ) {
var hasOwn = Object.prototype.hasOwnProperty;
@@ -781,6 +781,25 @@
},
'wikieditor-toolbar-tool-file-cancel': function () {
$( this ).dialog(
'close' );
+ },
+
'wikieditor-toolbar-tool-file-upload': function () {
+ var windowManager = new
OO.ui.WindowManager(),
+ uploadDialog =
new mw.Upload.Dialog( {
+
bookletClass: mw.ForeignStructuredUpload.BookletLayout
+ } );
+
+ $( this ).dialog(
'close' );
+ $( 'body' ).append(
windowManager.$element );
+
windowManager.addWindows( [ uploadDialog ] );
+
windowManager.openWindow( uploadDialog );
+
+
uploadDialog.uploadBooklet.on( 'fileSaved', function ( imageInfo ) {
+
uploadDialog.close();
+
windowManager.$element.remove();
+
+
$.wikiEditor.modules.dialogs.api.openDialog( this, 'insert-file' );
+ $(
'#wikieditor-toolbar-file-target' ).val( imageInfo.canonicaltitle );
+ } );
}
},
open: function () {
@@ -1224,4 +1243,4 @@
};
-}( jQuery, mediaWiki ) );
+}( jQuery, mediaWiki, OO ) );
--
To view, visit https://gerrit.wikimedia.org/r/247563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2427cd959f0d9b6872866e120e7bd0e7e298ec27
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Prtksxna <[email protected]>
Gerrit-Reviewer: TheDJ <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
