diff options
| author | czaks <marcin@6irc.net> | 2014-09-26 14:08:40 +0200 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2014-09-26 14:08:40 +0200 |
| commit | b4b99cd9369c6418534536c5eb5b7b127ab55dfa (patch) | |
| tree | c6d651753c0461ba2eaa04c34f633b82e148c2f2 /js/catalog-link.js | |
| parent | 359c295ecaf079318d55b1acc6e900ee74feb6d3 (diff) | |
| parent | bfb85fc2b19bcc895bd0034d0d7a9d7b64f481f4 (diff) | |
Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts:
stylesheets/style.css
Diffstat (limited to 'js/catalog-link.js')
| -rw-r--r-- | js/catalog-link.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/catalog-link.js b/js/catalog-link.js index 899e6859..5c5d9b13 100644 --- a/js/catalog-link.js +++ b/js/catalog-link.js @@ -16,11 +16,11 @@ function catalog() { var board = $("input[name='board']"); if (board.length>0) { -if (window.location.href.indexOf("/res/")==-1){ //if we are inside a thread -var catalog_url = 'catalog.html'; +if (window.location.pathname.indexOf("/res/")>0){ //if we are inside a thread +var catalog_url = '../catalog.html'; } else { -var catalog_url = '../catalog.html'; +var catalog_url = 'catalog.html'; } var pages = document.getElementsByClassName('pages')[0]; var bottom = document.getElementsByClassName('boardlist bottom')[0] |