summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/js/MontageCtrl.js2
-rw-r--r--www/templates/montage-history.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 7da4b99a..8974f3b4 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -254,7 +254,7 @@ function initPackery()
imagesLoaded(elem).on('progress', function(instance, img) {
//console.log ("******** SOME IMAGE LOADED");
- console.log ("IMAGE PROGRESS " + JSON.stringify(img.img));
+ console.log ("IMAGE PROGRESS " + JSON.stringify(img) );
progressCalled = true;
if (layouttype) $timeout (function(){layout(pckry);},100);
diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html
index 2b74ba03..b91b3e16 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -136,7 +136,7 @@
</div>
- <ion-pull-up-footer class="bar-dark" on-minimize="footerCollapse()" on-collapse="footerCollapse()" initial-state="minimized" default-behavior="expand">
+ <ion-pull-up-footer class="bar-dark" on-expand="footerExpand()" on-minimize="footerCollapse()" on-collapse="footerCollapse()" initial-state="minimized" default-behavior="expand">
<ion-pull-up-handle width="100" height="25" toggle="ion-chevron-up ion-chevron-down" style="border-radius: 25px 25px 0 0">
<i class="icon ion-chevron-up"></i>
</ion-pull-up-handle>