Merge branch 'v3'

This commit is contained in:
Zixaphir 2014-03-08 16:45:24 -07:00
commit ceb8c93b08
3 changed files with 16 additions and 0 deletions

View File

@ -16375,6 +16375,11 @@
return;
}
if (this.pathname === Navigate.path) {
if (g.VIEW === 'thread') {
ThreadUpdater.update();
} else {
Index.update();
}
e.preventDefault();
return;
}

View File

@ -16395,6 +16395,11 @@
return;
}
if (this.pathname === Navigate.path) {
if (g.VIEW === 'thread') {
ThreadUpdater.update();
} else {
Index.update();
}
e.preventDefault();
return;
}

View File

@ -153,7 +153,13 @@ Navigate =
navigate: (e) ->
return if @hostname isnt 'boards.4chan.org' or window.location.hostname is 'rs.4chan.org'
return if e and (e.shiftKey or e.ctrlKey or (e.type is 'click' and e.button isnt 0)) # Not simply a left click
if @pathname is Navigate.path
if g.VIEW is 'thread'
ThreadUpdater.update()
else
Index.update()
e.preventDefault()
return