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

fix autoclose to work with jquery 1.9 and moment js

This commit is contained in:
Sam 2013-06-13 12:03:44 +10:00
parent e6e81efe85
commit 28853177fd
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/edit_topic_auto_close_controller.js
View File

@ -33,7 +33,7 @@ Discourse.EditTopicAutoCloseController = Discourse.ObjectController.extend(Disco
Discourse.ajax({
url: '/t/' + this.get('id') + '/autoclose',
type: 'PUT',
dataType: 'json',
dataType: 'html', // no custom errors, jquery 1.9 enforces json
data: { auto_close_days: days > 0 ? days : null }
}).then(function(){
editTopicAutoCloseController.set('auto_close_at', moment().add('days', days).format());

33
app/assets/javascripts/discourse/views/topic_closing_view.js
View File

@ -18,40 +18,43 @@ Discourse.TopicClosingView = Discourse.View.extend({
render: function(buffer) {
if (!this.present('topic.auto_close_at')) return;
var autoCloseAt = new Date(this.get('topic.auto_close_at'));
var autoCloseAt = moment(this.get('topic.auto_close_at'));
if (autoCloseAt.isPast()) return;
if (autoCloseAt < new Date()) return;
var timeLeftString, reRenderDelay, minutesLeft = autoCloseAt.minutesSince();
var duration = moment.duration(autoCloseAt - moment());
if (minutesLeft > 1440) {
timeLeftString = Em.String.i18n('in_n_days', {count: autoCloseAt.daysSince()});
var timeLeftString, rerenderDelay, minutesLeft = duration.asMinutes();
if (minutesLeft > 1410) {
timeLeftString = Em.String.i18n('in_n_days', {count: Math.round(duration.asDays())});
if( minutesLeft > 2160 ) {
reRenderDelay = 12 * 60 * 60000;
rerenderDelay = 12 * 60 * 60000;
} else {
reRenderDelay = 60 * 60000;
rerenderDelay = 60 * 60000;
}
} else if (minutesLeft > 90) {
timeLeftString = Em.String.i18n('in_n_hours', {count: autoCloseAt.hoursSince()});
reRenderDelay = 30 * 60000;
timeLeftString = Em.String.i18n('in_n_hours', {count: Math.round(duration.asHours())});
rerenderDelay = 30 * 60000;
} else if (minutesLeft > 2) {
timeLeftString = Em.String.i18n('in_n_minutes', {count: autoCloseAt.minutesSince()});
reRenderDelay = 60000;
timeLeftString = Em.String.i18n('in_n_minutes', {count: Math.round(duration.asMinutes())});
rerenderDelay = 60000;
} else {
timeLeftString = Em.String.i18n('in_n_seconds', {count: autoCloseAt.secondsSince()});
reRenderDelay = 1000;
timeLeftString = Em.String.i18n('in_n_seconds', {count: Math.round(duration.asSeconds())});
rerenderDelay = 1000;
}
buffer.push('<h3><i class="icon icon-time"></i> ');
buffer.push( Em.String.i18n('topic.auto_close_notice', {timeLeft: timeLeftString}) );
buffer.push('</h3>');
this.delayedRerender = this.rerender.bind(this).delay(reRenderDelay);
// TODO Sam: concerned this can cause a heavy rerender loop
this.delayedRerender = Em.run.later(this, this.rerender, rerenderDelay);
},
willDestroyElement: function() {
if( this.delayedRerender ) {
this.delayedRerender.cancel();
Em.run.cancel(this.delayedRerender)
}
}
});