osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert Ember.run refactors

Browse Source 
This reverts commit 5ca60fcb6b.
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
app/assets/javascripts/admin/components/admin-backups-logs.js.es6
+1 -2
View File
@@ -1,4 +1,3 @@
import { scheduleOnce } from "@ember/runloop";
import Component from "@ember/component";
import debounce from "discourse/lib/debounce";
import { renderSpinner } from "discourse/helpers/loading-spinner";
@@ -54,7 +53,7 @@ export default Component.extend(
// force rerender
this.rerenderBuffer();
scheduleOnce("afterRender", this, this._scrollDown);
Ember.run.scheduleOnce("afterRender", this, this._scrollDown);
}, 150),
buildBuffer(buffer) {
app/assets/javascripts/admin/components/admin-report-chart.js.es6
+3 -5
View File
@@ -1,5 +1,3 @@
import { debounce } from "@ember/runloop";
import { schedule } from "@ember/runloop";
import Component from "@ember/component";
import { number } from "discourse/lib/formatter";
import loadScript from "discourse/lib/load-script";
@@ -13,7 +11,7 @@ export default Component.extend({
this._super(...arguments);
this.resizeHandler = () =>
debounce(this, this._scheduleChartRendering, 500);
Ember.run.debounce(this, this._scheduleChartRendering, 500);
},
didInsertElement() {
@@ -33,11 +31,11 @@ export default Component.extend({
didReceiveAttrs() {
this._super(...arguments);
debounce(this, this._scheduleChartRendering, 100);
Ember.run.debounce(this, this._scheduleChartRendering, 100);
},
_scheduleChartRendering() {
schedule("afterRender", () => {
Ember.run.schedule("afterRender", () => {
this._renderChart(
this.model,
this.element && this.element.querySelector(".chart-canvas")
app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6
+3 -5
View File
@@ -1,5 +1,3 @@
import { debounce } from "@ember/runloop";
import { schedule } from "@ember/runloop";
import Component from "@ember/component";
import { number } from "discourse/lib/formatter";
import loadScript from "discourse/lib/load-script";
@@ -11,7 +9,7 @@ export default Component.extend({
this._super(...arguments);
this.resizeHandler = () =>
debounce(this, this._scheduleChartRendering, 500);
Ember.run.debounce(this, this._scheduleChartRendering, 500);
},
didInsertElement() {
@@ -31,11 +29,11 @@ export default Component.extend({
didReceiveAttrs() {
this._super(...arguments);
debounce(this, this._scheduleChartRendering, 100);
Ember.run.debounce(this, this._scheduleChartRendering, 100);
},
_scheduleChartRendering() {
schedule("afterRender", () => {
Ember.run.schedule("afterRender", () => {
if (!this.element) {
return;
}
app/assets/javascripts/admin/components/admin-report.js.es6
+1 -2
View File
@@ -1,5 +1,4 @@
import EmberObject from "@ember/object";
import { next } from "@ember/runloop";
import Component from "@ember/component";
import ReportLoader from "discourse/lib/reports-loader";
import { exportEntity } from "discourse/lib/export-csv";
@@ -314,7 +313,7 @@ export default Component.extend({
this.setProperties({ isLoading: true, rateLimitationString: null });
next(() => {
Ember.run.next(() => {
let payload = this._buildPayload(["prev_period"]);
const callback = response => {
app/assets/javascripts/admin/components/admin-theme-editor.js.es6
+1 -2
View File
@@ -1,4 +1,3 @@
import { next } from "@ember/runloop";
import Component from "@ember/component";
import { default as computed } from "ember-addons/ember-computed-decorators";
import { fmt } from "discourse/lib/computed";
@@ -84,7 +83,7 @@ export default Component.extend({
toggleMaximize: function() {
this.toggleProperty("maximized");
next(() => this.appEvents.trigger("ace:resize"));
Ember.run.next(() => this.appEvents.trigger("ace:resize"));
},
onlyOverriddenChanged(value) {
app/assets/javascripts/admin/components/admin-user-field-item.js.es6
+1 -2
View File
@@ -1,4 +1,3 @@
import { scheduleOnce } from "@ember/runloop";
import Component from "@ember/component";
import UserField from "admin/models/user-field";
import { bufferedProperty } from "discourse/mixins/buffered-content";
@@ -29,7 +28,7 @@ export default Component.extend(bufferedProperty("userField"), {
@observes("editing")
_focusOnEdit() {
if (this.editing) {
scheduleOnce("afterRender", this, "_focusName");
Ember.run.scheduleOnce("afterRender", this, "_focusName");
}
},
app/assets/javascripts/admin/components/color-input.js.es6
+2 -3
View File
@@ -1,4 +1,3 @@
import { schedule } from "@ember/runloop";
import Component from "@ember/component";
import { default as loadScript, loadCSS } from "discourse/lib/load-script";
@@ -38,7 +37,7 @@ export default Component.extend({
didInsertElement() {
loadScript("/javascripts/spectrum.js").then(() => {
loadCSS("/javascripts/spectrum.css").then(() => {
schedule("afterRender", () => {
Ember.run.schedule("afterRender", () => {
$(this.element.querySelector(".picker"))
.spectrum({ color: "#" + this.hexValue })
.on("change.spectrum", (me, color) => {
@@ -48,7 +47,7 @@ export default Component.extend({
});
});
});
schedule("afterRender", () => {
Ember.run.schedule("afterRender", () => {
this.hexValueChanged();
});
}
app/assets/javascripts/admin/components/embeddable-host.js.es6
+1 -2
View File
@@ -1,4 +1,3 @@
import { schedule } from "@ember/runloop";
import Component from "@ember/component";
import { bufferedProperty } from "discourse/mixins/buffered-content";
import computed from "ember-addons/ember-computed-decorators";
@@ -15,7 +14,7 @@ export default Component.extend(bufferedProperty("host"), {
@on("didInsertElement")
@observes("editing")
_focusOnInput() {
schedule("afterRender", () => {
Ember.run.schedule("afterRender", () => {
this.element.querySelector(".host-name").focus();
});
},
app/assets/javascripts/admin/components/ip-lookup.js.es6
+1 -2
View File
@@ -1,5 +1,4 @@
import EmberObject from "@ember/object";
import { later } from "@ember/runloop";
import Component from "@ember/component";
import { default as computed } from "ember-addons/ember-computed-decorators";
import { ajax } from "discourse/lib/ajax";
@@ -79,7 +78,7 @@ export default Component.extend({
$(document.body).append($copyRange);
if (copyText(text, $copyRange[0])) {
this.set("copied", true);
later(() => this.set("copied", false), 2000);
Ember.run.later(() => this.set("copied", false), 2000);
}
$copyRange.remove();
},
app/assets/javascripts/admin/components/penalty-post-action.js.es6
+1 -2
View File
@@ -1,4 +1,3 @@
import { scheduleOnce } from "@ember/runloop";
import Component from "@ember/component";
import computed from "ember-addons/ember-computed-decorators";
@@ -24,7 +23,7 @@ export default Component.extend({
// If we switch to edit mode, jump to the edit textarea
if (postAction === "edit") {
scheduleOnce("afterRender", () => {
Ember.run.scheduleOnce("afterRender", () => {
let elem = this.element;
let body = elem.closest(".modal-body");
body.scrollTop(body.height());
app/assets/javascripts/admin/components/permalink-form.js.es6
+2 -3
View File
@@ -1,4 +1,3 @@
import { schedule } from "@ember/runloop";
import Component from "@ember/component";
import { default as computed } from "ember-addons/ember-computed-decorators";
import { fmt } from "discourse/lib/computed";
@@ -21,7 +20,7 @@ export default Component.extend({
},
focusPermalink() {
schedule("afterRender", () =>
Ember.run.schedule("afterRender", () =>
this.element.querySelector(".permalink-url").focus()
);
},
@@ -70,7 +69,7 @@ export default Component.extend({
didInsertElement() {
this._super(...arguments);
schedule("afterRender", () => {
Ember.run.schedule("afterRender", () => {
$(this.element.querySelector(".external-url")).keydown(e => {
// enter key
if (e.keyCode === 13) {
app/assets/javascripts/admin/components/resumable-upload.js.es6
+8 -8
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;
app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
+2 -3
View File
@@ -1,4 +1,3 @@
import { schedule } from "@ember/runloop";
import Component from "@ember/component";
/**
A form to create an IP address that will be blocked or whitelisted.
@@ -63,7 +62,7 @@ export default Component.extend({
.then(result => {
this.setProperties({ ip_address: "", formSubmitted: false });
this.action(ScreenedIpAddress.create(result.screened_ip_address));
schedule("afterRender", () =>
Ember.run.schedule("afterRender", () =>
this.element.querySelector(".ip-address-input").focus()
);
})
@@ -85,7 +84,7 @@ export default Component.extend({
@on("didInsertElement")
_init() {
schedule("afterRender", () => {
Ember.run.schedule("afterRender", () => {
$(this.element.querySelector(".ip-address-input")).keydown(e => {
if (e.keyCode === 13) {
this.send("submit");
app/assets/javascripts/admin/components/themes-list-item.js.es6
+1 -2
View File
@@ -1,4 +1,3 @@
import { schedule } from "@ember/runloop";
import Component from "@ember/component";
import {
default as computed,
@@ -34,7 +33,7 @@ export default Component.extend({
},
scheduleAnimation() {
schedule("afterRender", () => {
Ember.run.schedule("afterRender", () => {
this.animate(true);
});
},
app/assets/javascripts/admin/components/watched-word-form.js.es6
+2 -3
View File
@@ -1,4 +1,3 @@
import { schedule } from "@ember/runloop";
import Component from "@ember/component";
import WatchedWord from "admin/models/watched-word";
import {
@@ -65,7 +64,7 @@ export default Component.extend({
message: I18n.t("admin.watched_words.form.success")
});
this.action(WatchedWord.create(result));
schedule("afterRender", () =>
Ember.run.schedule("afterRender", () =>
this.element.querySelector(".watched-word-input").focus()
);
})
@@ -87,7 +86,7 @@ export default Component.extend({
@on("didInsertElement")
_init() {
schedule("afterRender", () => {
Ember.run.schedule("afterRender", () => {
$(this.element.querySelector(".watched-word-input")).keydown(e => {
if (e.keyCode === 13) {
this.send("submit");