watch clock.tick in template

misago/emberapp/app/components/ban-expires.js

@@ -4,17 +4,13 @@ export default Ember.Component.extend({
   tagName: 'p',
   isPermanent: Ember.computed.empty('model.expires_on'),
 
-  expiresMoment: function() {
+  expiresOn: function() {
     if (!this.get('isPermanent')) {
-      return moment.utc(this.get('model.expires_on'));
+      return moment(this.get('model.expires_on'));
     } else {
       return null;
     }
-  }.property('isPermanent'),
-
-  expiresOn: function() {
-    return this.get('expiresMoment');
-  }.property('expiresMoment', 'clock.tick'),
+  }.property('isPermanent', 'model.expires_on'),
 
   isExpired: function() {
     if (this.get('expiresOn')) {

misago/emberapp/app/templates/components/ban-expires.hbs

@@ -1,7 +1,7 @@
 {{#if isPermanent}}
 {{gettext "This ban is permanent."}}
 {{else if isExpired}}
-{{gettext "This ban expired %(expires)s. Please try again." expires=(from-now expiresOn)}}
+{{gettext "This ban expired %(expires)s. Please try again." expires=(from-now expiresOn tick=clock.tick)}}
 {{else}}
-{{gettext "This ban expires %(expires)s." expires=(from-now expiresOn)}}
+{{gettext "This ban expires %(expires)s." expires=(from-now expiresOn tick=clock.tick)}}
 {{/if}}

misago/emberapp/tests/unit/components/ban-expires-test.js

@@ -24,18 +24,6 @@ test('isPermanent works', function(assert) {
   assert.ok(!component.get('isPermanent'));
 });
 
-test('expiresMoment works', function(assert) {
-  assert.expect(2);
-
-  var component = this.subject();
-
-  component.set('model', {'expires_on': null});
-  assert.equal(component.get('expiresMoment'), null);
-
-  component.set('model', {'expires_on': '2015-07-30T12:15:00Z'});
-  assert.ok(component.get('expiresMoment').fromNow);
-});
-
 test('expiresOn works', function(assert) {
   assert.expect(2);