diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-28 14:58:49 -0400 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-28 14:58:49 -0400 |
| commit | 19516d1bbc79ca331210aea22289215eff73412a (patch) | |
| tree | 6c3300cab18771b1a384cf8f08efdf6088ea7b3f /www/js/EventServer.js | |
| parent | 50ea96b8ef90ab49aabdf67450496eeaf738c226 (diff) | |
new option to select either montage or event screen on tapping notifications #47
Diffstat (limited to 'www/js/EventServer.js')
| -rw-r--r-- | www/js/EventServer.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/www/js/EventServer.js b/www/js/EventServer.js index a333f2dd..b74298c3 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -431,7 +431,7 @@ angular.module('zmApp.controllers') // data.image, // data.additionalData - media.play(); + if (data.additionalData.foreground == false) { @@ -446,6 +446,7 @@ angular.module('zmApp.controllers') { // alarm received in foregroun //var str=data.additionalData.alarm_details; + media.play(); var str = data.message; // console.log ("***STRING: " + str + " " +str.status); var eventsToDisplay=[]; |