Bad state-tracking fail
This commit is contained in:
Zixaphir 2014-07-27 12:51:03 -07:00
parent bf8fedb659
commit e6071fe834
4 changed files with 20 additions and 28 deletions

View File

@ -1,5 +1,5 @@
/*
* appchan x - Version 2.9.31 - 2014-07-26
* appchan x - Version 2.9.31 - 2014-07-27
*
* Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE

View File

@ -25,7 +25,7 @@
// ==/UserScript==
/*
* appchan x - Version 2.9.31 - 2014-07-26
* appchan x - Version 2.9.31 - 2014-07-27
*
* Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -16774,8 +16774,9 @@
}
Navigate.makeBreadCrumb(this.href, view, boardID, threadID);
if (this.id !== 'popState') {
Navigate.pushState(path);
history.pushState(null, '', path);
}
Navigate.path = window.location;
Navigate.setMode(this);
if (!(view === 'index' && 'index' === g.VIEW && boardID === g.BOARD.ID)) {
Navigate.disconnect();
@ -16854,12 +16855,12 @@
}
},
parse: function(data) {
var OP, board, errors, i, makePost, obj, post, posts, thread, threadRoot;
var board, errors, i, makePost, obj, post, posts, thread, threadRoot;
posts = [];
errors = null;
board = g.BOARD;
threadRoot = Build.thread(board, OP = data[0], true);
thread = new Thread(OP.no, board);
threadRoot = Build.thread(board, data[0], true);
thread = new Thread(data[0].no, board);
makePost = function(postNode) {
var err;
try {
@ -16899,10 +16900,6 @@
return Main.handleErrors(errors);
}
},
pushState: function(path) {
history.pushState(null, '', path);
return Navigate.path = window.location.pathname;
},
popstate: function() {
var a;
a = $.el('a', {

View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript
/*
* appchan x - Version 2.9.31 - 2014-07-26
* appchan x - Version 2.9.31 - 2014-07-27
*
* Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -16793,8 +16793,9 @@
}
Navigate.makeBreadCrumb(this.href, view, boardID, threadID);
if (this.id !== 'popState') {
Navigate.pushState(path);
history.pushState(null, '', path);
}
Navigate.path = window.location;
Navigate.setMode(this);
if (!(view === 'index' && 'index' === g.VIEW && boardID === g.BOARD.ID)) {
Navigate.disconnect();
@ -16873,12 +16874,12 @@
}
},
parse: function(data) {
var OP, board, errors, i, makePost, obj, post, posts, thread, threadRoot;
var board, errors, i, makePost, obj, post, posts, thread, threadRoot;
posts = [];
errors = null;
board = g.BOARD;
threadRoot = Build.thread(board, OP = data[0], true);
thread = new Thread(OP.no, board);
threadRoot = Build.thread(board, data[0], true);
thread = new Thread(data[0].no, board);
makePost = function(postNode) {
var err;
try {
@ -16918,10 +16919,6 @@
return Main.handleErrors(errors);
}
},
pushState: function(path) {
history.pushState(null, '', path);
return Navigate.path = window.location.pathname;
},
popstate: function() {
var a;
a = $.el('a', {

View File

@ -5,7 +5,7 @@ Navigate =
<% if (type === 'crx') { %>
# blink/webkit throw a popstate on page load. Not what we want.
popstateHack = ->
popstateHack = ->
$.off window, 'popstate', popstateHack
$.on window, 'popstate', Navigate.popstate
@ -189,7 +189,7 @@ Navigate =
$.set 'Index Sort', Conf['Index Sort'] = Index.selectSort.value = indexSort
Index.cb.sort()
result = true
return result
navigate: (e) ->
@ -234,7 +234,9 @@ Navigate =
Navigate.makeBreadCrumb @href, view, boardID, threadID
Navigate.pushState path unless @id is 'popState'
history.pushState null, '', path unless @id is 'popState'
Navigate.path = window.location
Navigate.setMode @
@ -309,8 +311,8 @@ Navigate =
posts = []
errors = null
board = g.BOARD
threadRoot = Build.thread board, OP = data[0], true
thread = new Thread OP.no, board
threadRoot = Build.thread board, data[0], true
thread = new Thread data[0].no, board
makePost = (postNode) ->
try
@ -346,10 +348,6 @@ Navigate =
Main.handleErrors errors if errors
pushState: (path) ->
history.pushState null, '', path
Navigate.path = window.location.pathname
popstate: ->
a = $.el 'a',
href: window.location