summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorpliablepixels <pliablepixels@gmail.com>2016-04-28 16:34:42 -0400
committerpliablepixels <pliablepixels@gmail.com>2016-04-28 16:34:42 -0400
commitec181fbe227cbb82842ad5cdae68b3d4b5d2f973 (patch)
treeaf3c981c91e17f085afb2efe3d12d7a08f20aede /www
parent6c3684295de8e57fae99c7724f119f0451f484a9 (diff)
don't allow drag when footer is expanded
Former-commit-id: 7afb1a1a076c2874dae1d5c6e74e92c77e4cf3d8
Diffstat (limited to 'www')
-rw-r--r--www/js/MontageHistoryCtrl.js9
1 files changed, 9 insertions, 0 deletions
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 625a9bc2..46200e98 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -67,6 +67,12 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
// note that on init it is also called
//---------------------------------------
+ $scope.footerExpand = function()
+ {
+ console.log ("**************** EXPAND CALLED ***************");
+ $ionicSideMenuDelegate.canDragContent(false);
+ };
+
$scope.footerCollapse = function()
{
@@ -80,12 +86,15 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
/* Note this is also called when the view is first loaded */
function footerCollapse()
{
+ console.log ("**************** COLLAPSE CALLED ***************");
if (readyToRun == false)
{
ZMDataModel.zmDebug ("fake call to footerCollapse - ignoring");
return;
}
+ $ionicSideMenuDelegate.canDragContent(true);
+
ZMDataModel.stopNetwork("MontageHistory-footerCollapse");
var ld = ZMDataModel.getLogin();