Commit 82e35db006c564e46cf578d14896697e8ec45bac
Exists in
master
Merge branch 'master' into 'master'
Master See merge request modulos-npm/foca-modal!6
Showing
2 changed files
Show diff stats
package.json
| 1 | { | 1 | { |
| 2 | "name": "foca-modal", | 2 | "name": "foca-modal", |
| 3 | "version": "0.0.1", | 3 | "version": "0.0.1", |
| 4 | "description": "Modales de foca", | 4 | "description": "Modales de foca", |
| 5 | "main": "index.js", | 5 | "main": "index.js", |
| 6 | "scripts": { | 6 | "scripts": { |
| 7 | "test": "echo \"Error: no test specified\" && exit 1", | 7 | "test": "echo \"Error: no test specified\" && exit 1", |
| 8 | "gulp-pre-commit": "gulp pre-commit", | 8 | "gulp-pre-commit": "gulp pre-commit", |
| 9 | "compile": "gulp uglify", | 9 | "compile": "gulp uglify", |
| 10 | "postinstall": "npm run compile && gulp clean-post-install", | 10 | "postinstall": "npm run compile && gulp clean-post-install", |
| 11 | "install-dev": "npm install -D angular gulp gulp-angular-templatecache gulp-clean gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify jshint pump" | 11 | "install-dev": "npm install -D angular gulp gulp-angular-templatecache gulp-clean gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify jshint pump" |
| 12 | }, | 12 | }, |
| 13 | "pre-commit": [ | 13 | "pre-commit": [ |
| 14 | "gulp-pre-commit" | 14 | "gulp-pre-commit" |
| 15 | ], | 15 | ], |
| 16 | "repository": { | 16 | "repository": { |
| 17 | "type": "git", | 17 | "type": "git", |
| 18 | "url": "https://192.168.0.11/modulos-npm/foca-modal.git" | 18 | "url": "https://debo.suite.repo/modulos-npm/foca-modal.git" |
| 19 | }, | 19 | }, |
| 20 | "author": "Foca Software", | 20 | "author": "Foca Software", |
| 21 | "license": "ISC", | 21 | "license": "ISC", |
| 22 | "devDependencies": { | 22 | "devDependencies": { |
| 23 | "angular": "^1.7.5", | 23 | "angular": "^1.7.5", |
| 24 | "gulp": "^3.9.1", | 24 | "gulp": "^3.9.1", |
| 25 | "gulp-angular-templatecache": "^2.2.2", | 25 | "gulp-angular-templatecache": "^2.2.2", |
| 26 | "gulp-clean": "^0.4.0", | 26 | "gulp-clean": "^0.4.0", |
| 27 | "gulp-connect": "^5.6.1", | 27 | "gulp-connect": "^5.6.1", |
| 28 | "gulp-htmlmin": "^5.0.1", | 28 | "gulp-htmlmin": "^5.0.1", |
| 29 | "gulp-jshint": "^2.1.0", | 29 | "gulp-jshint": "^2.1.0", |
| 30 | "gulp-rename": "^1.4.0", | 30 | "gulp-rename": "^1.4.0", |
| 31 | "gulp-replace": "^1.0.0", | 31 | "gulp-replace": "^1.0.0", |
| 32 | "gulp-uglify": "^3.0.1", | 32 | "gulp-uglify": "^3.0.1", |
| 33 | "jshint": "^2.9.6", | 33 | "jshint": "^2.9.6", |
| 34 | "pump": "^3.0.0" | 34 | "pump": "^3.0.0" |
| 35 | } | 35 | } |
| 36 | } | 36 | } |
| 37 | 37 |
src/js/service.js
| 1 | angular.module('focaModal') | 1 | angular.module('focaModal') |
| 2 | .service('focaModalService', [ | 2 | .service('focaModalService', [ |
| 3 | '$uibModal', | 3 | '$uibModal', |
| 4 | function($uibModal) { | 4 | function($uibModal) { |
| 5 | return { | 5 | return { |
| 6 | confirm: function(textoModal) { | 6 | confirm: function(textoModal) { |
| 7 | return $uibModal.open({ | 7 | return $uibModal.open({ |
| 8 | templateUrl: 'modal-confirm.html', | 8 | templateUrl: 'modal-confirm.html', |
| 9 | controller: 'focaModalConfirmController', | 9 | controller: 'focaModalConfirmController', |
| 10 | animation: false, | 10 | animation: false, |
| 11 | backdrop: false, | 11 | backdrop: false, |
| 12 | resolve: { textoModal: function() { return textoModal; } } | 12 | resolve: { textoModal: function() { return textoModal; } } |
| 13 | }) | 13 | }) |
| 14 | .result.then( | 14 | .result.then( |
| 15 | function(resultado) { | 15 | function(resultado) { |
| 16 | return resultado; | 16 | return resultado; |
| 17 | } | 17 | } |
| 18 | ); | 18 | ); |
| 19 | }, | 19 | }, |
| 20 | alert: function(textoModal) { | 20 | alert: function(textoModal) { |
| 21 | return $uibModal.open({ | 21 | return $uibModal.open({ |
| 22 | templateUrl: 'modal-alert.html', | 22 | templateUrl: 'modal-alert.html', |
| 23 | controller: 'focaModalAlertController', | 23 | controller: 'focaModalAlertController', |
| 24 | animation: false, | 24 | animation: false, |
| 25 | backdrop: false, | 25 | backdrop: false, |
| 26 | resolve: { textoModal: function() { return textoModal; } } | 26 | resolve: { textoModal: function() { return textoModal; } } |
| 27 | }); | 27 | }) |
| 28 | .result.then( | ||
| 29 | function(resultado) { | ||
| 30 | return resultado; | ||
| 31 | } | ||
| 32 | ) | ||
| 28 | } | 33 | } |
| 29 | }; | 34 | }; |
| 30 | } | 35 | } |
| 31 | ]); | 36 | ]); |
| 32 | 37 |