Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-05 22:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

closes #1642

Browse Source
This commit is contained in:
psychobunny
2015-03-09 12:30:16 -04:00
parent 4360069859
commit e47c375e69
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/src/ajaxify.js
View File

@@ -10,13 +10,15 @@ $(document).ready(function() {
rootUrl = location.protocol + '//' + (location.hostname || location.host) + (location.port ? ':' + location.port : ''),
apiXHR = null;
window.onpopstate = function (event) {
if (event !== null && event.state && event.state.url !== undefined) {
ajaxify.go(event.state.url, function() {
$(window).trigger('action:popstate', {url: event.state.url});
$(window).on('popstate', function (ev) {
ev = ev.originalEvent;
if (ev !== null && ev.state && ev.state.url !== undefined) {
ajaxify.go(ev.state.url, function() {
$(window).trigger('action:popstate', {url: ev.state.url});
}, true);
}
};
});
ajaxify.currentPage = null;

7
public/src/modules/composer.js
View File

@@ -22,7 +22,7 @@ define('composer', [
$(window).off('resize', onWindowResize).on('resize', onWindowResize);
$(window).on('action:popstate', function(ev, data) {
$(window).on('popstate', function(ev, data) {
var env = utils.findBootstrapEnvironment();
if (composer.active && (env === 'xs' || env ==='sm')) {
@@ -95,6 +95,11 @@ define('composer', [
composer.posts[uuid] = post;
composer.load(uuid);
var env = utils.findBootstrapEnvironment();
if (env === 'xs' || env ==='sm') {
history.pushState({}, '', '#compose');
}
}
function composerAlert(message) {