Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-12 00:45:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-02-27 12:46:37 -05:00
parent 44d40fba35 2209a55afc
commit 30eb85f96e
34 changed files with 776 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
public/src/app.js
View File

@@ -1,10 +1,10 @@
var socket,
config,
app = {
"username": null,
"uid": null,
"isFocused": true,
"currentRoom": null
'username': null,
'uid': null,
'isFocused': true,
'currentRoom': null
};
(function () {
@@ -284,7 +284,7 @@ var socket,
app.populateOnlineUsers = function () {
var uids = [];
jQuery('.post-row').each(function () {
$('.post-row').each(function () {
var uid = $(this).attr('data-uid');
if(uids.indexOf(uid) === -1) {
uids.push(uid);
@@ -293,8 +293,8 @@ var socket,
socket.emit('user.getOnlineUsers', uids, function (err, users) {
jQuery('.username-field').each(function (index, element) {
var el = jQuery(this),
$('.username-field').each(function (index, element) {
var el = $(this),
uid = el.parents('li').attr('data-uid');
if (uid && users[uid]) {
@@ -314,19 +314,19 @@ var socket,
parts = path.split('/'),
active = parts[parts.length - 1];
jQuery('#main-nav li').removeClass('active');
$('#main-nav li').removeClass('active');
if (active) {
jQuery('#main-nav li a').each(function () {
var href = this.getAttribute('href');
$('#main-nav li a').each(function () {
var href = $(this).attr('href');
if (active == "sort-posts" || active == "sort-reputation" || active == "search" || active == "latest" || active == "online")
active = 'users';
if (href && href.match(active)) {
jQuery(this.parentNode).addClass('active');
$(this.parentNode).addClass('active');
return false;
}
});
}
};
}
app.createUserTooltips = function() {
$('img[title].teaser-pic,img[title].user-img').each(function() {
@@ -342,7 +342,7 @@ var socket,
selector:'.fa-circle.status',
placement: 'top'
});
}
};
app.makeNumbersHumanReadable = function(elements) {
elements.each(function() {
@@ -459,7 +459,7 @@ var socket,
}
previousScrollTop = currentScrollTop;
});
}
};
var titleObj = {
active: false,
@@ -596,7 +596,7 @@ var socket,
});
};
jQuery('document').ready(function () {
$('document').ready(function () {
$('#search-form').on('submit', function () {
var input = $(this).find('input');
ajaxify.go("search/" + input.val());