Nicolás Guarnieri / wrapper-demo

Download as
Browse Code »

Commit 2df2d5b2b0c1e50341e371dbdc527c849d2cd13e

Authored by Jose Pinto
2 parents b7e460b9fd 8f4c6da6af
Exists in master

Merge branch 'master' into 'master' 

Master(efernandez)

See merge request !75
Showing 6 changed files   Show diff stats
... ... @@ -66,7 +66,7 @@ gulp.task('post-install', function() {
66 66 });
67 67  
68 68 gulp.task('pre-commit', function() {
69   - pump(
  69 + return pump(
70 70 [
71 71 gulp.src(paths.srcJS),
72 72 jshint('.jshintrc'),
... ... @@ -40,7 +40,6 @@
40 40  
41 41 <script src="./node_modules/foca-abm-chofer/dist/foca-abm-chofer.min.js"></script>
42 42 <script src="./node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.min.js"></script>
43   - <script src="./node_modules/foca-abm-sectores/dist/foca-abm-sectores.min.js"></script>
44 43 <script src="./node_modules/foca-abm-vehiculo/dist/foca-abm-vehiculo.min.js"></script>
45 44 <script src="./node_modules/foca-abm-vendedor-cobrador/dist/foca-abm-vendedor-cobrador.min.js"></script>
46 45 <script src="./node_modules/foca-activar-hoja-ruta/dist/foca-activar-hoja-ruta.min.js"></script>
... ... @@ -36,7 +36,6 @@
36 36 "foca-abm-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-chofer.git",
37 37 "foca-abm-plazo-pago": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-plazo-pago.git",
38 38 "foca-abm-precios-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-precios-condiciones.git",
39   - "foca-abm-sectores": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-sectores.git",
40 39 "foca-abm-vehiculo": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-vehiculo.git",
41 40 "foca-abm-vendedor-cobrador": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-vendedor-cobrador.git",
42 41 "foca-activar-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-activar-hoja-ruta.git",
... ... @@ -14,7 +14,6 @@ angular.module(&#39;appWrapperDemo&#39;, [
14 14  
15 15 // MODULOS FOCA
16 16 'focaAbmPreciosCondiciones',
17   - 'focaAbmSectores',
18 17 'focaAbmVehiculo',
19 18 'focaAbmChofer',
20 19 'focaAbmVendedorCobrador',
src/js/controller.js
Diff comments   View file @ 2df2d5b
... ... @@ -19,7 +19,7 @@ angular.module(&#39;appWrapperDemo&#39;)
19 19 $rootScope.$broadcast('usarTeclado', true);
20 20 };
21 21  
22   - $rootScope.$on('focus', function(event) {
  22 + $rootScope.$on('focus', function() {
23 23 if(!$scope.usarTeclado) {
24 24 return;
25 25 }
... ... @@ -29,7 +29,7 @@ angular.module(&#39;appWrapperDemo&#39;)
29 29 $scope.$apply();
30 30 }
31 31 });
32   - $rootScope.$on('blur', function(event) {
  32 + $rootScope.$on('blur', function() {
33 33 $scope.timeout = $timeout(function() {
34 34 $scope.mostrarTeclado = false;
35 35 if(!$scope.$$phase) {
... ... @@ -15,5 +15,8 @@
15 15 <script src="node_modules/foca-abm-vehiculo/dist/foca-abm-vehiculo.min.js"></script>
16 16 <script src="node_modules/foca-abm-vehiculo/dist/foca-abm-vehiculo.spec.js"></script>
17 17  
  18 + <!-- foca-abm-chofer -->
  19 + <script src="node_modules/foca-abm-chofer/dist/foca-abm-chofer.min.js"></script>
  20 + <script src="node_modules/foca-abm-chofer/dist/foca-abm-chofer.spec.js"></script>
18 21 </body>
19 22 </html>