Commit 14375fb0e61942a89fc7240979ce24233ec8b855
Exists in
master
Merge branch 'master' into 'develop'
Master See merge request !86
Showing
4 changed files
Show diff stats
gulpfile.js
1 | -const gulp = require('gulp'); | |
2 | -const sass = require('gulp-sass'); | |
3 | -const concat = require('gulp-concat'); | |
4 | -const rename = require('gulp-rename'); | |
5 | -const uglify = require('gulp-uglify'); | |
6 | -const pump = require('pump'); | |
7 | -const jshint = require('gulp-jshint'); | |
8 | -const replace = require('gulp-replace'); | |
9 | -const connect = require('gulp-connect'); | |
10 | -const watch = require('gulp-watch'); | |
11 | - | |
1 | +const gulp = require('gulp'); | |
2 | +const sass = require('gulp-sass'); | |
3 | +const concat = require('gulp-concat'); | |
4 | +const rename = require('gulp-rename'); | |
5 | +const uglify = require('gulp-uglify'); | |
6 | +const pump = require('pump'); | |
7 | +const jshint = require('gulp-jshint'); | |
8 | +const replace = require('gulp-replace'); | |
9 | +const connect = require('gulp-connect'); | |
10 | +const watch = require('gulp-watch'); | |
11 | +const gulpSequence = require('gulp-sequence') | |
12 | 12 | var paths = { |
13 | 13 | srcHTML : 'src/views/*.html', |
14 | 14 | srcJS : 'src/js/*.js', |
... | ... | @@ -109,4 +109,4 @@ gulp.task('livereload', function() { |
109 | 109 | gulp.watch('index.html', ['reload']); |
110 | 110 | }); |
111 | 111 | |
112 | -gulp.task('default', ['sass', 'webserver', 'livereload', 'watch']); | |
112 | +gulp.task('default', gulpSequence(['sass', 'webserver', 'livereload', 'watch'])); |
index.html
... | ... | @@ -87,6 +87,7 @@ |
87 | 87 | <script src="./node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script> |
88 | 88 | <script src="./node_modules/foca-modal-punto-descarga/dist/foca-modal-punto-descarga.min.js"></script> |
89 | 89 | <script src="./node_modules/foca-modal-remito/dist/foca-modal-remito.min.js"></script> |
90 | + <script src="./node_modules/foca-modal-resumen-cuenta/dist/foca-modal-resumen-cuenta.min.js"></script> | |
90 | 91 | <script src="./node_modules/foca-modal-tarifa-flete/dist/foca-modal-tarifa-flete.min.js"></script> |
91 | 92 | <script src="./node_modules/foca-modal-unidad-medida/dist/foca-modal-unidad-medida.min.js"></script> |
92 | 93 | <script src="./node_modules/foca-nombre-empresa/dist/foca-nombre-empresa.min.js"></script> |
package.json
... | ... | @@ -84,6 +84,7 @@ |
84 | 84 | "foca-modal-precio-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-precio-condiciones.git", |
85 | 85 | "foca-modal-punto-descarga": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-punto-descarga.git", |
86 | 86 | "foca-modal-remito": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-remito.git", |
87 | + "foca-modal-resumen-cuenta": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-resumen-cuenta.git", | |
87 | 88 | "foca-modal-tarifa-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-tarifa-flete.git", |
88 | 89 | "foca-modal-unidad-medida": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-unidad-medida.git", |
89 | 90 | "foca-nombre-empresa": "git+ssh://git@debonline.dyndns.org:npm/foca-nombre-empresa.git", |
... | ... | @@ -92,6 +93,7 @@ |
92 | 93 | "font-awesome": "^4.7.0", |
93 | 94 | "gulp-angular-templatecache": "^2.2.6", |
94 | 95 | "gulp-htmlmin": "^5.0.1", |
96 | + "gulp-sequence": "^1.0.0", | |
95 | 97 | "gulp-uglify": "^3.0.1", |
96 | 98 | "gulp-uglify-es": "^1.0.4", |
97 | 99 | "jquery": "^3.3.1", |
src/js/app.js