#570 fixed multiserver url - needs audit

2 files changed, 51 insertions, 2 deletions

diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js
index fcf7ad64..67947d98 100644
--- a/www/js/MomentCtrl.js
+++ b/www/js/MomentCtrl.js
@@ -100,7 +100,12 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
 
       data.events[i].Event.hide = false;
       data.events[i].Event.icon = "ion-code-working";
-      data.events[i].Event.baseURL = NVRDataModel.getBaseURL(data.events[i].Event.MonitorId);
+      //data.events[i].Event.baseURL = NVRDataModel.getBaseURL(data.events[i].Event.MonitorId);
+
+      // huh? why did I need the above?
+      data.events[i].Event.baseURL = NVRDataModel.getLogin().url;
+
+
       data.events[i].Event.monitorName = NVRDataModel.getMonitorName(data.events[i].Event.MonitorId);
 
       data.events[i].Event.dateObject = new Date(data.events[i].Event.StartTime);
@@ -192,6 +197,8 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
 
 
     $scope.isSubMenu = !$scope.isSubMenu;
+    if ($scope.isSubMenu)
+      $ionicScrollDelegate.$getByHandle("moment-delegate").scrollTop();
     //($scope.isSubMenu);
   };
 
@@ -416,6 +423,47 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
 
   };
 
+  $scope.playEvent = function (event) {
+
+    $scope.currentEvent = event;
+    $scope.event = event;
+    $scope.monitors = monitors;
+    NVRDataModel.setAwake(NVRDataModel.getKeepAwake());
+    $scope.followSameMonitor = "0";
+    $scope.mycarousel = {
+      index: 0
+  };
+
+  $scope.ionRange = {
+      index: 1
+  };
+
+    $ionicModal.fromTemplateUrl('templates/events-modal.html',
+            {
+                scope: $scope,
+                animation: 'slide-in-up',
+                id: 'footage',
+            })
+            .then(function(modal)
+            {
+                $scope.modal = modal;
+
+                $ionicLoading.show(
+                {
+                    template: $translate.instant('kPleaseWait') + "...",
+                    noBackdrop: true,
+                    duration: 10000
+                });
+
+                $scope.modal.show();
+
+                var ld = NVRDataModel.getLogin();
+
+            });
+
+
+  }
+
   $scope.showThumbnail = function (b, f) {
 
     if (!f) { // api update needed
diff --git a/www/templates/moment.html b/www/templates/moment.html
index 12cc2c95..bdd64b6a 100644
--- a/www/templates/moment.html
+++ b/www/templates/moment.html
@@ -69,7 +69,8 @@
                 <figcaption class="normal-figheader">{{moment.Event.monitorName}}<span style="float:right"><button class="button button-small button-icon icon  {{moment.Event.icon}}" ng-click="toggleCollapse(moment.Event.MonitorId, moment.Event.Id, $index)"></button>{{moment.Event.collapseCount}}&nbsp;</span></figcaption>
                  <img   image-spinner-src="{{moment.Event.baseURL}}/index.php?view=image&fid={{moment.Event.MaxScoreFrameId}}&width={{moment.Event.thumbWidth*2}}&height={{moment.Event.thumbHeight*2}}" img-spinner-w="{{moment.Event.width}}"
                  img-spinner-h="{{moment.Event.height}}" image-spinner-loader="lines" 
-            on-tap="showThumbnail(moment.Event.baseURL,moment.Event.MaxScoreFrameId)"/>
+            on-tap="playEvent(moment)"/>
+            <!--on-tap="showThumbnail(moment.Event.baseURL,moment.Event.MaxScoreFrameId)"-->
             <figcaption class="normal-figcaption">{{moment.Event.humanizeTime}}<span style="float:right">{{hourmin(moment.Event.StartTime)}}</span></figcaption>
             </figure>