From 19516d1bbc79ca331210aea22289215eff73412a Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Wed, 28 Oct 2015 14:58:49 -0400 Subject: new option to select either montage or event screen on tapping notifications #47 --- www/js/EventServer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'www/js/EventServer.js') 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=[]; -- cgit v1.2.3