diff -Naur ./views/js/montage.js ./views_patched/js/montage.js
--- ./views/js/montage.js 2018-04-15 01:28:35.364986299 -0700
+++ ./views_patched/js/montage.js 2018-04-15 02:54:13.708110910 -0700
@@ -69,24 +69,38 @@
if ( newAlarm )
{
- if ( false && SOUND_ON_ALARM )
+ if ( SOUND_ON_ALARM )
{
- // Enable the alarm sound
- $('alarmSound').removeClass( 'hidden' );
- }
+ // Enable the alarm sound
+ if ( !canPlayPauseAudio )
+ $('alarmSound').removeClass( 'hidden' );
+ else
+ $('MediaPlayer').Play();
+ }
if ( POPUP_ON_ALARM )
{
- windowToFront();
+ if (navigator.userAgent.indexOf('Chrome/') > 0) {
+ if (window.detwin) {
+ window.detwin.close();
+ window.detwin = null;
+ }
+ }
+ window.detwin = window.open('?view=events&page=1&filter[terms][0][attr]=DateTime&filter[terms][0][op]=%3E%3D&filter[terms][0][val]=-1+minute', 'ALARM RAISED', '...');
+ window.detwin.focus();
+ //windowToFront();
}
}
- if ( false && SOUND_ON_ALARM )
- {
- if ( oldAlarm )
+ if ( SOUND_ON_ALARM )
{
- // Disable alarm sound
- $('alarmSound').addClass( 'hidden' );
+ if ( oldAlarm )
+ {
+ // Disable alarm sound
+ if ( !canPlayPauseAudio )
+ $('alarmSound').addClass( 'hidden' );
+ else
+ $('MediaPlayer').Stop();
}
- }
+ }
}
else
{
diff -Naur ./views/js/montage.js.php ./views_patched/js/montage.js.php
--- ./views/js/montage.js.php 2018-04-15 01:29:10.581874297 -0700
+++ ./views_patched/js/montage.js.php 2018-04-15 01:33:34.088661273 -0700
@@ -26,6 +26,8 @@
var canStreamNative = ;
+var canPlayPauseAudio = Browser.ie;
+
var monitorData = new Array();
0) {
+ if (window.detwin) {
+ window.detwin.close();
+ window.detwin = null;
+ }
+ }
+ window.detwin = window.open('?view=events&page=1&filter[terms][0][attr]=DateTime&filter[terms][0][op]=%3E%3D&filter[terms][0][val]=-1+minute', 'ALARM RAISED', '...');
+ window.detwin.focus();
+ }
}
if ( SOUND_ON_ALARM )
{
diff -Naur ./views/montage.php ./views_patched/montage.php
--- ./views/montage.php 2018-04-15 01:27:10.174190704 -0700
+++ ./views_patched/montage.php 2018-04-15 01:33:04.766582472 -0700
@@ -84,6 +84,7 @@
xhtmlHeaders(__FILE__, translate('Montage') );
?>
+
+
+
+
+
+
+
+