API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Apr 15th, 2018
229
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.97 KB | None | 0 0
raw download clone embed print report
  1. diff -Naur ./views/js/montage.js ./views_patched/js/montage.js
  2. --- ./views/js/montage.js 2018-04-15 01:28:35.364986299 -0700
  3. +++ ./views_patched/js/montage.js 2018-04-15 02:54:13.708110910 -0700
  4. @@ -69,24 +69,38 @@
  5.  
  6. if ( newAlarm )
  7. {
  8. - if ( false && SOUND_ON_ALARM )
  9. + if ( SOUND_ON_ALARM )
  10. {
  11. - // Enable the alarm sound
  12. - $('alarmSound').removeClass( 'hidden' );
  13. - }
  14. + // Enable the alarm sound
  15. + if ( !canPlayPauseAudio )
  16. + $('alarmSound').removeClass( 'hidden' );
  17. + else
  18. + $('MediaPlayer').Play();
  19. + }
  20. if ( POPUP_ON_ALARM )
  21. {
  22. - windowToFront();
  23. + if (navigator.userAgent.indexOf('Chrome/') > 0) {
  24. + if (window.detwin) {
  25. + window.detwin.close();
  26. + window.detwin = null;
  27. + }
  28. + }
  29. + 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', '...');
  30. + window.detwin.focus();
  31. + //windowToFront();
  32. }
  33. }
  34. - if ( false && SOUND_ON_ALARM )
  35. - {
  36. - if ( oldAlarm )
  37. + if ( SOUND_ON_ALARM )
  38. {
  39. - // Disable alarm sound
  40. - $('alarmSound').addClass( 'hidden' );
  41. + if ( oldAlarm )
  42. + {
  43. + // Disable alarm sound
  44. + if ( !canPlayPauseAudio )
  45. + $('alarmSound').addClass( 'hidden' );
  46. + else
  47. + $('MediaPlayer').Stop();
  48. }
  49. - }
  50. + }
  51. }
  52. else
  53. {
  54. diff -Naur ./views/js/montage.js.php ./views_patched/js/montage.js.php
  55. --- ./views/js/montage.js.php 2018-04-15 01:29:10.581874297 -0700
  56. +++ ./views_patched/js/montage.js.php 2018-04-15 01:33:34.088661273 -0700
  57. @@ -26,6 +26,8 @@
  58.  
  59. var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
  60.  
  61. +var canPlayPauseAudio = Browser.ie;
  62. +
  63. var monitorData = new Array();
  64. <?php
  65. foreach ( $monitors as $monitor )
  66. diff -Naur ./views/js/watch.js ./views_patched/js/watch.js
  67. --- ./views/js/watch.js 2018-04-15 01:29:47.650388424 -0700
  68. +++ ./views_patched/js/watch.js 2018-04-15 01:57:51.010680595 -0700
  69. @@ -83,8 +83,15 @@
  70. }
  71. if ( POPUP_ON_ALARM )
  72. {
  73. - window.focus();
  74. - }
  75. + if (navigator.userAgent.indexOf('Chrome/') > 0) {
  76. + if (window.detwin) {
  77. + window.detwin.close();
  78. + window.detwin = null;
  79. + }
  80. + }
  81. + 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', '...');
  82. + window.detwin.focus();
  83. + }
  84. }
  85. if ( SOUND_ON_ALARM )
  86. {
  87. diff -Naur ./views/montage.php ./views_patched/montage.php
  88. --- ./views/montage.php 2018-04-15 01:27:10.174190704 -0700
  89. +++ ./views_patched/montage.php 2018-04-15 01:33:04.766582472 -0700
  90. @@ -84,6 +84,7 @@
  91.  
  92. xhtmlHeaders(__FILE__, translate('Montage') );
  93. ?>
  94. +<meta http-equiv="refresh" content="60" >
  95. <body>
  96. <div id="page">
  97. <div id="header">
  98. @@ -152,5 +153,50 @@
  99. </div>
  100. </div>
  101. </div>
  102. + </div>
  103. + </div>
  104. +
  105. +<?php
  106. +if ( ZM_WEB_SOUND_ON_ALARM )
  107. +{
  108. + $soundSrc = ZM_DIR_SOUNDS.'/'.ZM_WEB_ALARM_SOUND;
  109. +?>
  110. + <div id="alarmSound" class="hidden">
  111. +<?php
  112. + if ( ZM_WEB_USE_OBJECT_TAGS && isWindows() )
  113. + {
  114. +?>
  115. + <object id="MediaPlayer" width="0" height="0"
  116. + classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95"
  117. + codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902">
  118. + <param name="FileName" value="<?php echo $soundSrc ?>"/>
  119. + <param name="autoStart" value="0"/>
  120. + <param name="loop" value="1"/>
  121. + <param name="hidden" value="1"/>
  122. + <param name="showControls" value="0"/>
  123. + <embed src="<?php echo $soundSrc ?>"
  124. + autostart="true"
  125. + loop="true"
  126. + hidden="true">
  127. + </embed>
  128. + </object>
  129. +<?php
  130. + }
  131. + else
  132. + {
  133. +?>
  134. + <embed src="<?php echo $soundSrc ?>"
  135. + autostart="true"
  136. + loop="true"
  137. + hidden="true">
  138. + </embed>
  139. +<?php
  140. + }
  141. +?>
  142. + </div>
  143. +<?php
  144. +}
  145. +?>
  146. +
  147. </body>
  148. </html>
  149. diff -Naur ./views/watch.php ./views_patched/watch.php
  150. --- ./views/watch.php 2018-04-15 01:30:35.896645337 -0700
  151. +++ ./views_patched/watch.php 2018-04-15 01:32:55.608431844 -0700
  152. @@ -77,6 +77,7 @@
  153.  
  154. xhtmlHeaders( __FILE__, $monitor->Name()." - ".translate('Feed') );
  155. ?>
  156. +<meta http-equiv="refresh" content="60" >
  157. <body>
  158. <div id="page">
  159. <div id="content">
  160. @@ -240,5 +241,6 @@
  161. ?>
  162. </div>
  163. </div>
  164. +
  165. </body>
  166. </html>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!