From 4f9fac8f136dcfbdd4a9d4696276adfb8c4ce064 Mon Sep 17 00:00:00 2001 From: efernandez Date: Thu, 1 Nov 2018 09:48:45 -0300 Subject: [PATCH] =?UTF-8?q?Implementaci=C3=B3n=20angular=20ladda?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gulpfile.js | 2 +- index.html | 4 ++++ package.json | 4 +++- src/js/app.js | 2 +- src/js/controller.js | 5 ++++- src/views/modal-vendedores.html | 8 +++++++- 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 29ebfa3..f13e7bc 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -41,7 +41,7 @@ gulp.task('uglify', ['templates'], function() { ]), concat('foca-modal-vendedores.js'), replace('src/views/', ''), - replace("['ui.bootstrap', 'focaDirectivas']", '[]'), + replace("['ui.bootstrap', 'focaDirectivas', 'angular-ladda']", '[]'), gulp.dest(paths.tmp), rename('foca-modal-vendedores.min.js'), uglify(), diff --git a/index.html b/index.html index dcb6cb0..068ed24 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,7 @@ + @@ -14,6 +15,9 @@ + + + diff --git a/package.json b/package.json index ef39e06..8901162 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "gulp-pre-commit": "gulp pre-commit", "compile": "gulp uglify", "postinstall": "npm run compile && gulp clean-post-install", - "install-dev": "npm install -D angular bootstrap font-awesome gulp gulp-angular-templatecache gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-clean gulp-replace gulp-uglify jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+https://debo.suite.repo/modulos-npm/foca-directivas" + "install-dev": "npm install -D angular angular-ladda ladda@1.0.6 bootstrap font-awesome gulp gulp-angular-templatecache gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-clean gulp-replace gulp-uglify jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+https://debo.suite.repo/modulos-npm/foca-directivas" }, "pre-commit": [ "gulp-pre-commit" @@ -38,6 +38,7 @@ }, "devDependencies": { "angular": "^1.7.5", + "angular-ladda": "^0.4.3", "bootstrap": "^4.1.3", "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas", "font-awesome": "^4.7.0", @@ -54,6 +55,7 @@ "jasmine-core": "^3.3.0", "jquery": "^3.3.1", "jshint": "^2.9.6", + "ladda": "1.0.6", "pre-commit": "^1.2.2", "pump": "^3.0.0", "ui-bootstrap4": "^3.0.5" diff --git a/src/js/app.js b/src/js/app.js index 8e8d604..1d5f0de 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -1 +1 @@ -angular.module('focaModalVendedores', ['ui.bootstrap', 'focaDirectivas']); +angular.module('focaModalVendedores', ['ui.bootstrap', 'focaDirectivas', 'angular-ladda']); diff --git a/src/js/controller.js b/src/js/controller.js index d38b4d0..c153411 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -9,6 +9,7 @@ angular.module('focaModalVendedores') $scope.filters = ''; $scope.vendedores = []; $scope.primerBusqueda = false; + $scope.searchLoading = false; // pagination $scope.numPerPage = 10; $scope.currentPage = 1; @@ -17,9 +18,11 @@ angular.module('focaModalVendedores') $scope.selectedVendedor = -1; $scope.busquedaPress = function(key) { - if (key === 13) { + if (key === 13) { + $scope.searchLoading = true; focaVendedoresService.getVendedores($scope.filters).then( function(res) { + $scope.searchLoading = false; $scope.primerBusqueda = true; $scope.vendedores = res.data; $scope.search(); diff --git a/src/views/modal-vendedores.html b/src/views/modal-vendedores.html index bf79bee..8979b67 100644 --- a/src/views/modal-vendedores.html +++ b/src/views/modal-vendedores.html @@ -4,6 +4,7 @@