From ec181fbe227cbb82842ad5cdae68b3d4b5d2f973 Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Thu, 28 Apr 2016 16:34:42 -0400 Subject: don't allow drag when footer is expanded Former-commit-id: 7afb1a1a076c2874dae1d5c6e74e92c77e4cf3d8 --- www/js/MontageHistoryCtrl.js | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'www/js') 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(); -- cgit v1.2.3