Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: replaces setTimeout by Ember.run.later (#6618)

This commit is contained in:
Joffrey JAFFEUX 2018-11-19 10:46:38 +01:00 committed by Régis Hanol
parent f2c227432c
commit 907cf3ee2f
8 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
View File

@ -40,7 +40,7 @@ export default Ember.Controller.extend({
); );
} }
setTimeout(() => { Ember.run.later(() => {
this.set("model.savingStatus", null); this.set("model.savingStatus", null);
}, 2000); }, 2000);

2
app/assets/javascripts/discourse/components/composer-editor.js.es6
View File

@ -786,7 +786,7 @@ export default Ember.Component.extend({
// The paste doesn't finish immediately and we don't have any onpaste // The paste doesn't finish immediately and we don't have any onpaste
// event, so wait for 100ms which _should_ be enough time. // event, so wait for 100ms which _should_ be enough time.
setTimeout(() => { Ember.run.later(() => {
const pastedImg = contentEditableDiv.find("img"); const pastedImg = contentEditableDiv.find("img");
if (pastedImg.length === 1) { if (pastedImg.length === 1) {

2
app/assets/javascripts/discourse/initializers/asset-version.js.es6
View File

@ -16,7 +16,7 @@ export default {
if (!timeoutIsSet && Discourse.get("requiresRefresh")) { if (!timeoutIsSet && Discourse.get("requiresRefresh")) {
// Since we can do this transparently for people browsing the forum // Since we can do this transparently for people browsing the forum
// hold back the message 24 hours. // hold back the message 24 hours.
setTimeout(function() { Ember.run.later(() => {
bootbox.confirm(I18n.lookup("assets_changed_confirm"), function( bootbox.confirm(I18n.lookup("assets_changed_confirm"), function(
result result
) { ) {

2
app/assets/javascripts/discourse/lib/click-track.js.es6
View File

@ -114,7 +114,7 @@ export default {
} }
// restore href // restore href
setTimeout(() => { Ember.run.later(() => {
$link.removeClass("no-href"); $link.removeClass("no-href");
$link.attr("href", $link.data("href")); $link.attr("href", $link.data("href"));
$link.data("href", null); $link.data("href", null);

4
app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
View File

@ -79,7 +79,7 @@ function confirmNotification() {
const clickEventHandler = () => notification.close(); const clickEventHandler = () => notification.close();
notification.addEventListener("click", clickEventHandler); notification.addEventListener("click", clickEventHandler);
setTimeout(() => { Ember.run.later(() => {
notification.close(); notification.close();
notification.removeEventListener("click", clickEventHandler); notification.removeEventListener("click", clickEventHandler);
}, 10 * 1000); }, 10 * 1000);
@ -177,7 +177,7 @@ function onNotification(data) {
} }
notification.addEventListener("click", clickEventHandler); notification.addEventListener("click", clickEventHandler);
setTimeout(function() { Ember.run.later(() => {
notification.close(); notification.close();
notification.removeEventListener("click", clickEventHandler); notification.removeEventListener("click", clickEventHandler);
}, 10 * 1000); }, 10 * 1000);

4
app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
View File

@ -130,9 +130,7 @@ export default {
quoteReply() { quoteReply() {
this.sendToSelectedPost("replyToPost"); this.sendToSelectedPost("replyToPost");
// lazy but should work for now // lazy but should work for now
setTimeout(function() { Ember.run.later(() => $(".d-editor .quote").click(), 500);
$(".d-editor .quote").click();
}, 500);
}, },
goToFirstPost() { goToFirstPost() {

4
app/assets/javascripts/discourse/lib/safari-hacks.js.es6
View File

@ -86,9 +86,7 @@ function positioningWorkaround($fixedElement) {
fixedElement.style.top = ""; fixedElement.style.top = "";
fixedElement.style.height = oldHeight; fixedElement.style.height = oldHeight;
setTimeout(() => { Ember.run.later(() => $(fixedElement).removeClass("no-transition"), 500);
$(fixedElement).removeClass("no-transition");
}, 500);
$(window).scrollTop(originalScrollTop); $(window).scrollTop(originalScrollTop);

2
app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
View File

@ -395,7 +395,7 @@ export default createWidget("topic-timeline", {
const stream = this.attrs.topic.get("postStream"); const stream = this.attrs.topic.get("postStream");
// a little debounce to avoid flashing // a little debounce to avoid flashing
setTimeout(() => { Ember.run.later(() => {
if (!this.state.position === pos) { if (!this.state.position === pos) {
return; return;
} }