github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 09:13:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: remove topic timer info on completion

Browse Source
This commit is contained in:
Arpit Jalan 2019-06-13 16:17:37 +05:30
parent fbbce235ce
commit efc05e7224
1 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
app/assets/javascripts/discourse/components/topic-timer-info.js.es6
View File

@ -23,60 +23,59 @@ export default Ember.Component.extend(
const topicStatusKnown = this.topicClosed !== undefined;
if (topicStatusKnown && topicStatus === this.statusType) return;
let statusUpdateAt = moment(this.executeAt);
const statusUpdateAt = moment(this.executeAt);
const duration = moment.duration(statusUpdateAt - moment());
const minutesLeft = duration.asMinutes();
let duration = moment.duration(statusUpdateAt - moment());
let minutesLeft = duration.asMinutes();
let rerenderDelay = 1000;
if (minutesLeft > 0) {
let rerenderDelay = 1000;
if (minutesLeft > 2160) {
rerenderDelay = 12 * 60 * 60000;
} else if (minutesLeft > 1410) {
rerenderDelay = 60 * 60000;
} else if (minutesLeft > 90) {
rerenderDelay = 30 * 60000;
} else if (minutesLeft > 2) {
rerenderDelay = 60000;
}
let autoCloseHours = this.duration || 0;
if (minutesLeft > 2160) {
rerenderDelay = 12 * 60 * 60000;
} else if (minutesLeft > 1410) {
rerenderDelay = 60 * 60000;
} else if (minutesLeft > 90) {
rerenderDelay = 30 * 60000;
} else if (minutesLeft > 2) {
rerenderDelay = 60000;
}
buffer.push(`<h3>${iconHTML("far-clock")} `);
let autoCloseHours = this.duration || 0;
let options = {
timeLeft: duration.humanize(true),
duration: moment.duration(autoCloseHours, "hours").humanize()
};
buffer.push(`<h3>${iconHTML("far-clock")} `);
const categoryId = this.categoryId;
if (categoryId) {
const category = Category.findById(categoryId);
let options = {
timeLeft: duration.humanize(true),
duration: moment.duration(autoCloseHours, "hours").humanize()
};
options = Object.assign(
{
categoryName: category.get("slug"),
categoryUrl: category.get("url")
},
options
);
}
const categoryId = this.categoryId;
if (categoryId) {
const category = Category.findById(categoryId);
options = Object.assign(
{
categoryName: category.get("slug"),
categoryUrl: category.get("url")
},
options
buffer.push(
`<span title="${moment(this.executeAt).format("LLLL")}">${I18n.t(
this._noticeKey(),
options
)}</span>`
);
}
buffer.push("</h3>");
buffer.push(
`<span title="${moment(this.executeAt).format("LLLL")}">${I18n.t(
this._noticeKey(),
options
)}</span>`
);
buffer.push("</h3>");
// TODO Sam: concerned this can cause a heavy rerender loop
if (!Ember.testing) {
this._delayedRerender = Ember.run.later(
this,
this.rerender,
rerenderDelay
);
// TODO Sam: concerned this can cause a heavy rerender loop
if (!Ember.testing) {
this._delayedRerender = Ember.run.later(
this,
this.rerender,
rerenderDelay
);
}
}
},