Commit e2deddda0d0893eaf7dbc625030093cfa4a146c3
1 parent
632b395e
Exists in
master
and in
2 other branches
Ticket #92: Fix back button behavior
Showing
4 changed files
with
11 additions
and
4 deletions
Show diff stats
ConfJuvApp/builds/confjuv-dev.apk
No preview for this file type
ConfJuvApp/www/html/_login.html
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | 3 | ||
| 4 | <!-- Login first screen --> | 4 | <!-- Login first screen --> |
| 5 | 5 | ||
| 6 | - <div ng-hide="loginFormDisplayed || registerFormDisplayed"> | 6 | + <div ng-hide="loginFormDisplayed || registerFormDisplayed" id="home-screen"> |
| 7 | <h1 class="title"> | 7 | <h1 class="title"> |
| 8 | <span>Entrar</span> | 8 | <span>Entrar</span> |
| 9 | </h1> | 9 | </h1> |
| @@ -31,7 +31,7 @@ | @@ -31,7 +31,7 @@ | ||
| 31 | 31 | ||
| 32 | <!-- Login form --> | 32 | <!-- Login form --> |
| 33 | 33 | ||
| 34 | - <form ng-submit="Login(data)" ng-show="loginFormDisplayed"> | 34 | + <form ng-submit="Login(data)" ng-show="loginFormDisplayed" id="login-form"> |
| 35 | <h1 class="title"> | 35 | <h1 class="title"> |
| 36 | <span>Entrar</span> | 36 | <span>Entrar</span> |
| 37 | <a class="back icon-left ion-reply" ng-click="backToLoginHome()">Voltar</a> | 37 | <a class="back icon-left ion-reply" ng-click="backToLoginHome()">Voltar</a> |
| @@ -62,7 +62,7 @@ | @@ -62,7 +62,7 @@ | ||
| 62 | 62 | ||
| 63 | <!-- Register form --> | 63 | <!-- Register form --> |
| 64 | 64 | ||
| 65 | - <form ng-submit="Register(data)" ng-show="registerFormDisplayed" class="register-form" novalidate> | 65 | + <form ng-submit="Register(data)" ng-show="registerFormDisplayed" class="register-form" novalidate id="register-form"> |
| 66 | <h1 class="title"> | 66 | <h1 class="title"> |
| 67 | <span>Registrar</span> | 67 | <span>Registrar</span> |
| 68 | <a class="back icon-left ion-reply" ng-click="backToLoginHome()">Voltar</a> | 68 | <a class="back icon-left ion-reply" ng-click="backToLoginHome()">Voltar</a> |
ConfJuvApp/www/index.html
| @@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
| 30 | <body ng-app="confjuvapp" ng-controller="ProposalCtrl" ng-init="init()" ng-class="{ 'logged-in': loggedIn, 'large': largeScreen }" animation="slide-left-right-ios7"> | 30 | <body ng-app="confjuvapp" ng-controller="ProposalCtrl" ng-init="init()" ng-class="{ 'logged-in': loggedIn, 'large': largeScreen }" animation="slide-left-right-ios7"> |
| 31 | 31 | ||
| 32 | <ion-view ng-show="introDisplayed"> | 32 | <ion-view ng-show="introDisplayed"> |
| 33 | - <ng-include src="'html/_intro.html'"></ng-include> | 33 | + <ng-include src="'html/_intro.html?1'"></ng-include> |
| 34 | </ion-view> | 34 | </ion-view> |
| 35 | 35 | ||
| 36 | <ion-side-menus id="body" ng-show="!introDisplayed"> | 36 | <ion-side-menus id="body" ng-show="!introDisplayed"> |
ConfJuvApp/www/js/utils.js
| @@ -87,3 +87,10 @@ var ConfJuvAppUtils = { | @@ -87,3 +87,10 @@ var ConfJuvAppUtils = { | ||
| 87 | return window.localStorage['saw_intro']; | 87 | return window.localStorage['saw_intro']; |
| 88 | } | 88 | } |
| 89 | }; | 89 | }; |
| 90 | + | ||
| 91 | +document.addEventListener('backbutton', function(event) { | ||
| 92 | + if ($('#login-modal').is(':visible')) { | ||
| 93 | + event.preventDefault(); | ||
| 94 | + navigator.app.exitApp(); | ||
| 95 | + } | ||
| 96 | +}); |