fix update on resume
This commit is contained in:
parent
32ae89046d
commit
9abccdba41
4 changed files with 31 additions and 13 deletions
|
|
@ -553,17 +553,27 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
||||||
go.walletHome();
|
go.walletHome();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
self.debouncedUpdate = lodash.throttle(function() {
|
||||||
|
self.updateAll();
|
||||||
|
self.updateTxHistory();
|
||||||
|
}, 4000, {leading: false, trailing: true});
|
||||||
|
|
||||||
|
|
||||||
|
// No need ot listing to Local/Resume since
|
||||||
|
// reconnection and Local/Online will be triggered
|
||||||
lodash.each(['Local/Online', 'Local/Resume'], function(eventName) {
|
lodash.each(['Local/Online', 'Local/Resume'], function(eventName) {
|
||||||
$rootScope.$on(eventName, function(event) {
|
$rootScope.$on(eventName, function(event) {
|
||||||
$log.debug('### Online event');
|
$log.debug('### ' + eventName + ' event');
|
||||||
self.isOffline = false;
|
self.debouncedUpdate();
|
||||||
self.updateAll();
|
|
||||||
self.updateTxHistory();
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$rootScope.$on('Local/Online', function(event) {
|
||||||
|
self.isOffline = false;
|
||||||
|
});
|
||||||
|
|
||||||
$rootScope.$on('Local/Offline', function(event) {
|
$rootScope.$on('Local/Offline', function(event) {
|
||||||
$log.debug('Offline event');
|
$log.debug('### Offline event');
|
||||||
self.isOffline = true;
|
self.isOffline = true;
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$rootScope.$apply();
|
$rootScope.$apply();
|
||||||
|
|
|
||||||
|
|
@ -45,10 +45,22 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
self.resetForm();
|
self.resetForm();
|
||||||
});
|
});
|
||||||
|
|
||||||
var disableResumeListener = $rootScope.$on('Local/Resume', function() {
|
var disableOnlineListener = $rootScope.$on('Local/Online', function() {
|
||||||
self.bindTouchDown();
|
// This is needed then the apps go to sleep
|
||||||
|
$timeout(function() {
|
||||||
|
self.bindTouchDown();
|
||||||
|
}, 2000);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
var disableResumeListener = $rootScope.$on('Local/Resume', function() {
|
||||||
|
// This is needed then the apps go to sleep
|
||||||
|
$timeout(function() {
|
||||||
|
self.bindTouchDown();
|
||||||
|
}, 2000);
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var disableTabListener = $rootScope.$on('Local/TabChanged', function(e, tab) {
|
var disableTabListener = $rootScope.$on('Local/TabChanged', function(e, tab) {
|
||||||
// This will slow down switch, do not add things here!
|
// This will slow down switch, do not add things here!
|
||||||
switch (tab) {
|
switch (tab) {
|
||||||
|
|
@ -68,6 +80,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
disableTabListener();
|
disableTabListener();
|
||||||
disableFocusListener();
|
disableFocusListener();
|
||||||
disableResumeListener();
|
disableResumeListener();
|
||||||
|
disableOnlineListener();
|
||||||
$rootScope.hideMenuBar = false;
|
$rootScope.hideMenuBar = false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,8 @@ angular.element(document).ready(function() {
|
||||||
}, false);
|
}, false);
|
||||||
|
|
||||||
document.addEventListener('resume', function() {
|
document.addEventListener('resume', function() {
|
||||||
|
|
||||||
|
console.log('[init.js.21] RESUME'); //TODO
|
||||||
if (!window.ignoreMobilePause) {
|
if (!window.ignoreMobilePause) {
|
||||||
window.location = '#/cordova/resume';
|
window.location = '#/cordova/resume';
|
||||||
}
|
}
|
||||||
|
|
@ -31,10 +33,6 @@ angular.element(document).ready(function() {
|
||||||
document.addEventListener('offline', function() {
|
document.addEventListener('offline', function() {
|
||||||
window.location = '#/cordova/offline';
|
window.location = '#/cordova/offline';
|
||||||
}, false);
|
}, false);
|
||||||
//
|
|
||||||
// document.addEventListener("online", function() {
|
|
||||||
// window.location = '#/cordoba/online';
|
|
||||||
// }, false);
|
|
||||||
|
|
||||||
// Back button event
|
// Back button event
|
||||||
document.addEventListener('backbutton', function() {
|
document.addEventListener('backbutton', function() {
|
||||||
|
|
|
||||||
|
|
@ -448,9 +448,6 @@ angular
|
||||||
case 'resume':
|
case 'resume':
|
||||||
$rootScope.$emit('Local/Resume');
|
$rootScope.$emit('Local/Resume');
|
||||||
break;
|
break;
|
||||||
// case 'online':
|
|
||||||
// // $scope.$emit('Local/Online');
|
|
||||||
// break;
|
|
||||||
case 'offline':
|
case 'offline':
|
||||||
$rootScope.$emit('Local/Offline');
|
$rootScope.$emit('Local/Offline');
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue