reduce image loading buffer of carousel (for low config devices) also made sure scrub carousel is cleared if full screen is opened so as not to double images

2 files changed, 25 insertions, 2 deletions

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 1f535507..93fdba0e 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -226,7 +226,12 @@ angular.module('zmApp.controllers')
         // This function is called when a user enables or disables
         // scrub view for an event.
         //-------------------------------------------------------------------------
-        $scope.toggleGroup = function (event, ndx, frames) {
+
+        $scope.toggleGroup = function(event,ndx,frames)
+        {
+            toggleGroup(event, ndx, frames);
+        };
+        function toggleGroup(event, ndx, frames) {
 
             // If we are here and there is a record of a previous scroll
             // then we need to scroll back to hide that view
@@ -357,8 +362,17 @@ angular.module('zmApp.controllers')
                 // we are turning off, so scroll by back
             }
 
-        };
+        }
 
+        $scope.closeIfOpen = function(event)
+        {
+            if (event != undefined)
+            {
+                if (event.Event.ShowScrub)
+                        toggleGroup(event);
+
+            }
+        };
 
         $scope.isGroupShown = function (event) {
             //  console.log ("IS SHOW INDEX is " + ndx);
diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js
index eb7e7754..8b48c077 100644
--- a/www/js/ModalCtrl.js
+++ b/www/js/ModalCtrl.js
@@ -19,6 +19,15 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
     //var imageStyle=1;
     //$scope.imageAspect = "max-width: 100%;max-height: 100%;";
     $scope.imageFit=false;
+    // FIXME: This is a hack - for some reason
+    // the custom slider view is messed up till the image loads
+    // in modal view
+    $scope.showModalRangeSider = false;
+
+    $timeout( function() {
+        $scope.showModalRangeSider = true;
+        console.log ("****SHOWING SLIDER");
+    },2000);
 
     $scope.radialMenuOptions = {
         content: '',