Merge branch 'master' of github.com:ZoneMinder/zoneminder

web/js/panzoom.js

@@ -23,6 +23,7 @@ var zmPanZoom = {
 
     object.each( function() {
       params.obj = this;
+      params.handleStartEvent = () => {}; //Prevents the progress bar generated by video.js from breaking because it disables preventDefault(), which is enabled by default.
       _this.action('enable', params);
     });
   },
@@ -175,6 +176,7 @@ var zmPanZoom = {
   },
 
   setTouchAction: function(el) {
+    if (!el) return;
     const currentScale = el.getScale().toFixed(1);
     if (currentScale == 1) {
       el.setOptions({touchAction: 'manipulation'});

web/skins/classic/css/base/views/event.css

@@ -43,6 +43,7 @@
   border-radius: 0;
   z-index: 11;
   font-size: 8px;
+  overflow:hidden;
 }
 
 #alarmCues span.alarmCue {

web/skins/classic/views/event.php

@@ -237,7 +237,7 @@ if ( $Event->Id() and !file_exists($Event->Path()) )
           <label for="scale"><?php echo translate('Scale') ?></label>
           <?php echo htmlSelect('scale', $scales, $scaleSelected, array('data-on-change'=>'changeScale','id'=>'scale')); ?>
         </div>
-        <div id="streamQualityControl">
+          <div id="streamQualityControl"<?php echo $video_tag ? ' style="display: none;"':'' ?>>
           <label for="streamQuality"><?php echo translate('Stream quality') ?></label>
           <?php echo htmlSelect('streamQuality', $streamQuality, $streamQualitySelected, array('data-on-change'=>'changeStreamQuality','id'=>'streamQuality')); ?>
         </div>