github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-01 16:43:27 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Small fixes to enable better testing of components

Browse Source
This commit is contained in:
Robin Ward 2017-09-13 10:33:21 -04:00
parent 28148197d6
commit e5db126a8e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
View File

@ -15,7 +15,7 @@ export default Ember.Component.extend({
@computed
showAdminButton() {
return !this.site.mobileView && this.currentUser.get('canManageTopic');
return !this.site.mobileView && this.currentUser && this.currentUser.get('canManageTopic');
},
@computed('topic.message_archived')

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

@ -4,7 +4,7 @@ import Category from 'discourse/models/category';
export default Ember.Component.extend(bufferedRender({
classNames: ['topic-status-info'],
delayedRerender: null,
_delayedRerender: null,
rerenderTriggers: [
'statusType',
@ -58,12 +58,14 @@ export default Ember.Component.extend(bufferedRender({
buffer.push('</h3>');
// TODO Sam: concerned this can cause a heavy rerender loop
this.set('delayedRerender', Em.run.later(this, this.rerender, rerenderDelay));
if (!Ember.testing) {
this._delayedRerender = Ember.run.later(this, this.rerender, rerenderDelay);
}
},
willDestroyElement() {
if( this.delayedRerender ) {
Em.run.cancel(this.get('delayedRerender'));
if (this._delayedRerender) {
Em.run.cancel(this._delayedRerender);
}
},