kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Allow hide-images.js, toggle-images.js and inline-expanding.js to work together

Browse Source
This commit is contained in:
Michael Foster 2013-07-27 00:14:43 -04:00
parent a11c8981fe
commit c0a45ba123
3 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/hide-images.js
View File

@ -53,7 +53,7 @@ $(document).ready(function(){
hidden_data[board][id] = Math.round(Date.now() / 1000); hidden_data[board][id] = Math.round(Date.now() / 1000);
store_data(); store_data();
var show_link = $('<a href="javascript:void(0)">show</a>').click(function() { var show_link = $('<a class="show-image-link" href="javascript:void(0)">show</a>').click(function() {
delete hidden_data[board][id]; delete hidden_data[board][id];
store_data(); store_data();
@ -66,6 +66,9 @@ $(document).ready(function(){
$(this).hide().after(show_link); $(this).hide().after(show_link);
if ($(img).parent()[0].dataset.expanded == 'true') {
$(img).parent().click();
}
$(img) $(img)
.data('orig', img.src) .data('orig', img.src)
.attr('src', 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==') .attr('src', 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==')

33
js/inline-expanding.js
View File

@ -3,7 +3,7 @@
* https://github.com/savetheinternet/Tinyboard/blob/master/js/inline-expanding.js * https://github.com/savetheinternet/Tinyboard/blob/master/js/inline-expanding.js
* *
* Released under the MIT license * Released under the MIT license
* Copyright (c) 2012 Michael Save <savetheinternet@tinyboard.org> * Copyright (c) 2012-2013 Michael Save <savetheinternet@tinyboard.org>
* *
* Usage: * Usage:
* $config['additional_javascript'][] = 'js/inline-expanding.js'; * $config['additional_javascript'][] = 'js/inline-expanding.js';
@ -13,30 +13,37 @@
onready(function(){ onready(function(){
var link = document.getElementsByTagName('a'); var link = document.getElementsByTagName('a');
for(var i = 0; i < link.length; i++) { for (var i = 0; i < link.length; i++) {
if(typeof link[i] == "object" && link[i].childNodes[0].src && link[i].className != 'file') { if (typeof link[i] == "object" && link[i].childNodes && link[i].childNodes[0].src && link[i].className != 'file') {
link[i].childNodes[0].style.maxWidth = '95%'; link[i].childNodes[0].style.maxWidth = '95%';
link[i].childNodes[0].style.maxHeight = '95%'; link[i].childNodes[0].style.maxHeight = '95%';
link[i].onclick = function(e) { link[i].onclick = function(e) {
if(e.which == 2) { if (this.childNodes[0].className == 'hidden')
return false;
if (e.which == 2)
return true; return true;
} if (!this.dataset.src) {
if(!this.tag) { this.dataset.expanded = 'true';
this.tag = this.childNodes[0].src; this.dataset.src= this.childNodes[0].src;
this.dataset.width = this.childNodes[0].style.width;
this.dataset.height = this.childNodes[0].style.height;
this.childNodes[0].src = this.href; this.childNodes[0].src = this.href;
this.childNodes[0].style.width = 'auto'; this.childNodes[0].style.width = 'auto';
this.childNodes[0].style.height = 'auto'; this.childNodes[0].style.height = 'auto';
this.childNodes[0].style.opacity = '0.4'; this.childNodes[0].style.opacity = '0.4';
this.childNodes[0].style.filter = 'alpha(opacity=40)'; this.childNodes[0].style.filter = 'alpha(opacity=40)';
this.childNodes[0].onload = function() { this.childNodes[0].onload = function() {
this.style.opacity = '1'; this.style.opacity = '';
this.style.filter = ''; delete this.style.filter;
} }
} else { } else {
this.childNodes[0].src = this.tag; this.childNodes[0].src = this.dataset.src;
this.childNodes[0].style.width = 'auto'; this.childNodes[0].style.width = this.dataset.width;
this.childNodes[0].style.height = 'auto'; this.childNodes[0].style.height = this.dataset.height;
this.tag = ''; delete this.dataset.expanded;
delete this.dataset.src;
delete this.childNodes[0].style.opacity;
delete this.childNodes[0].style.filter;
} }
return false; return false;
} }

27
js/toggle-images.js
View File

@ -16,6 +16,9 @@ $(document).ready(function(){
$('<style type="text/css"> img.hidden{ opacity: 0.1; background: grey; border: 1px solid #000; } </style>').appendTo($('head')); $('<style type="text/css"> img.hidden{ opacity: 0.1; background: grey; border: 1px solid #000; } </style>').appendTo($('head'));
var hideImage = function() { var hideImage = function() {
if ($(this).parent()[0].dataset.expanded == 'true') {
$(this).parent().click();
}
$(this) $(this)
.attr('data-orig', this.src) .attr('data-orig', this.src)
.attr('src', 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==') .attr('src', 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==')
@ -28,6 +31,27 @@ $(document).ready(function(){
.removeClass('hidden'); .removeClass('hidden');
}; };
// Fix for hide-images.js
var show_hide_hide_images_buttons = function() {
if (hide_images) {
$('a.hide-image-link').each(function() {
if ($(this).next().hasClass('show-image-link')) {
$(this).next().hide();
}
$(this).hide().after('<span class="toggle-images-placeholder">hidden</span>');
});
} else {
$('span.toggle-images-placeholder').remove();
$('a.hide-image-link').each(function() {
if ($(this).next().hasClass('show-image-link')) {
$(this).next().show();
} else {
$(this).show();
}
});
}
};
$('hr:first').before('<div id="toggle-images" style="text-align:right"><a class="unimportant" href="javascript:void(0)">-</a></div>'); $('hr:first').before('<div id="toggle-images" style="text-align:right"><a class="unimportant" href="javascript:void(0)">-</a></div>');
$('div#toggle-images a') $('div#toggle-images a')
.text((hide_images ? 'Show' : 'Hide') + ' images') .text((hide_images ? 'Show' : 'Hide') + ' images')
@ -41,10 +65,13 @@ $(document).ready(function(){
delete localStorage.hideimages; delete localStorage.hideimages;
} }
show_hide_hide_images_buttons();
$(this).text((hide_images ? 'Show' : 'Hide') + ' images') $(this).text((hide_images ? 'Show' : 'Hide') + ' images')
}); });
if (hide_images) { if (hide_images) {
$('div > a > img').each(hideImage); $('div > a > img').each(hideImage);
show_hide_hide_images_buttons();
} }
}); });