Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133050
Change subject: If no media is found display a message in media insert dialog
......................................................................
If no media is found display a message in media insert dialog
Add a message indicating to the user that no image results were
found in the media insert dialog in case no results are found.
Bug: 52463
Change-Id: I93aea897d864298bf891a90c2fb147f7d34df06d
---
M VisualEditor.php
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaResultWidget.css
M modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
5 files changed, 28 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/50/133050/1
diff --git a/VisualEditor.php b/VisualEditor.php
index a990bef..786b9bf 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -782,6 +782,7 @@
'visualeditor-dialog-media-content-section',
'visualeditor-dialog-media-insert-button',
'visualeditor-dialog-media-insert-title',
+ 'visualeditor-dialog-media-noresults',
'visualeditor-dialog-media-page-advanced',
'visualeditor-dialog-media-page-general',
'visualeditor-dialog-media-position-center',
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 3d562a0..9afe782 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -49,6 +49,7 @@
"visualeditor-dialog-media-content-section": "Caption",
"visualeditor-dialog-media-insert-button": "Insert media",
"visualeditor-dialog-media-insert-title": "Insert media",
+ "visualeditor-dialog-media-noresults": "No results found.",
"visualeditor-dialog-media-page-advanced": "Advanced settings",
"visualeditor-dialog-media-page-general": "General settings",
"visualeditor-dialog-media-position-center": "Center",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index b8671af..1c629e0 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -54,6 +54,7 @@
"visualeditor-dialog-media-content-section": "Label for the image
content sub-section.\n{{Identical|Caption}}",
"visualeditor-dialog-media-insert-button": "Used as label for the
button.\n{{Identical|Insert media}}",
"visualeditor-dialog-media-insert-title": "Media insert dialog title
text.\n{{Identical|Insert media}}",
+ "visualeditor-dialog-media-noresults": "Label notifying the user no
results were found for the media search.",
"visualeditor-dialog-media-page-advanced": "Label for the advanced
settings page in the media edit dialog.\n{{Identical|Advanced settings}}",
"visualeditor-dialog-media-page-general": "Label for the general
settings page in the media edit dialog.\n{{Identical|General settings}}",
"visualeditor-dialog-media-position-center": "Label for the image
position option for aligning to the
center.\n{{Related|Visualeditor-dialog-media-position}}\n{{Identical|Center}}",
diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaResultWidget.css
b/modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaResultWidget.css
index 037d236..fcdcbf1 100644
--- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaResultWidget.css
+++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaResultWidget.css
@@ -87,3 +87,7 @@
.ve-ui-mwMediaResultWidget.oo-ui-optionWidget-selected
.oo-ui-labeledElement-label {
background-color: #000;
}
+
+.ve-ui-mwMediaSearchWidget-noresults {
+ padding-top: 1em;
+}
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
index de53f7b..3efc28d 100755
--- a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
@@ -34,6 +34,13 @@
this.titles = {};
this.queryMediaSourcesCallback = ve.bind( this.queryMediaSources, this
);
+ this.sourceCounter = 0;
+
+ this.$noItemsMessage = $( '<div>' )
+ .addClass( 've-ui-mwMediaSearchWidget-noresults' )
+ .appendTo( this.$query )
+ .text( ve.msg( 'visualeditor-dialog-media-noresults' ) );
+
// Events
this.$results.on( 'scroll', ve.bind( this.onResultsScroll, this ) );
@@ -103,6 +110,10 @@
return;
}
+ // Reset counter
+ this.sourceCounter = 0;
+ this.$noItemsMessage.hide();
+
for ( i = 0, len = this.sources.length; i < len; i++ ) {
source = this.sources[i];
// If we don't have either 'apiurl' or 'scriptDirUrl'
@@ -159,6 +170,16 @@
ve.ui.MWMediaSearchWidget.prototype.onMediaQueryAlways = function ( source ) {
source.request = null;
this.query.popPending();
+
+ // Count this source as done
+ this.sourceCounter++;
+
+ // Check if all sources are done
+ if ( this.sourceCounter >= this.sources.length ) {
+ if ( this.results.getItems().length === 0 ) {
+ this.$noItemsMessage.show();
+ }
+ }
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/133050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I93aea897d864298bf891a90c2fb147f7d34df06d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <mor...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
