diff --git a/public/css/style.less b/public/css/style.less index 9de2532e5e..4f2c7f3125 100644 --- a/public/css/style.less +++ b/public/css/style.less @@ -205,8 +205,8 @@ footer.footer { .latest-post { float: right; padding-top: 2px; - margin-right: 30px; - width: 50%; + margin-right: 0px; + width: 40%; .pull-right { width: 100%; diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 2361b0c0bd..94074c825f 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -21,12 +21,11 @@ var ajaxify = {}; window.onpopstate = function(event) { + // "quiet": If set to true, will not call pushState if (event !== null && event.state && event.state.url !== undefined) ajaxify.go(event.state.url, null, null, true); }; ajaxify.go = function(url, callback, template, quiet) { - // "quiet": If set to true, will not call pushState - // leave room and join global app.enter_room('global'); @@ -61,9 +60,6 @@ var ajaxify = {}; jQuery('#content, #footer').fadeIn(200); }, url, template); - return true; - } else { - document.location.href = url; return true; } @@ -71,26 +67,20 @@ var ajaxify = {}; } ajaxify.enable = function() { - $('a').unbind('mouseup', ajaxify.onmouseup).bind('mouseup', ajaxify.onmouseup); $('a').unbind('click', ajaxify.onclick).bind('click', ajaxify.onclick); } - ajaxify.onmouseup = function(ev) { + ajaxify.onclick = function(ev) { if (this.href == window.location.href + "#") return; var url = this.href.replace(rootUrl +'/', ''); if (!ev.ctrlKey && ev.which === 1) { - if (ajaxify.go(url)) ev.preventDefault(); - } else if ((ev.ctrlKey && ev.which === 1) || ev.which === 2) { - window.open(this.href, '_blank'); - ev.preventDefault(); + if (ajaxify.go(url)) { + ev.preventDefault(); + } } } - ajaxify.onclick = function(ev) { - ev.preventDefault(); - } - $('document').ready(function() { if (!window.history || !window.history.pushState) return; // no ajaxification for old browsers diff --git a/public/templates/header.tpl b/public/templates/header.tpl index 252611a734..cf4984bdbf 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -7,7 +7,7 @@ - + diff --git a/public/vendor/bootstrap/js/bootstrap.js b/public/vendor/bootstrap/js/bootstrap.js index c298ee42e3..f6a61079df 100644 --- a/public/vendor/bootstrap/js/bootstrap.js +++ b/public/vendor/bootstrap/js/bootstrap.js @@ -788,7 +788,7 @@ /* APPLY TO STANDARD DROPDOWN ELEMENTS * =================================== */ - $(document) + $('.dropdown') .on('click.dropdown.data-api', clearMenus) .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) .on('click.dropdown-menu', function (e) { e.stopPropagation() })