From c4bd4368231da17bd24219f6db7982d364ed8302 Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Fri, 11 Mar 2016 11:29:03 -0500
Subject: #179 - tweaks

Former-commit-id: a09f67dcaa8c09729cd0f2fe033c82d08ae28000
---
 www/js/MontageCtrl.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'www/js')

diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 9d0fe352..b02cbe6b 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -181,6 +181,13 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 function initPackery()
 {
         
+        
+        $ionicLoading.show({
+                    template: "arranging images...",
+                    noBackdrop: true,
+                    duration: zm.loadingTimeout
+                });
+    
         var progressCalled = false;
         draggies = [];
         var layouttype = true;
@@ -231,7 +238,9 @@ function initPackery()
         });
         
         imagesLoaded(elem).on('always', function() {
-                console.log ("******** ALL IMAGES LOADED");
+                //console.log ("******** ALL IMAGES LOADED");
+                ZMDataModel.zmDebug ("All images loaded");
+                $ionicLoading.hide();
                 
                 if (!progressCalled)
                 {
@@ -794,7 +803,7 @@ function initPackery()
     
     function layout(pckry)
     {
-        pckry.layout();
+        pckry.shiftLayout();
     }
 
     //---------------------------------------------------------
-- 
cgit v1.2.3