Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-13 20:23:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into sortable-menu

Browse Source
This commit is contained in:
psychobunny
2015-02-25 13:56:57 -05:00
parent 6cea047518 29873f1c5c
commit 40008a9e85
8 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/modules/composer/resize.js
View File

@@ -25,7 +25,7 @@ define('composer/resize', function() {
}
}
if (env === 'sm' || env === 'xs') {
if (env === 'sm' || env === 'xs' || window.innerHeight < 480) {
app.toggleNavbar(false);
postContainer.css('height', $(window).height());
}

4
public/src/modules/notifications.js
View File

@@ -22,7 +22,9 @@ define('notifications', ['sounds'], function(sound) {
return app.alertError(err.message);
}
var notifs = data.unread.concat(data.read);
var notifs = data.unread.concat(data.read).sort(function(a, b) {
return parseInt(a.datetime, 10) > parseInt(b.datetime, 10) ? -1 : 1;
});
translator.toggleTimeagoShorthand();
for(var i=0; i<notifs.length; ++i) {