Merge branch 'master' into 'develop'

Master See merge request !12

Merge branch 'master' into 'develop'
Master See merge request !12
Eric Fernandez
2 parents df49048a53 24c5a8e8a9
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/foca-login.html
@@ -4,6 +4,7 @@ angular.module(&#39;focaLogin&#39;)
         function($scope, focaLoginService, $location, $cookies, focaModalService, md5) {
             $scope.paso = 1;
             $scope.enviar = function() {
+                angular.element('#password').blur();
                 focaLoginService.login({
                     idUsuario: $scope.usuario.idUsuario,
                     clave: md5.createHash($scope.usuario.clave)
@@ -25,7 +26,8 @@ angular.module(&#39;focaLogin&#39;)
                     $scope.$emit('blur');
                 }, function(error) {
                     if (error.status === 401) {
-                        focaModalService.alert('El usuario o la contraseña han sido mal introducidos');
+                        focaModalService
+                            .alert('El usuario o la contraseña han sido mal introducidos');
                     }
  
                     if(error.status === -1) {
@@ -8,20 +8,22 @@
             <input
                 type       = "text"
                 ng-model   = "usuario.idUsuario"
+                ng-focus   = "paso = 1"
                 foca-focus = "paso == 1"
                 ng-keyup   = "$event.keyCode == 13 && irPaso(2)"
-                ladda="loginLoading"
+                ladda      = "loginLoading"
                 teclado-virtual
             />
         </div>
         <div class="login-campo">
             <label>Contraseña</label>
             <input
+                id         = "password"
                 type       = "password"
                 ng-model   = "usuario.clave"
                 foca-focus = "paso == 2"
                 ng-keyup   = "$event.keyCode == 13 && enviar()"
-                ladda="loginLoading"
+                ladda      = "loginLoading"
                 teclado-virtual
             />
         </div>
...	...	@@ -4,6 +4,7 @@ angular.module('focaLogin')
4	4	function($scope, focaLoginService, $location, $cookies, focaModalService, md5) {
5	5	$scope.paso = 1;
6	6	$scope.enviar = function() {
	7	+ angular.element('#password').blur();
7	8	focaLoginService.login({
8	9	idUsuario: $scope.usuario.idUsuario,
9	10	clave: md5.createHash($scope.usuario.clave)
...	...	@@ -25,7 +26,8 @@ angular.module('focaLogin')
25	26	$scope.$emit('blur');
26	27	}, function(error) {
27	28	if (error.status === 401) {
28		- focaModalService.alert('El usuario o la contraseña han sido mal introducidos');
	29	+ focaModalService
	30	+ .alert('El usuario o la contraseña han sido mal introducidos');
29	31	}
30	32
31	33	if(error.status === -1) {
...	...	@@ -8,20 +8,22 @@
8	8	<input
9	9	type = "text"
10	10	ng-model = "usuario.idUsuario"
	11	+ ng-focus = "paso = 1"
11	12	foca-focus = "paso == 1"
12	13	ng-keyup = "$event.keyCode == 13 && irPaso(2)"
13		- ladda="loginLoading"
	14	+ ladda = "loginLoading"
14	15	teclado-virtual
15	16	/>
16	17	</div>
17	18	<div class="login-campo">
18	19	<label>Contraseña</label>
19	20	<input
	21	+ id = "password"
20	22	type = "password"
21	23	ng-model = "usuario.clave"
22	24	foca-focus = "paso == 2"
23	25	ng-keyup = "$event.keyCode == 13 && enviar()"
24		- ladda="loginLoading"
	26	+ ladda = "loginLoading"
25	27	teclado-virtual
26	28	/>
27	29	</div>