diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2019-07-15 14:32:31 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2019-07-15 14:32:31 -0400 |
| commit | cdf7b2897ff2fd61e79ff53f801a0592b9627176 (patch) | |
| tree | 6877f7235f48508344897901328a1fa8114c2569 | |
| parent | 70e8efd97520d221807be9b5e3f5489a45c56b91 (diff) | |
#832 - get out of hrefs
| -rw-r--r-- | config.xml | 6 | ||||
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | www/js/MonitorCtrl.js | 8 | ||||
| -rw-r--r-- | www/templates/monitors.html | 2 |
4 files changed, 14 insertions, 6 deletions
@@ -172,10 +172,10 @@ <plugin name="cordova-plugin-photo-library" spec="https://github.com/nilebma/cordova-plugin-photo-library.git"> <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value=" " /> </plugin> - <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" /> - <engine name="android" spec="7.1.4" /> - <engine name="ios" spec="5.0.0" /> <plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git"> <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" /> </plugin> + <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" /> + <engine name="android" spec="7.1.4" /> + <engine name="ios" spec="5.0.0" /> </widget> diff --git a/package.json b/package.json index 9a2e7584..e8beca7d 100644 --- a/package.json +++ b/package.json @@ -56,10 +56,10 @@ "cordova-plugin-photo-library": { "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save monitor photos to albums " }, - "cordova-plugin-media-pp-fork": {}, "cordova-plugin-ionic-webview": { "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" - } + }, + "cordova-plugin-media-pp-fork": {} } }, "dependencies": { diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js index e36d233d..45d0d9a5 100644 --- a/www/js/MonitorCtrl.js +++ b/www/js/MonitorCtrl.js @@ -65,6 +65,14 @@ angular.module('zmApp.controllers') } }; + $scope.gotoEvents = function (mid) { + $state.go("app.events", { + "id": mid, + "playEvent": false + }); + return; + }; + function noop() {} //----------------------------------------------------------------------- // This function takes care of changing monitor parameters diff --git a/www/templates/monitors.html b/www/templates/monitors.html index c202f1c4..691a6844 100644 --- a/www/templates/monitors.html +++ b/www/templates/monitors.html @@ -57,7 +57,7 @@ <div style="float:right;"> <a class="button button-small icon icon-left icon ion-gear-a" href="" ng-click="changeConfig(monitor.Monitor.Name, monitor.Monitor.Id,monitor.Monitor.Enabled,monitor.Monitor.Function);">{{'kConfiguration' | translate}}</a> - <a class="button button-small icon icon-left ion-calendar" href="#/app/events/{{monitor.Monitor.Id}}/false">{{'kEventsCap'|translate}}</a> + <a class="button button-small icon icon-left ion-calendar" ng-click="gotoEvents(monitor.Monitor.Id)">{{'kEventsCap'|translate}}</a> <a class="button button-small icon icon-left ion-ios-eye" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey, monitor)">{{'kLiveView' | translate}} </a> </div> |