Commit 0fcfa6da003aa651b1bbb420c9b7c9d7be56def7

Authored by Nicolás Guarnieri
Exists in master

Merge remote-tracking branch 'upstream/master'

... ... @@ -12,6 +12,7 @@ const watch = require('gulp-watch');
12 12 var paths = {
13 13 srcHTML : 'src/views/*.html',
14 14 srcJS : 'src/js/*.js',
  15 + confJS : 'src/etc/develop.js',
15 16 dist : 'dist/',
16 17 distHTML : 'dist/views/'
17 18 };
... ... @@ -19,7 +20,7 @@ var paths = {
19 20 gulp.task('uglify', function() {
20 21 pump(
21 22 [
22   - gulp.src(paths.srcJS),
  23 + gulp.src([paths.srcJS, paths.confJS]),
23 24 concat('wrapper-demo.js'),
24 25 replace('/src/', '/dist/'),
25 26 gulp.dest(paths.dist),
... ... @@ -15,43 +15,44 @@
15 15 <script src="./node_modules/jquery/dist/jquery.min.js"></script>
16 16 <script src="./node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
17 17 <script src="./node_modules/angular/angular.min.js"></script>
18   - <script src="./node_modules/angular-route/angular-route.min.js"></script>
19 18 <script src="./node_modules/angular-cookies/angular-cookies.min.js"></script>
  19 + <script src="./node_modules/angular-i18n/angular-locale_es-ar.js"></script>
  20 + <script src="./node_modules/angular-route/angular-route.min.js"></script>
  21 + <script src="./node_modules/angular-sanitize/angular-sanitize.min.js"></script>
20 22 <script src="./node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script>
21 23 <script src="./node_modules/angular-on-screen-keyboard/dist/angular-on-screen-keyboard.min.js"></script>
22   - <script src="./node_modules/angular-sanitize/angular-sanitize.min.js"></script>
23   - <script src="./node_modules/angular-i18n/angular-locale_es-ar.js"></script>
24 24 <script src="./node_modules/angular-ui-swiper/dist/angular-ui-swiper.js"></script>
25 25 <script src="./node_modules/ladda/dist/spin.min.js"></script>
26 26 <script src="./node_modules/ladda/dist/ladda.min.js"></script>
27 27 <script src="./node_modules/angular-ladda/dist/angular-ladda.min.js"></script>
  28 + <script src="./vendor/cordovaGeolocationModule.min.js"></script>
28 29  
29   - <script src="./node_modules/foca-directivas/dist/foca-directivas.min.js"></script>
30   - <script src="./node_modules/foca-botonera-principal/dist/foca-botonera-principal.min.js"></script>
31   - <script src="./node_modules/foca-turno-apertura/dist/foca-turno-apertura.min.js"></script>
32 30 <script src="./node_modules/foca-abm-plazo-pago/dist/foca-abm-plazo-pago.min.js"></script>
33 31 <script src="./node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.min.js"></script>
34 32 <script src="./node_modules/foca-abm-sectores/dist/foca-abm-sectores.min.js"></script>
  33 + <script src="./node_modules/foca-botonera-principal/dist/foca-botonera-principal.min.js"></script>
  34 + <script src="./node_modules/foca-busqueda-cliente/dist/foca-busqueda-cliente.min.js"></script>
35 35 <script src="./node_modules/foca-crear-nota-pedido/dist/foca-crear-nota-pedido.min.js"></script>
  36 + <script src="./node_modules/foca-directivas/dist/foca-directivas.min.js"></script>
36 37 <script src="./node_modules/foca-login/dist/foca-login.min.js"></script>
37 38 <script src="./node_modules/foca-modal/dist/foca-modal.min.js"></script>
38 39 <script src="./node_modules/foca-modal-busqueda-productos/dist/foca-busqueda-productos.min.js"></script>
39 40 <script src="./node_modules/foca-modal-cotizacion/dist/foca-modal-cotizacion.min.js"></script>
  41 + <script src="./node_modules/foca-modal-domicilio/dist/foca-modal-domicilios.min.js"></script>
40 42 <script src="./node_modules/foca-modal-flete/dist/foca-modal-flete.min.js"></script>
41 43 <script src="./node_modules/foca-modal-moneda/dist/foca-modal-moneda.min.js"></script>
42 44 <script src="./node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script>
43 45 <script src="./node_modules/foca-modal-proveedor/dist/foca-modal-proveedor.min.js"></script>
44 46 <script src="./node_modules/foca-modal-vendedores/dist/foca-modal-vendedores.min.js"></script>
45   - <script src="./node_modules/foca-busqueda-cliente/dist/foca-busqueda-cliente.min.js"></script>
  47 + <script src="./node_modules/foca-seguimiento/dist/foca-seguimiento.min.js"></script>
46 48 <script src="./node_modules/foca-teclado/dist/foca-teclado.min.js"></script>
47   - <script src="./node_modules/foca-modal-domicilio/dist/foca-modal-domicilios.min.js"></script>
  49 + <script src="./node_modules/foca-turno-apertura/dist/foca-turno-apertura.min.js"></script>
  50 + <!-- <script src="cordova.js"></script> -->
48 51  
49   - <!-- BUILD -->
  52 + <!-- <script src="./dist/wrapper-demo.min.js"></script> -->
50 53 <script src="./src/js/app.js"></script>
51 54 <script src="./src/js/controller.js"></script>
52 55 <script src="./src/etc/develop.js"></script>
53   - <!-- /BUILD -->
54   -
55 56 </head>
56 57 <body>
57 58 <style>
... ... @@ -46,6 +46,7 @@
46 46 "foca-modal-precio-condiciones": "git+https://debo.suite.repo/modulos-npm/foca-modal-precio-condiciones.git",
47 47 "foca-modal-proveedor": "git+https://debo.suite.repo/modulos-npm/foca-modal-proveedor.git",
48 48 "foca-modal-vendedores": "git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git",
  49 + "foca-seguimiento": "git+https://debo.suite.repo/modulos-npm/foca-seguimiento.git",
49 50 "foca-teclado": "git+https://debo.suite.repo/modulos-npm/foca-teclado.git",
50 51 "foca-turno-apertura": "git+https://debo.suite.repo/modulos-npm/foca-turno-apertura.git",
51 52 "font-awesome": "^4.7.0",
... ... @@ -24,5 +24,7 @@ angular.module(&#39;appWrapperDemo&#39;, [
24 24 'focaTurnoApertura',
25 25 'ngSanitize',
26 26 'onScreenKeyboard',
27   - 'focaModalDomicilio'
  27 + 'focaModalDomicilio',
  28 + 'cordovaGeolocationModule',
  29 + 'focaSeguimiento'
28 30 ]);
vendor/cordovaGeolocationModule.min.js
... ... @@ -0,0 +1 @@
  1 +var cordovaGeolocationModule=angular.module("cordovaGeolocationModule",[]);cordovaGeolocationModule.constant("cordovaGeolocationConstants",{apiVersion:"1.0.0",cordovaVersion:">=3.4.0"});cordovaGeolocationModule.factory("cordovaGeolocationService",["$rootScope","$log","cordovaGeolocationConstants",function(e,t,n){return{apiVersion:function(){t.debug("cordovaGeolocationService.apiVersion.");return n.apiVersion},cordovaVersion:function(){t.debug("cordovaGeolocationService.cordovaVersion.");return n.cordovaVersion},checkGeolocationAvailability:function(){t.debug("cordovaGeolocationService.checkGeolocationAvailability.");if(!navigator.geolocation){t.warn("Geolocation API is not available.");return false}return true},getCurrentPosition:function(n,r,i){t.debug("cordovaGeolocationService.getCurrentPosition.");if(!this.checkGeolocationAvailability()){return}navigator.geolocation.getCurrentPosition(function(t){e.$apply(n(t))},function(t){e.$apply(r(t))},i)},watchPosition:function(n,r,i){t.debug("cordovaGeolocationService.watchPosition.");if(!this.checkGeolocationAvailability()){return}return navigator.geolocation.watchPosition(function(t){e.$apply(n(t))},function(t){e.$apply(r(t))},i)},clearWatch:function(e){t.debug("cordovaGeolocationService.clearWatch.");if(!this.checkGeolocationAvailability()){return}navigator.geolocation.clearWatch(e)}}}])
0 2 \ No newline at end of file