Merge branch 'master' into 'master'

Master (pmarco) See merge request modulos-npm/foca-modal!7

Merge branch 'master' into 'master'
Master (pmarco) See merge request modulos-npm/foca-modal!7
Eric Fernandez
2 parents 82e35db006 1baa4e83fb
Showing 3 changed files Show diff stats
package.json
src/views/modal-alert.html
src/views/modal-confirm.html
@@ -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 gulp gulp-angular-templatecache gulp-clean gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify jshint pump"
+    "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 git+https://debo.suite.repo/modulos-npm/foca-directivas.git"
   },
   "pre-commit": [
     "gulp-pre-commit"
@@ -19,10 +19,14 @@
   },
   "author": "Foca Software",
   "license": "ISC",
+  "peerDependencies": {
+    "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git"
+  },
   "devDependencies": {
     "angular": "^1.7.5",
+    "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
     "gulp": "^3.9.1",
-    "gulp-angular-templatecache": "^2.2.2",
+    "gulp-angular-templatecache": "^2.2.3",
     "gulp-clean": "^0.4.0",
     "gulp-connect": "^5.6.1",
     "gulp-htmlmin": "^5.0.1",
@@ -7,5 +7,5 @@
     </p>
 </div>
 <div class="modal-footer">
-    <button class="btn btn-info" ng-click="aceptar()">Aceptar</button>
+    <button class="btn btn-info" ng-click="aceptar()" foca-focus="true">Aceptar</button>
 </div>
@@ -7,6 +7,6 @@
     </p>
 </div>
 <div class="modal-footer">
-    <button class="btn btn-danger" ng-click="aceptar()">Aceptar</button>
+    <button class="btn btn-danger" ng-click="aceptar()" foca-focus="true">Aceptar</button>
     <button class="btn btn-default" ng-click="cancelar()">Cancelar</button>
 </div>
...	...	@@ -8,7 +8,7 @@
8	8	"gulp-pre-commit": "gulp pre-commit",
9	9	"compile": "gulp uglify",
10	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 git+https://debo.suite.repo/modulos-npm/foca-directivas.git"
12	12	},
13	13	"pre-commit": [
14	14	"gulp-pre-commit"
...	...	@@ -19,10 +19,14 @@
19	19	},
20	20	"author": "Foca Software",
21	21	"license": "ISC",
	22	+ "peerDependencies": {
	23	+ "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git"
	24	+ },
22	25	"devDependencies": {
23	26	"angular": "^1.7.5",
	27	+ "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
24	28	"gulp": "^3.9.1",
25		- "gulp-angular-templatecache": "^2.2.2",
	29	+ "gulp-angular-templatecache": "^2.2.3",
26	30	"gulp-clean": "^0.4.0",
27	31	"gulp-connect": "^5.6.1",
28	32	"gulp-htmlmin": "^5.0.1",
...	...	@@ -7,5 +7,5 @@
7	7	</p>
8	8	</div>
9	9	<div class="modal-footer">
10		- <button class="btn btn-info" ng-click="aceptar()">Aceptar</button>
	10	+ <button class="btn btn-info" ng-click="aceptar()" foca-focus="true">Aceptar</button>
11	11	</div>
...	...	@@ -7,6 +7,6 @@
7	7	</p>
8	8	</div>
9	9	<div class="modal-footer">
10		- <button class="btn btn-danger" ng-click="aceptar()">Aceptar</button>
	10	+ <button class="btn btn-danger" ng-click="aceptar()" foca-focus="true">Aceptar</button>
11	11	<button class="btn btn-default" ng-click="cancelar()">Cancelar</button>
12	12	</div>