hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

login redirects back

Browse Source
v1.18.x
Baris Usakli 12 years ago
parent 8f04a136c8
commit 83d5a84edd
6 changed files with 141 additions and 120 deletions
Show Stats Download Patch File Download Diff File

181
public/src/app.js
Unescape Escape View File

@ -7,7 +7,7 @@ var socket,
(function () { (function () {
var showWelcomeMessage = false; var showWelcomeMessage = false;
function loadConfig() { app.loadConfig = function() {
$.ajax({ $.ajax({
url: RELATIVE_PATH + '/api/config', url: RELATIVE_PATH + '/api/config',
@ -15,108 +15,114 @@ var socket,
API_URL = data.api_url; API_URL = data.api_url;
config = data; config = data;
socket = io.connect(config.socket.address); if(socket) {
socket.disconnect();
var reconnecting = false; socket.socket.connect();
var reconnectTries = 0; } else {
socket = io.connect(config.socket.address);
socket.on('event:connect', function (data) {
app.username = data.username; var reconnecting = false;
app.showLoginMessage(); var reconnectTries = 0;
});
socket.on('event:connect', function (data) {
app.username = data.username;
app.showLoginMessage();
socket.emit('api:updateHeader', {
fields: ['username', 'picture', 'userslug']
});
});
socket.on('event:alert', function (data) { socket.on('event:alert', function (data) {
app.alert(data); app.alert(data);
}); });
socket.on('connect', function (data) { socket.on('connect', function (data) {
if (reconnecting) { if (reconnecting) {
setTimeout(function () { setTimeout(function () {
app.alert({ app.alert({
alert_id: 'connection_alert', alert_id: 'connection_alert',
title: 'Connected', title: 'Connected',
message: 'Connection successful.', message: 'Connection successful.',
type: 'success', type: 'success',
timeout: 5000 timeout: 5000
});
}, 1000);
reconnecting = false;
reconnectTries = 0;
socket.emit('api:updateHeader', {
fields: ['username', 'picture', 'userslug']
}); });
}, 1000); }
reconnecting = false; });
reconnectTries = 0;
socket.emit('api:updateHeader', {
fields: ['username', 'picture', 'userslug']
});
}
});
socket.on('reconnecting', function (data) { socket.on('reconnecting', function (data) {
function showDisconnectModal() { function showDisconnectModal() {
$('#disconnect-modal').modal({ $('#disconnect-modal').modal({
backdrop: 'static', backdrop: 'static',
show: true show: true
}); });
$('#reload-button').on('click', function () { $('#reload-button').on('click', function () {
$('#disconnect-modal').modal('hide'); $('#disconnect-modal').modal('hide');
window.location.reload(); window.location.reload();
}); });
} }
reconnecting = true; reconnecting = true;
reconnectTries++; reconnectTries++;
if (reconnectTries > 4) { if (reconnectTries > 4) {
showDisconnectModal(); showDisconnectModal();
return; return;
} }
app.alert({ app.alert({
alert_id: 'connection_alert', alert_id: 'connection_alert',
title: 'Reconnecting', title: 'Reconnecting',
message: 'You have disconnected from NodeBB, we will try to reconnect you. <br/><i class="icon-refresh icon-spin"></i>', message: 'You have disconnected from NodeBB, we will try to reconnect you. <br/><i class="icon-refresh icon-spin"></i>',
type: 'warning', type: 'warning',
timeout: 5000 timeout: 5000
});
}); });
});
socket.on('api:user.get_online_users', function (users) { socket.on('api:user.get_online_users', function (users) {
jQuery('a.username-field').each(function () { jQuery('a.username-field').each(function () {
if (this.processed === true) if (this.processed === true)
return; return;
var el = jQuery(this), var el = jQuery(this),
uid = el.parents('li').attr('data-uid'); uid = el.parents('li').attr('data-uid');
if (uid && jQuery.inArray(uid, users) !== -1) { if (uid && jQuery.inArray(uid, users) !== -1) {
el.find('i').remove(); el.find('i').remove();
el.prepend('<i class="icon-circle"></i>'); el.prepend('<i class="icon-circle"></i>');
} else { } else {
el.find('i').remove(); el.find('i').remove();
el.prepend('<i class="icon-circle-blank"></i>'); el.prepend('<i class="icon-circle-blank"></i>');
} }
el.processed = true; el.processed = true;
}); });
jQuery('button .username-field').each(function () { jQuery('button .username-field').each(function () {
//DRY FAIL //DRY FAIL
if (this.processed === true) if (this.processed === true)
return; return;
var el = jQuery(this), var el = jQuery(this),
uid = el.parents('li').attr('data-uid'); uid = el.parents('li').attr('data-uid');
if (uid && jQuery.inArray(uid, users) !== -1) { if (uid && jQuery.inArray(uid, users) !== -1) {
el.parent().addClass('btn-success'); el.parent().addClass('btn-success');
} else { } else {
el.parent().addClass('btn-danger'); el.parent().addClass('btn-danger');
} }
el.processed = true; el.processed = true;
});
}); });
});
app.enter_room('global');
app.enter_room('global');
}
}, },
async: false async: false
}); });
@ -402,7 +408,8 @@ var socket,
function animateScroll() { function animateScroll() {
$('body,html').animate({ $('body,html').animate({
scrollTop: scrollTo.offset().top - container.offset().top + container.scrollTop() - $('#header-menu').height() scrollTop: scrollTo.offset().top - container.offset().top + container.scrollTop() - $('#header-menu').height()
}); }, 400);
//$('body,html').scrollTop(scrollTo.offset().top - container.offset().top + container.scrollTop() - $('#header-menu').height());
} }
if (!scrollTo.length && tid) { if (!scrollTo.length && tid) {
@ -437,6 +444,6 @@ var socket,
showWelcomeMessage = location.href.indexOf('loggedin') !== -1; showWelcomeMessage = location.href.indexOf('loggedin') !== -1;
loadConfig(); app.loadConfig();
}()); }());

1
public/src/forum/footer.js
Unescape Escape View File

@ -58,6 +58,7 @@
if (data['username']) if (data['username'])
userLabel.find('span').html(data['username']); userLabel.find('span').html(data['username']);
} else { } else {
rightMenu.empty();
var userli = $('<li> \ var userli = $('<li> \
<a id="user_label" href="/user/' + data['userslug'] + '"> \ <a id="user_label" href="/user/' + data['userslug'] + '"> \
<img src="' + data['picture'] + '"/> \ <img src="' + data['picture'] + '"/> \

7
public/src/forum/login.js
Unescape Escape View File

@ -32,7 +32,12 @@
$('#login-error-notify').show(); $('#login-error-notify').show();
} else { } else {
$('#login-error-notify').hide(); $('#login-error-notify').hide();
window.location.replace(RELATIVE_PATH + "/?loggedin"); //window.location.replace(RELATIVE_PATH + "/?loggedin");
history.go(-1);
//setTimeout(function(){
app.loadConfig();
//}, 500);
//socket.emit('api:updateHeader');
} }
}, },
error: function(data, textStatus, jqXHR) { error: function(data, textStatus, jqXHR) {

24
public/src/forum/topic.js
Unescape Escape View File

@ -215,21 +215,12 @@
}, false); }, false);
} }
$(window).off('scroll').on('scroll', function() { enableInfiniteLoading();
var bottom = ($(document).height() - $(window).height()) * 0.9;
if ($(window).scrollTop() > bottom && !app.infiniteLoaderActive && $('#post-container').children().length) {
app.loadMorePosts(tid);
}
});
var bookmark = localStorage.getItem('topic:' + tid + ':bookmark'); var bookmark = localStorage.getItem('topic:' + tid + ':bookmark');
if(bookmark) { if(bookmark) {
// need to find out why it doesnt work without setTimeout -baris app.scrollToPost(parseInt(bookmark, 10));
setTimeout(function() {
app.scrollToPost(parseInt(bookmark, 10));
}, 300);
} }
$('#post-container').on('click', '.deleted', function(ev) { $('#post-container').on('click', '.deleted', function(ev) {
@ -237,6 +228,17 @@
}); });
}); });
function enableInfiniteLoading() {
$(window).off('scroll').on('scroll', function() {
var bottom = ($(document).height() - $(window).height()) * 0.9;
if ($(window).scrollTop() > bottom && !app.infiniteLoaderActive && $('#post-container').children().length) {
app.loadMorePosts(tid);
console.log('window scrolling');
}
});
}
var reply_fn = function() { var reply_fn = function() {
var selectionText = '', var selectionText = '',
selection = window.getSelection() || document.getSelection(); selection = window.getSelection() || document.getSelection();

46
public/templates/category.tpl
Unescape Escape View File

@ -29,29 +29,35 @@
<div class="{topic_row_size}"> <div class="{topic_row_size}">
<ul id="topics-container"> <ul id="topics-container">
<!-- BEGIN topics --> <!-- BEGIN topics -->
<a href="../../topic/{topics.slug}#{topics.teaser_pid}"><li class="category-item {topics.deleted-class}">
<div class="row"> <li class="category-item {topics.deleted-class}">
<div class="col-md-12 topic-row"> <div class="row">
<div class="latest-post visible-lg visible-md"> <div class="col-md-12 topic-row">
<div class="pull-right"> <div class="latest-post visible-lg visible-md">
<img class="img-rounded" style="width: 48px; height: 48px; /*temporary*/" src="{topics.teaser_userpicture}" /> <a href="../../topic/{topics.slug}#{topics.teaser_pid}">
<p>{topics.teaser_text}</p> <div class="pull-right">
<p class="meta"> <img class="img-rounded" style="width: 48px; height: 48px; /*temporary*/" src="{topics.teaser_userpicture}" />
<strong>{topics.teaser_username}</strong> posted <span class="timeago" title="{topics.teaser_timestamp}"></span> <p>{topics.teaser_text}</p>
</p> <p class="meta">
<strong>{topics.teaser_username}</strong> posted <span class="timeago" title="{topics.teaser_timestamp}"></span>
</p>
</div>
</a>
</div> </div>
</div> <a href="../../topic/{topics.slug}">
<div> <div>
<h3><span class="topic-title"><span class="badge {topics.badgeclass}">{topics.postcount}</span>{topics.title}</span></h3> <h3><span class="topic-title"><span class="badge {topics.badgeclass}">{topics.postcount}</span>{topics.title}</span></h3>
<small> <small>
<strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong> <strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong>
Posted <span class="timeago" title="{topics.relativeTime}"></span> by Posted <span class="timeago" title="{topics.relativeTime}"></span> by
<strong>{topics.username}</strong>. <strong>{topics.username}</strong>.
</small> </small>
</div>
</a>
</div> </div>
</div> </div>
</div> </li>
</li></a>
<!-- END topics --> <!-- END topics -->
</ul> </ul>
</div> </div>

2
public/themes/vanilla/category.less
Unescape Escape View File

@ -7,7 +7,7 @@
padding-right: 30px; padding-right: 30px;
} }
a { ul {
li { li {
list-style: none; list-style: none;
padding-bottom: 10px; padding-bottom: 10px;

Write Preview
Loading…
Cancel
Save