From 6b6b8d7d50e70614240e77723541448ca7b0243c Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Mon, 17 Nov 2014 11:26:06 -0500
Subject: [PATCH] VuDL Zoomy fix and Javascript variable declaration fix.
---
themes/bootstrap3/js/vudl/record.js | 2 +-
themes/bootstrap3/templates/vudl/views/page.phtml | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/themes/bootstrap3/js/vudl/record.js b/themes/bootstrap3/js/vudl/record.js
index ae6937c988e..17fb2c9539b 100644
--- a/themes/bootstrap3/js/vudl/record.js
+++ b/themes/bootstrap3/js/vudl/record.js
@@ -132,7 +132,7 @@ function toggleSideNav() {
}
function resizeElements() {
- $height = $(window).height() + window.scrollY - $('.panel:last-child').offset().top - 50;
+ var $height = $(window).height() + window.scrollY - $('.panel:last-child').offset().top - 50;
$('.panel-collapse').css('max-height', Math.max(300, Math.min($height, $(window).height() - 200)));
}
diff --git a/themes/bootstrap3/templates/vudl/views/page.phtml b/themes/bootstrap3/templates/vudl/views/page.phtml
index 83640119509..a1c2e1ec7c9 100644
--- a/themes/bootstrap3/templates/vudl/views/page.phtml
+++ b/themes/bootstrap3/templates/vudl/views/page.phtml
@@ -32,10 +32,15 @@
}
function resizeZoom() {
- $height = $(window).height() + window.scrollY - $('#zoomy').offset().top - 10;
+ var $height = $(window).height() + window.scrollY - $('#zoomy').offset().top - 10;
+ if($('#side-nav').height() > 200) {
+ $height = Math.min($height, $('#side-nav').height() - 80);
+ } else {
+ $height = Math.min($height, $(window).height() - 270);
+ }
$('#zoomy').css({
'width' : '100%',
- 'height': Math.max(400, Math.min($height, $('#side-nav').height() - 80))
+ 'height': Math.max(400, $height)
});
}
--
GitLab