summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2020-08-29 10:14:04 -0400
committerPliable Pixels <pliablepixels@gmail.com>2020-08-29 10:14:04 -0400
commitca768975f2d0258e4e09acc896cee4dd1ee5b0ca (patch)
treee7a0d7689195fcb813b31d22612a71eb9e44cd5c
parent25211b7d46c08788f390f6f220428b6f179e5ed2 (diff)
make sure we don't show 0 alarm bell in ECtrl
-rw-r--r--package.json6
-rw-r--r--www/js/EventCtrl.js2
2 files changed, 2 insertions, 6 deletions
diff --git a/package.json b/package.json
index 92edf08e..5dbc127c 100644
--- a/package.json
+++ b/package.json
@@ -70,10 +70,7 @@
"ANDROID_GSON_VERSION": "2.8.6"
},
"cordova-plugin-media-pp-fork": {},
- "cordova-plugin-advanced-http": {},
- "cordova-plugin-ionic-webview": {
- "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
- }
+ "cordova-plugin-advanced-http": {}
}
},
"dependencies": {
@@ -100,7 +97,6 @@
"cordova-plugin-ignore-lint-translation": "0.0.1",
"cordova-plugin-insomnia": "^4.3.0",
"cordova-plugin-ionic-keyboard": "^2.2.0",
- "cordova-plugin-ionic-webview": "git+https://github.com/pliablepixels/cordova-plugin-ionic-webview.git",
"cordova-plugin-media-pp-fork": "^1.0.2-dev",
"cordova-plugin-multi-window": "0.0.3",
"cordova-plugin-network-information": "^2.0.2",
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 3027de01..a6e89d6c 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -2482,7 +2482,7 @@ angular.module('zmApp.controllers')
});
// also clear bells
$rootScope.alarmCount = "0";
- $rootScope.isAlarm = !$rootScope.isAlarm;
+ $rootScope.isAlarm = 0;
// reset badge count
if (window.FirebasePlugin && $rootScope.platformOS == 'ios') {