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

Glidera: Fix padding and close modal with the back button or swipe-right

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-01-11 17:07:39 -03:00
commit 7b3b108026
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/glidera.html
View file

@ -6,7 +6,7 @@
</div> </div>
<div class="content glidera" ng-controller="glideraController as glidera"> <div class="content glidera p20b" ng-controller="glideraController as glidera">
<div class="onGoingProcess" ng-show="glidera.loading || index.glideraLoading"> <div class="onGoingProcess" ng-show="glidera.loading || index.glideraLoading">
<div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}"> <div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">

2
public/views/modals/glidera-tx-details.html
View file

@ -30,7 +30,7 @@
</div> </div>
</div> </div>
<ul class="no-bullet size-14 m0"> <ul class="no-bullet size-14">
<li class="line-b p10 oh"> <li class="line-b p10 oh">
<span class="text-gray">Status</span> <span class="text-gray">Status</span>

13
src/js/controllers/glidera.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('glideraController', angular.module('copayApp.controllers').controller('glideraController',
function($scope, $timeout, $modal, profileService, configService, storageService, glideraService, isChromeApp, animationService) { function($rootScope, $scope, $timeout, $modal, profileService, configService, storageService, glideraService, isChromeApp, animationService, lodash) {
window.ignoreMobilePause = true; window.ignoreMobilePause = true;
@ -37,6 +37,7 @@ angular.module('copayApp.controllers').controller('glideraController',
}; };
this.openTxModal = function(token, tx) { this.openTxModal = function(token, tx) {
$rootScope.modalOpened = true;
var self = this; var self = this;
var config = configService.getSync().wallet.settings; var config = configService.getSync().wallet.settings;
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
@ -50,9 +51,9 @@ angular.module('copayApp.controllers').controller('glideraController',
$scope.tx = tx; $scope.tx = tx;
}); });
$scope.cancel = function() { $scope.cancel = lodash.debounce(function() {
$modalInstance.dismiss('cancel'); $modalInstance.dismiss('cancel');
}; }, 0, 1000);
}; };
@ -62,7 +63,13 @@ angular.module('copayApp.controllers').controller('glideraController',
controller: ModalInstanceCtrl, controller: ModalInstanceCtrl,
}); });
var disableCloseModal = $rootScope.$on('closeModal', function() {
modalInstance.dismiss('cancel');
});
modalInstance.result.finally(function() { modalInstance.result.finally(function() {
$rootScope.modalOpened = false;
disableCloseModal();
var m = angular.element(document.getElementsByClassName('reveal-modal')); var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass(animationService.modalAnimated.slideOutRight); m.addClass(animationService.modalAnimated.slideOutRight);
}); });