harmacist/vichan
1
0
Fork 0
forked from GithubBackups/vichan
Code Pull Requests Activity

Merge pull request #77 from Zaphkiel/master

Browse Source 
Misc js fixes
This commit is contained in:
Marcin Łabanowski 2014-09-26 13:09:26 +02:00
commit 9b3c6ab537
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/catalog-link.js
View File

@ -16,11 +16,11 @@ function catalog() {
var board = $("input[name='board']"); var board = $("input[name='board']");
if (board.length>0) { if (board.length>0) {
if (window.location.href.indexOf("/res/")==-1){ //if we are inside a thread if (window.location.pathname.indexOf("/res/")>0){ //if we are inside a thread
var catalog_url = 'catalog.html'; var catalog_url = '../catalog.html';
} }
else { else {
var catalog_url = '../catalog.html'; var catalog_url = 'catalog.html';
} }
var pages = document.getElementsByClassName('pages')[0]; var pages = document.getElementsByClassName('pages')[0];
var bottom = document.getElementsByClassName('boardlist bottom')[0] var bottom = document.getElementsByClassName('boardlist bottom')[0]

7
js/no-animated-gif.js
View File

@ -13,6 +13,9 @@
*/ */
function unanimate_gif(e) { function unanimate_gif(e) {
if (active_page === "catalog")
var c = $('<canvas class="thread-image"></canvas>');
else
var c = $('<canvas class="post-image"></canvas>'); var c = $('<canvas class="post-image"></canvas>');
$(e).parent().prepend(c); $(e).parent().prepend(c);
c.attr('width', $(e).width()); c.attr('width', $(e).width());
@ -32,7 +35,7 @@ function unanimate_gif(e) {
} }
function no_animated_gif() { function no_animated_gif() {
var anim_gifs = $('img.post-image[src$=".gif"]'); var anim_gifs = $('img.post-image[src$=".gif"], img.thread-image[src$=".gif"]');
localStorage.no_animated_gif = true; localStorage.no_animated_gif = true;
$('#no-animated-gif>a').text(_('Animate GIFs')); $('#no-animated-gif>a').text(_('Animate GIFs'));
$('#no-animated-gif>input').prop('checked', true); $('#no-animated-gif>input').prop('checked', true);
@ -48,7 +51,7 @@ function animated_gif() {
$('#no-animated-gif>input').prop('checked', false); $('#no-animated-gif>input').prop('checked', false);
} }
if (active_page == 'thread' || active_page == 'index' || active_page == 'ukko') { if (active_page == 'thread' || active_page == 'index' || active_page == 'ukko' || active_page == 'catalog') {
$(function(){ $(function(){
var selector, event; var selector, event;
if (window.Options && Options.get_tab('general')) { if (window.Options && Options.get_tab('general')) {