diff --git a/public/index.html b/public/index.html index 7056d8ee1..5de553b9f 100644 --- a/public/index.html +++ b/public/index.html @@ -25,7 +25,7 @@ - +
diff --git a/public/views/includes/confirm-tx.html b/public/views/includes/confirm-tx.html index e39e4a7cc..4a2100566 100644 --- a/public/views/includes/confirm-tx.html +++ b/public/views/includes/confirm-tx.html @@ -31,7 +31,7 @@
-
diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 6282c236d..703943492 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -53,9 +53,10 @@ --> - - + + diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index f9a4d8eb2..1649519aa 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, $ionicScrollDelegate, $ionicPopup, latestReleaseService, feeService, bwcService, pushNotificationsService, lodash, go, profileService, configService, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, addonManager, bwsError, txFormatService, uxLanguage, glideraService, coinbaseService, platformInfo, addressbookService, walletService) { +angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, $ionicSideMenuDelegate, $ionicScrollDelegate, $ionicPopup, latestReleaseService, feeService, bwcService, pushNotificationsService, lodash, go, profileService, configService, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, addonManager, bwsError, txFormatService, uxLanguage, glideraService, coinbaseService, platformInfo, addressbookService, walletService) { var self = this; var SOFT_CONFIRMATION_LIMIT = 12; var errors = bwcService.getErrors(); @@ -69,6 +69,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r go.walletHome(); }; + self.onDrag = function() { + if (!isCordova) + $ionicSideMenuDelegate.canDragContent(false); + }; + self.hideBalance = function() { storageService.getHideBalanceFlag(self.walletId, function(err, shouldHideBalance) { if (err) self.shouldHideBalance = false; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 022e74dd8..88bb49eca 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $ionicScrollDelegate, $ionicSideMenuDelegate, $rootScope, $interval, $timeout, $filter, $modal, $log, $ionicModal, notification, txStatus, profileService, lodash, configService, rateService, storageService, bitcore, gettext, gettextCatalog, platformInfo, addressService, ledger, bwsError, confirmDialog, txFormatService, animationService, addressbookService, go, feeService, walletService, fingerprintService, nodeWebkit) { +angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $interval, $timeout, $filter, $modal, $log, $ionicModal, notification, txStatus, profileService, lodash, configService, rateService, storageService, bitcore, gettext, gettextCatalog, platformInfo, addressService, ledger, bwsError, confirmDialog, txFormatService, animationService, addressbookService, go, feeService, walletService, fingerprintService, nodeWebkit) { var isCordova = platformInfo.isCordova; var isWP = platformInfo.isWP; @@ -32,20 +32,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi ret.sendMaxInfo = {}; var vanillaScope = ret; - $scope.freezeScroll = function() { - - var openRatio = $ionicSideMenuDelegate.getOpenRatio(); - - if (openRatio != 0) - $ionicScrollDelegate.$getByHandle('transactions').freezeScroll(true); - else - $ionicScrollDelegate.$getByHandle('transactions').freezeScroll(false); - - $timeout(function() { - $scope.$apply(); - }); - }; - var disableScannerListener = $rootScope.$on('dataScanned', function(event, data) { self.setForm(data); $rootScope.$emit('Local/SetTab', 'send');