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

Merge pull request #423 from ctrlcctrlv/revert-386-master

Browse Source 
Revert "Update to expand-video.js (video hover changes) and fix for port...
This commit is contained in:
Fredrick Brennan 2015-03-11 09:58:43 +08:00
commit 5f06f8bd44
3 changed files with 32 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/template.php
View File

@ -22,7 +22,7 @@ function load_twig() {
$loader = new Twig_Loader_Filesystem($config['dir']['template']); $loader = new Twig_Loader_Filesystem($config['dir']['template']);
$loader->setPaths($config['dir']['template']); $loader->setPaths($config['dir']['template']);
$twig = new Twig_Environment($loader, array( $twig = new Twig_Environment($loader, array(
'autoescape' => false, 'autoescape' => false,
'cache' => is_writable('templates') || (is_dir('templates/cache') && is_writable('templates/cache')) ? 'cache' => is_writable('templates') || (is_dir('templates/cache') && is_writable('templates/cache')) ?
"{$config['dir']['template']}/cache" : false, "{$config['dir']['template']}/cache" : false,
'debug' => $config['debug'] 'debug' => $config['debug']

169
js/expand-video.js
View File

@ -21,7 +21,6 @@ function setupVideo(thumb, url) {
function unexpand() { function unexpand() {
if (expanded) { if (expanded) {
expanded = false; expanded = false;
hovering = false;
if (video.pause) video.pause(); if (video.pause) video.pause();
videoContainer.style.display = "none"; videoContainer.style.display = "none";
thumb.style.display = "inline"; thumb.style.display = "inline";
@ -35,7 +34,8 @@ function setupVideo(thumb, url) {
hovering = false; hovering = false;
if (video.pause) video.pause(); if (video.pause) video.pause();
videoContainer.style.display = "none"; videoContainer.style.display = "none";
video.style.display = "none"; video.style.maxWidth = "inherit";
video.style.maxHeight = "inherit";
} }
} }
@ -56,7 +56,6 @@ function setupVideo(thumb, url) {
videoHide.addEventListener("click", unexpand, false); videoHide.addEventListener("click", unexpand, false);
videoContainer = document.createElement("div"); videoContainer = document.createElement("div");
videoContainer.id = "#expandedVideo";
videoContainer.style.paddingLeft = "15px"; videoContainer.style.paddingLeft = "15px";
videoContainer.style.display = "none"; videoContainer.style.display = "none";
videoContainer.appendChild(videoHide); videoContainer.appendChild(videoHide);
@ -114,7 +113,6 @@ function setupVideo(thumb, url) {
function expand2() { function expand2() {
video.style.maxWidth = "100%"; video.style.maxWidth = "100%";
video.style.maxHeight = window.innerHeight + "px"; video.style.maxHeight = window.innerHeight + "px";
var bottom = video.getBoundingClientRect().bottom; var bottom = video.getBoundingClientRect().bottom;
if (bottom > window.innerHeight) { if (bottom > window.innerHeight) {
window.scrollBy(0, bottom - window.innerHeight); window.scrollBy(0, bottom - window.innerHeight);
@ -126,148 +124,34 @@ function setupVideo(thumb, url) {
// Hovering over thumbnail displays video // Hovering over thumbnail displays video
thumb.addEventListener("mouseover", function(e) { thumb.addEventListener("mouseover", function(e) {
if (setting("videohover")) { if (setting("videohover")) {
getVideo(); getVideo();
expanded = false; expanded = false;
hovering = true; hovering = true;
var vidName = video.src.split('/').pop().split(".").shift();
var isMod = (window.location.pathname.split("/")[1]=="mod.php");
var thisBoard = isMod?window.location.href.split("/")[4]:window.location.pathname.split("/")[1];
var pageType = window.active_page;
var pageURL = isMod?window.location.href:window.location.pathname;
var jsonURL;
var thisThread;
var thisPost;
console.log("vidName = "+vidName);
if (pageType==="thread") {
jsonURL = pageURL.replace(/\.html$/, ".json");
} else
if (pageType==="index"){
var thisPage = isMod?window.location.href.split("/")[5].split(".")[0]:window.location.pathname.split("/")[2].split(".")[0];
if (thisPage=="index") { thisPage="0"; } else { thisPage-=1;}
jsonURL = pageURL.replace(/[a-z0-9]+.html$/, thisPage+".json");
}
$.getJSON(jsonURL, function (thread) { var docRight = document.documentElement.getBoundingClientRect().right;
$this = thread; var thumbRight = thumb.querySelector("img, video").getBoundingClientRect().right;
if(typeof thread.threads != "undefined" && thread.threads != null && thread.threads.length > 0){ var maxWidth = docRight - thumbRight - 20;
if (maxWidth < 250) maxWidth = 250;
var vidX = e.clientX; video.style.position = "fixed";
var vidY = e.clientY; video.style.right = "0px";
var windowWidth = $(window).width(); video.style.top = "0px";
var windowHeight = $(window).height(); var docRight = document.documentElement.getBoundingClientRect().right;
var vidWidth = windowWidth - vidX; var thumbRight = thumb.querySelector("img, video").getBoundingClientRect().right;
var vidHeight = windowHeight - vidY; video.style.maxWidth = maxWidth + "px";
var vidAspect = vidHeight / vidWidth; video.style.maxHeight = "100%";
video.style.pointerEvents = "none";
var totalWidth = windowWidth - vidX; video.style.display = "inline";
var totalHeight = totalWidth*vidAspect; videoHide.style.display = "none";
var maxWidth = totalWidth - 20; videoContainer.style.display = "inline";
if (maxWidth < 250) { maxWidth = 250; } videoContainer.style.position = "fixed";
var maxHeight = maxWidth * vidAspect;
var vidTop = vidY;
var vidBottom;
var vidRight;
if (vidWidth > windowWidth) { video.muted = (setting("videovolume") == 0);
video.style.maxWidth = maxWidth+"px"; video.volume = setting("videovolume");
video.style.maxHeight = maxHeight+"px"; video.controls = false;
vidBottom = vidTop + maxHeight; video.play();
vidRight = vidX+maxWidth - 20;
} else {
video.style.maxWidth = vidWidth+"px";
video.style.maxHeight = vidHeight+"px";
vidBottom = vidTop + vidHeight;
vidRight = vidX+vidWidth - 20;
}
if (vidBottom > windowHeight) { vidTop -= vidBottom-windowHeight; }
videoContainer.style.position = "fixed";
videoContainer.style.display = "block";
videoHide.style.display = "none";
if (vidRight > windowWidth) {
video.style.left = vidX-(vidRight-windowWidth)+"px";
}
else {
video.style.left = vidX+"px";
}
video.style.top = vidTop+"px";
video.style.pointerEvents = "none";
video.style.display = "block";
video.style.position = "fixed";
video.muted = (setting("videovolume") == 0);
video.volume = setting("videovolume");
video.controls = false;
video.play();
}
else {
$.each($this.posts, function(){
var tim = this.tim;
var fileNum = vidName.split('-').pop();
if(typeof this.extra_files != "undefined" && this.extra_files != null && this.extra_files.length > 0){
$.each(this.extra_files, function() {
if (vidName==this.tim){
tim = this.tim;
}
});
}
if (vidName==tim) {
var vidX = e.clientX;
var vidY = e.clientY;
var vidWidth = this.w;
var vidHeight = this.h;
var vidAspect = vidHeight / vidWidth;
var windowWidth = $(window).width();
var windowHeight = $(window).height();
var totalWidth = windowWidth - vidX;
var totalHeight = totalWidth*vidAspect;
var maxWidth = totalWidth - 20;
if (maxWidth < 250) { maxWidth = 250; }
var maxHeight = maxWidth * vidAspect;
var vidTop = vidY;
var vidBottom;
var vidRight;
if (vidWidth > windowWidth) {
video.style.maxWidth = maxWidth+"px";
video.style.maxHeight = maxHeight+"px";
vidBottom = vidTop + maxHeight;
vidRight = maxWidth+vidX;
} else {
video.style.maxWidth = vidWidth+"px";
video.style.maxHeight = vidHeight+"px";
vidBottom = vidTop + vidHeight;
vidRight = vidWidth+vidX;
}
if (vidBottom > windowHeight) {
vidTop -= vidBottom-windowHeight;
}
videoContainer.style.position = "fixed";
videoContainer.style.display = "block";
videoHide.style.display = "none";
if (vidRight > windowWidth) {
video.style.left = vidX-(vidRight-windowWidth)+"px";
}
else {
video.style.left = vidX+"px";
}
video.style.top = vidTop+"px";
video.style.pointerEvents = "none";
video.style.display = "block";
video.style.position = "fixed";
video.muted = (setting("videovolume") == 0);
video.volume = setting("videovolume");
video.controls = false;
video.play();
}
});
} //else*/
});
} }
}, false); }, false);
@ -357,3 +241,4 @@ onready(function(){
observer.observe(document.body, {childList: true, subtree: true}); observer.observe(document.body, {childList: true, subtree: true});
} }
}); });

8
js/quick-reply.js
View File

@ -112,7 +112,7 @@
#quick-reply td.recaptcha-response {\ #quick-reply td.recaptcha-response {\
padding: 0 0 1px 0;\ padding: 0 0 1px 0;\
}\ }\
@media screen and (max-width: 400px) {\ @media screen and (max-width: 600px) {\
#quick-reply {\ #quick-reply {\
display: none !important;\ display: none !important;\
}\ }\
@ -366,7 +366,7 @@
$(window).ready(function() { $(window).ready(function() {
if (settings.get('hide_at_top', true)) { if (settings.get('hide_at_top', true)) {
$(window).scroll(function() { $(window).scroll(function() {
if ($(this).width() <= 400) if ($(this).width() <= 600)
return; return;
if ($(this).scrollTop() < $origPostForm.offset().top + $origPostForm.height() - 100) if ($(this).scrollTop() < $origPostForm.offset().top + $origPostForm.height() - 100)
$postForm.fadeOut(100); $postForm.fadeOut(100);
@ -388,7 +388,7 @@
}; };
$(window).on('cite', function(e, id, with_link) { $(window).on('cite', function(e, id, with_link) {
if ($(this).width() <= 400) if ($(this).width() <= 600)
return; return;
show_quick_reply(); show_quick_reply();
if (with_link) { if (with_link) {
@ -443,7 +443,7 @@
$('.quick-reply-btn').hide(); $('.quick-reply-btn').hide();
$(window).scroll(function() { $(window).scroll(function() {
if ($(this).width() <= 400) if ($(this).width() <= 600)
return; return;
if ($(this).scrollTop() < $('form[name="post"]:first').offset().top + $('form[name="post"]:first').height() - 100) if ($(this).scrollTop() < $('form[name="post"]:first').offset().top + $('form[name="post"]:first').height() - 100)
$('.quick-reply-btn').fadeOut(100); $('.quick-reply-btn').fadeOut(100);