mirror of
https://github.com/flarum/core.git
synced 2025-07-30 21:20:24 +02:00
Upgrade to Ember 1.11-beta.1
HTMLBars goodness! Since there was some breakage and a lot of fiddling around to get some things working, I took this opportunity to do a big cleanup of the whole Ember app. I accidentally worked on some new features too :3 Note that the app is still broken right now, pending on https://github.com/emberjs/ember.js/issues/10401 Cleanup: - Restructuring of components - Consolidation of some stuff into mixins, cleanup of some APIs that will be public - Change all instances of .property() / .observes() / .on() to Ember.computed() / Ember.observer() / Ember.on() respectively (I think it is more readable) - More comments - Start conforming to a code style (2 spaces for indentation) New features: - Post hiding/restoring - Mark individual discussions as read by clicking - Clicking on a read discussion jumps to the end - Mark all discussions as read - Progressively mark the discussion as read as the page is scrolled - Unordered list post formatting - Post permalink popup Demo once that Ember regression is fixed!
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import Ember from 'ember';
|
||||
|
||||
import humanTime from '../utils/human-time';
|
||||
import humanTime from 'flarum/utils/human-time';
|
||||
|
||||
var $ = Ember.$;
|
||||
|
||||
@@ -28,7 +28,7 @@ export default {
|
||||
.removeData('livestamp');
|
||||
|
||||
timestamp = moment(timestamp);
|
||||
if (timestamp.diff(moment()) < 60 * 60) {
|
||||
if (timestamp.diff(moment(new Date())) < 60 * 60) {
|
||||
return;
|
||||
}
|
||||
if (moment.isMoment(timestamp) && !isNaN(+timestamp)) {
|
||||
@@ -144,4 +144,4 @@ export default {
|
||||
})(jQuery, moment);
|
||||
|
||||
}
|
||||
};
|
||||
};
|
||||
|
Reference in New Issue
Block a user