ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use tlzoom class to avoid conflict with thumbnail zoom

This commit is contained in:
Andrew Bauer 2020-12-23 07:57:44 -06:00
parent a9b92905ca
commit c497b94378
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/classic/css/base/views/timeline.css
View File

@ -227,7 +227,7 @@ div.majLabelY {
font-weight: normal; font-weight: normal;
} }
div.zoom { div.tlzoom {
position: absolute; position: absolute;
z-index: 2; z-index: 2;
bottom: 0px; bottom: 0px;

2
web/skins/classic/views/js/timeline.js
View File

@ -169,7 +169,7 @@ function divDataOnClick() {
el.onclick = window[el.getAttribute('data-on-click-this')].bind(el, el); el.onclick = window[el.getAttribute('data-on-click-this')].bind(el, el);
el.onmouseover = window[el.getAttribute('data-on-mouseover-this')].bind(el, el); el.onmouseover = window[el.getAttribute('data-on-mouseover-this')].bind(el, el);
}); });
document.querySelectorAll('div.zoom').forEach(function(el) { document.querySelectorAll('div.tlzoom').forEach(function(el) {
el.onclick = function(ev) { el.onclick = function(ev) {
window[el.getAttribute('data-on-click')](ev); window[el.getAttribute('data-on-click')](ev);
}; };

2
web/skins/classic/views/timeline.php
View File

@ -742,7 +742,7 @@ function drawSlot($slot,$index) {
if ( $mode == 'overlay' ) { if ( $mode == 'overlay' ) {
echo drawYGrid( $chart, $majYScale, 'majLabelY', 'majTickY', 'majGridY graphWidth' ); echo drawYGrid( $chart, $majYScale, 'majLabelY', 'majTickY', 'majGridY graphWidth' );
} }
echo drawXGrid( $chart, $majXScale, 'majLabelX', 'majTickX', 'majGridX graphHeight', 'zoom graphHeight' ); echo drawXGrid( $chart, $majXScale, 'majLabelX', 'majTickX', 'majGridX graphHeight', 'tlzoom graphHeight' );
if ( $mode == 'overlay' ) { if ( $mode == 'overlay' ) {
?> ?>
<div id="activity" class="activitySize"> <div id="activity" class="activitySize">