Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-23 13:24:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

UX: Disabled lightbox expand button when loading image meta.

Browse Source
This commit is contained in:
Guo Xiang Tan 2019-02-21 22:30:01 +08:00
parent c5e952839a
commit 1dee71d760
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/components/image-uploader.js.es6
View File

@ -6,6 +6,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
export default Ember.Component.extend(UploadMixin, { export default Ember.Component.extend(UploadMixin, {
classNames: ["image-uploader"], classNames: ["image-uploader"],
loadingLightbox: false,
init() { init() {
this._super(...arguments); this._super(...arguments);
@ -71,6 +72,8 @@ export default Ember.Component.extend(UploadMixin, {
if (this.get("imageFilename")) { if (this.get("imageFilename")) {
this._openLightbox(); this._openLightbox();
} else { } else {
this.set("loadingLightbox", true);
ajax(`/uploads/lookup-metadata`, { ajax(`/uploads/lookup-metadata`, {
type: "POST", type: "POST",
data: { url: this.get("imageUrl") } data: { url: this.get("imageUrl") }
@ -84,6 +87,7 @@ export default Ember.Component.extend(UploadMixin, {
}); });
this._openLightbox(); this._openLightbox();
this.set("loadingLightbox", false);
}) })
.catch(popupAjaxError); .catch(popupAjaxError);
} }

3
app/assets/javascripts/discourse/templates/components/image-uploader.hbs
View File

@ -13,7 +13,8 @@
{{d-button icon="discourse-expand" {{d-button icon="discourse-expand"
title='expand' title='expand'
class="btn image-uploader-lightbox-btn no-text" class="btn image-uploader-lightbox-btn no-text"
action=(action "toggleLightbox")}} action=(action "toggleLightbox")
disabled=loadingLightbox}}
{{/if}} {{/if}}
<span class="btn {{unless uploading 'hidden'}}">{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span> <span class="btn {{unless uploading 'hidden'}}">{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>