#832 - get out of hrefs

ZoneMinder · Jul 15, 2019 · 6a260b2 · 6a260b2
1 parent efb8fd5
commit 6a260b2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/config.xml b/config.xml
@@ -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
@@ -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
@@ -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
@@ -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>