anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

close search view when going to preferences

Browse source
This commit is contained in:
Gabriel Bazán 2016-02-23 12:00:46 -03:00
commit f0e08e94c6
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/controllers/index.js
View file

@ -846,9 +846,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.setCompactTxHistory();
}
if (historyUpdateInProgress[walletId])
if (historyUpdateInProgress[walletId])
return;
historyUpdateInProgress[walletId] = true;
function getNewTxs(newTxs, skip, i_cb) {
@ -1237,10 +1237,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.setAddressbook(ab);
});
$rootScope.$on('Local/Searching', function(event, val) {
self.isSearching = val;
});
// UX event handlers
$rootScope.$on('Local/ColorUpdated', function(event) {
self.updateColor();

4
src/js/controllers/walletHome.js
View file

@ -24,7 +24,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
ret.isMobile = isMobile.any();
ret.isWindowsPhoneApp = isMobile.Windows() && isCordova;
var vanillaScope = ret;
this.isSearching = false;
$rootScope.$emit('Local/Searching', false);
var disableScannerListener = $rootScope.$on('dataScanned', function(event, data) {
self.setForm(data);
@ -52,7 +53,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
self.addr = null;
self.resetForm();
$scope.search = '';
$rootScope.$emit('Local/Searching', false);
if (profileService.focusedClient) {
self.setAddress();