From 239e047ca8c1509ec4a6a7a64b8800eecb51b820 Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Tue, 12 Apr 2016 19:53:50 -0400
Subject: #218 - montage now allows natural scrolling

Former-commit-id: b75d177fe2bec7a4077882a09d5c82507af6cef0
---
 www/js/MontageCtrl.js      |  7 +++++--
 www/templates/montage.html | 26 +++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

(limited to 'www')

diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 6c26b124..2cd606c0 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -276,6 +276,7 @@ function initPackery()
                       pckry.bindDraggabillyEvents(draggie);
                       draggies.push(draggie);
                       draggie.disable();
+                      draggie.unbindHandles();
                 });
                 
                 pckry.on( 'dragItemPositioned', itemDragged );
@@ -417,7 +418,7 @@ function initPackery()
             });
     };
     
-    $scope.swipeUp = function()
+   /* $scope.swipeUp = function()
     {
         //console.log ("SWIPE UP");
         $ionicScrollDelegate.$getByHandle("montage-delegate").scrollBy(0, $rootScope.devHeight/2, true);
@@ -427,7 +428,7 @@ function initPackery()
     {
         //console.log ("SWIPE DOWN");
         $ionicScrollDelegate.$getByHandle("montage-delegate").scrollBy(0, -($rootScope.devHeight/2), true);
-    };
+    };*/
     
     
     
@@ -593,6 +594,7 @@ function initPackery()
             for (i=0; i < draggies.length; i++)
             {
                 draggies[i].enable();
+                draggies[i].bindHandles();
             }
             
            // reflow and reload as some may be hidden
@@ -605,6 +607,7 @@ function initPackery()
             for ( i=0; i < draggies.length; i++)
             {
                 draggies[i].disable();
+                draggies[i].unbindHandles();
             }
             for (i=0; i < $scope.MontageMonitors.length; i++)
             {
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 72650089..6db6e6be 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -22,7 +22,9 @@
 
     </ion-nav-buttons>
 
-    <ion-content ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" >
+    <ion-content ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate"  >
+    
+    
 
         <span ng-show="!minimal">
             <!-- this is header -->
@@ -33,23 +35,37 @@
             <br/><br/>
         </span>
         
+        
+       
+        
         <!-- now lets draw the montage windows -->
         <div class="grid" id="mygrid">
             <div class="grid-sizer grid-item-10"></div>
+            
+            
+            
             <span ng-repeat="monitor in MontageMonitors|limitTo: monLimit" 
                   ng-if="monitor.Monitor.Function!='None' &&  monitor.Monitor.Enabled !='0' ">
-                <div class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}}" >
+                
+                
+                
+                <div  class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}}" >
+                
+                   
+                    
                     <figure class="{{dragBorder}}" ng-show=" monitor.Monitor.listDisplay!='noshow'">
                         <div ng-if="!isModalActive" >
                             <div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading">
                                 <div ng-if = "!minimal">
-                                   
-                                    <img   class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{LoginData.streamingurl}}/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey):toggleSelectItem($index);" image-spinner-loader="lines" on-swipe-up="swipeUp()" on-swipe-down="swipeDown()"  />
+                                    
+                                 
+                                    
+                                    <img   class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{LoginData.streamingurl}}/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey):toggleSelectItem($index);" image-spinner-loader="lines"  />
 
                                     </div> 
 
                                     <div ng-if = "minimal">
-                                        <img id="{{img-$index}}" image-spinner-src="{{LoginData.streamingurl}}/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}"  ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey):toggleSelectItem($index);" image-spinner-loader="lines" swipe-up="swipeUp()" on-swipe-down="swipeDown()"   />
+                                        <img id="{{img-$index}}" image-spinner-src="{{LoginData.streamingurl}}/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}"  ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey):toggleSelectItem($index);" image-spinner-loader="lines"    />
                                     </div>
                             </div>
 
-- 
cgit v1.2.3