Merge remote-tracking branch 'upstream/master'

Nicolás Guarnieri
2 parents a756c6a151 f3394c97c9
Showing 3 changed files Show diff stats
gulpfile.js
src/js/controller.js
src/views/foca-login.html
@@ -80,3 +80,7 @@ gulp.task(&#39;webserver&#39;, function() {
 });
  
 gulp.task('default', ['webserver']);
+
+gulp.task('watch', function() {
+    return gulp.watch([paths.srcJS, paths.srcViews], ['uglify']);
+});
@@ -8,9 +8,10 @@ angular.module(&#39;focaLogin&#39;)
                     $cookies.put('idUsuario', $scope.usuario.idUsuario);
                     $cookies.put('token', datos.data.token);
                     $location.path('/');
+                    $scope.$emit('blur');
                 });
             };
-            $scope.irPaso = function(numeroPaso){
+            $scope.irPaso = function(numeroPaso) {
                 $scope.paso = numeroPaso;
             };
         }
@@ -10,6 +10,7 @@
                 ng-model   = "usuario.idUsuario"
                 foca-focus = "paso == 1"
                 ng-keyup   = "$event.keyCode == 13 && irPaso(2)"
+                teclado-virtual
             />
         </div>
         <div class="login-campo">
@@ -19,6 +20,7 @@
                 ng-model   = "usuario.clave"
                 foca-focus = "paso == 2"
                 ng-keyup   = "$event.keyCode == 13 && enviar()"
+                teclado-virtual
             />
         </div>
     </form>
...	...	@@ -80,3 +80,7 @@ gulp.task('webserver', function() {
80	80	});
81	81
82	82	gulp.task('default', ['webserver']);
	83	+
	84	+gulp.task('watch', function() {
	85	+ return gulp.watch([paths.srcJS, paths.srcViews], ['uglify']);
	86	+});
...	...	@@ -8,9 +8,10 @@ angular.module('focaLogin')
8	8	$cookies.put('idUsuario', $scope.usuario.idUsuario);
9	9	$cookies.put('token', datos.data.token);
10	10	$location.path('/');
	11	+ $scope.$emit('blur');
11	12	});
12	13	};
13		- $scope.irPaso = function(numeroPaso){
	14	+ $scope.irPaso = function(numeroPaso) {
14	15	$scope.paso = numeroPaso;
15	16	};
16	17	}
...	...	@@ -10,6 +10,7 @@
10	10	ng-model = "usuario.idUsuario"
11	11	foca-focus = "paso == 1"
12	12	ng-keyup = "$event.keyCode == 13 && irPaso(2)"
	13	+ teclado-virtual
13	14	/>
14	15	</div>
15	16	<div class="login-campo">
...	...	@@ -19,6 +20,7 @@
19	20	ng-model = "usuario.clave"
20	21	foca-focus = "paso == 2"
21	22	ng-keyup = "$event.keyCode == 13 && enviar()"
	23	+ teclado-virtual
22	24	/>
23	25	</div>
24	26	</form>