ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Also don't load additional JS to Log view 

Another issue with mootools & jquery conflicts
pull/1459/head
Kyle Johnson 2016-05-03 13:25:39 -04:00
parent 6768fe5554
commit c2fd3dd84a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/skins/classic/includes/functions.php
View File

@ -18,6 +18,10 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//
// Don't load in additional JS to these views
$bad_views = array('monitor', 'log');
function xhtmlHeaders( $file, $title )
{
global $css;
@ -72,7 +76,7 @@ function xhtmlHeaders( $file, $title )
<script type="text/javascript" src="tools/mootools/mootools-core.js"></script>
<script type="text/javascript" src="tools/mootools/mootools-more.js"></script>
<script type="text/javascript" src="js/mootools.ext.js"></script>
<?php if ( $basename != 'monitor') { ?>
<?php if ( !in_array($basename, $bad_views) ) { ?>
<script type="text/javascript" src="js/logger.js"></script>
<script type="text/javascript" src="js/overlay.js"></script>
<script type="text/javascript" src="/skins/<?php echo $css; ?>/js/jquery-1.11.3.js"></script>