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

Merge pull request #95 from undido/patch-2

Browse Source 
Fixed bug with webm's and remove images if they are clicked to be expanded
This commit is contained in:
Fredrick Brennan 2014-09-26 23:41:11 -04:00
commit 5d6de13561
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/image-hover.js
View File

@ -24,12 +24,22 @@ $(document).ready(function(){
imageHover = !imageHover; imageHover = !imageHover;
var imageEnter = function(){ var imageEnter = function(){
if (!imageHover) if (!imageHover)
return; return;
//don't hover-image if image expanded
if ($(this).parent().attr("data-expanded") == "true")
return;
mouseexitedImage = false; mouseexitedImage = false;
mouseisOnImage = false; mouseisOnImage = false;
//remove hover-image if user clicks on image to expand it
$(this).click(function(){
mouseexitedImage = false;
mouseisOnImage = false;
$("#hover-image").remove();
});
isVideo = (($(this).prop("tagName") == "VIDEO") ? true:($(this).parent().attr("href").indexOf("player.php?v=") > -1) ? true:false); isVideo = (($(this).prop("tagName") == "VIDEO") ? true:($(this).parent().attr("href").indexOf("player.php?v=") > -1) ? true:false);
maxWidth = document.body.offsetWidth-(document.body.offsetWidth * 0.25); maxWidth = document.body.offsetWidth-(document.body.offsetWidth * 0.25);
maxHeight = document.documentElement.clientHeight; maxHeight = document.documentElement.clientHeight;
@ -78,7 +88,7 @@ $(document).ready(function(){
$mrCheckie = $('<div><label id=\"toggle-image-hover\"><input id="toggle-hover" type=\"checkbox\"> show image on hover</label></div>'); $mrCheckie = $('<div><label id=\"toggle-image-hover\"><input id="toggle-hover" type=\"checkbox\"> show image on hover</label></div>');
$(".options_tab").append($mrCheckie); $(".options_tab:first").append($mrCheckie);
$("#toggle-hover").prop("checked", imageHover); $("#toggle-hover").prop("checked", imageHover);
$("#toggle-hover").on("click", function(){ $("#toggle-hover").on("click", function(){
if ($(this).prop("checked")){ if ($(this).prop("checked")){
@ -90,7 +100,7 @@ $(document).ready(function(){
} }
}); });
$(".options_tab").append();
$(document).on("new_post", function(e, post) { $(document).on("new_post", function(e, post) {
$(post).hover(imageEnter(),imageLeave()); $(post).hover(imageEnter(),imageLeave());