github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 13:51:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert Ember.run refactors

Browse Source 
This reverts commit 5ca60fcb6b592524086f98279d3e4fd949598343.
This commit is contained in:
Robin Ward
2019-10-29 17:10:47 -04:00
parent cfa5d123a3
commit fcb1ca52f9
153 changed files with 319 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/javascripts/admin/components/resumable-upload.js.es6
View File

@ -1,5 +1,3 @@
import { schedule } from "@ember/runloop";
import { later } from "@ember/runloop";
import Component from "@ember/component";
import { iconHTML } from "discourse-common/lib/icon-library";
import { bufferedRender } from "discourse-common/lib/buffered-render";
@ -47,16 +45,18 @@ export default Component.extend(
this.resumable.upload();
// mark as uploading
later(() => this.set("isUploading", true));
Ember.run.later(() => this.set("isUploading", true));
});
this.resumable.on("fileProgress", file => {
// update progress
later(() => this.set("progress", parseInt(file.progress() * 100, 10)));
Ember.run.later(() =>
this.set("progress", parseInt(file.progress() * 100, 10))
);
});
this.resumable.on("fileSuccess", file => {
later(() => {
Ember.run.later(() => {
// mark as not uploading anymore
this._reset();
@ -66,7 +66,7 @@ export default Component.extend(
});
this.resumable.on("fileError", (file, message) => {
later(() => {
Ember.run.later(() => {
// mark as not uploading anymore
this._reset();
@ -78,7 +78,7 @@ export default Component.extend(
@on("didInsertElement")
_assignBrowse() {
schedule("afterRender", () =>
Ember.run.schedule("afterRender", () =>
this.resumable.assignBrowse($(this.element))
);
},
@ -117,7 +117,7 @@ export default Component.extend(
click() {
if (this.isUploading) {
this.resumable.cancel();
later(() => this._reset());
Ember.run.later(() => this._reset());
return false;
} else {
return true;