Merge remote-tracking branch 'origin' into thread_options

added some styling and elements to thread deletion

Conflicts:
	public/src/ajaxify.js
This commit is contained in:
Julian Lam
2013-05-07 13:24:19 -04:00
7 changed files with 26 additions and 5 deletions

View File

@@ -21,10 +21,12 @@ var ajaxify = {};
window.onpopstate = function(event) {
ajaxify.go(document.location.href.replace(rootUrl +'/', ''));
// this breaks reloading and results in ajaxify.go calling twice, believe it messes around with sockets. ill come back for you later bitchez
// ajaxify.go(document.location.href.replace(rootUrl +'/', ''));
};
ajaxify.go = function(url, callback) {
// leave room and join global
app.enter_room('global');