Skip to content
Snippets Groups Projects
Commit f7e59064 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[fix] New invitation freeze, when open from the invitation popover

parent 6663dabe
No related branches found
No related tags found
No related merge requests found
......@@ -230,7 +230,9 @@ function InvitationsController($scope, $q, $ionicPopover, $state, $timeout, UIUt
$scope.showNewInvitationModal = function() {
$scope.hideActionsPopover();
return esModals.showNewInvitation({});
return $timeout(function() {
return esModals.showNewInvitation({})
}, 500); // Timeout need, to avoid freeze
};
/* -- Popover -- */
......@@ -368,7 +370,7 @@ function NewInvitationModalController($scope, $q, Modals, UIUtils, csWallet, esH
}
})
.catch(function(err){
if (err == 'CANCELLED') return $scope.cancel(); // close the modal
if (err === 'CANCELLED') return $scope.cancel(); // close the modal
UIUtils.onError('ERROR.LOGIN_FAILED')(err);
});
};
......
......@@ -94,11 +94,14 @@
</div>
<div class="padding hidden-xs text-right">
<button class="button button-small button-clear button-dark ink"
<button class="button button-clear button-dark ink"
tabindex="-1"
ng-click="cancel()" type="button" translate>COMMON.BTN_CANCEL
</button>
<button class="button button-small button-positive ink" type="submit">
{{'COMMON.BTN_SEND' | translate}}
<button class="button button-positive ink"
tabindex="8"
type="submit" translate>
TRANSFER.BTN_SEND
</button>
</div>
</form>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment