#91 - initial support - needs formatting

2 files changed, 45 insertions, 1 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 078a2fe2..4fd3a791 100755
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -164,6 +164,7 @@ angular.module('zmApp.controllers')
         'hideArchived': false,
         'videoPlaybackSpeed': 2,
         'enableGIFMP4': false,
+        'enableThumbs': true,
         'enableStrictSSL': false,
         'enableSlowLoading': false,
         'isFullScreen': false,
@@ -994,10 +995,16 @@ angular.module('zmApp.controllers')
 
                   if (typeof loginData.enableGIFMP4 == 'undefined') {
 
-                    loginData.enableGIFMP4 = true;
+                    loginData.enableGIFMP4 = false;
 
                   }
 
+                  if (typeof loginData.enableThumbs == 'undefined') {
+                    
+                     loginData.enableThumbs = true;
+                    
+                  }
+
                   if (typeof loginData.enableSlowLoading == 'undefined') {
 
                     loginData.enableSlowLoading = false;
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 8a8673e4..3468d988 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -65,9 +65,12 @@ angular.module('zmApp.controllers')
     $scope.typeOfFrames = $translate.instant('kShowTimeDiffFrames');
     $scope.outlineMotion = false;
     $scope.outlineMotionParam = "";
+
+
     var eventsListScrubHeight = eventsListScrubHeight;
     var eventsListDetailsHeight = eventsListDetailsHeight;
 
+   
     //---------------------------------------------------
     // initial code
     //---------------------------------------------------
@@ -148,6 +151,14 @@ angular.module('zmApp.controllers')
         eventsListDetailsHeight = parseInt(zm.eventsListDetailsHeight * $rootScope.textScaleFactor);
         eventsListScrubHeight = parseInt(zm.eventsListScrubHeight * $rootScope.textScaleFactor);
 
+
+        if (NVRDataModel.getLogin().enableThumbs) {
+            NVRDataModel.debug ("--> thumbnail means increasing row size");
+            eventsListScrubHeight=370;
+            eventsListDetailsHeight=300;
+    
+        }
+
         NVRDataModel.debug(">>>height of list/scrub set to " + eventsListDetailsHeight + " and " + eventsListScrubHeight);
 
         pageLoaded = false;
@@ -2682,6 +2693,32 @@ angular.module('zmApp.controllers')
 
     });
 
+
+    
+    $scope.showThumbnail = function (b,f) {
+
+
+        $scope.thumbnailLarge=b+'/index.php?view=image&fid='+f;
+        $ionicModal.fromTemplateUrl('templates/image-modal.html',
+        {
+            scope: $scope,
+            animation: 'slide-in-up',
+            id: 'thumbnail',
+        })
+        .then(function(modal)
+        {
+            $scope.modal = modal;
+            
+
+            $scope.modal.show();
+
+            var ld = NVRDataModel.getLogin();
+
+        });        
+
+    };
+
+
     //--------------------------------------------------------
     //This is called when we first tap on an event to see
     // the feed. It's important to instantiate ionicModal here