Merge branch 'master' into 'master'

teclado virtual funcionando See merge request !1

Merge branch 'master' into 'master'
teclado virtual funcionando See merge request !1
Eric Fernandez
2 parents 346613805a 78c9ddf0e7
Showing 2 changed files Show diff stats
package.json
src/views/modal-tarifa-flete.html
@@ -8,21 +8,21 @@
     "gulp-pre-commit": "gulp pre-commit",
     "compile": "gulp uglify",
     "postinstall": "npm run compile && gulp clean-post-install",
-    "install-dev": "npm install -D angular font-awesome pump jquery bootstrap ui-bootstrap4 jshint gulp gulp-uglify gulp-concat gulp-htmlmin gulp-rename gulp-uglify gulp-jshint gulp-replace gulp-connect gulp-clean gulp-angular-templatecache git+https://debo.suite.repo/modulos-npm/foca-directivas.git"
+    "install-dev": "npm install -D angular font-awesome pump jquery bootstrap ui-bootstrap4 jshint gulp gulp-uglify gulp-concat gulp-htmlmin gulp-rename gulp-uglify gulp-jshint gulp-replace gulp-connect gulp-clean gulp-angular-templatecache git+http://git.focasoftware.com/npm/foca-directivas.git"
   },
   "pre-commit": [
     "gulp-pre-commit"
   ],
   "repository": {
     "type": "git",
-    "url": "https://debo.suite.repo/modulos-npm/foca-modal-tarifa-flete.git"
+    "url": "http://git.focasoftware.com/npm/foca-modal-tarifa-flete.git"
   },
   "author": "Foca Software",
   "license": "ISC",
   "devDependencies": {
     "angular": "^1.7.5",
     "bootstrap": "^4.1.3",
-    "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
+    "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git",
     "font-awesome": "^4.7.0",
     "gulp": "^3.9.1",
     "gulp-angular-templatecache": "^2.2.2",
@@ -19,6 +19,7 @@
                             ng-model="parametrosTarifaFlete.costo"
                             foca-focus="true"
                             ng-keypress="$event.keyCode == 13 && !validar() && aceptar()"
+                            teclado-virtual
                         />
                     </div>
                 </div>
...	...	@@ -8,21 +8,21 @@
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 font-awesome pump jquery bootstrap ui-bootstrap4 jshint gulp gulp-uglify gulp-concat gulp-htmlmin gulp-rename gulp-uglify gulp-jshint gulp-replace gulp-connect gulp-clean gulp-angular-templatecache git+https://debo.suite.repo/modulos-npm/foca-directivas.git"
	11	+ "install-dev": "npm install -D angular font-awesome pump jquery bootstrap ui-bootstrap4 jshint gulp gulp-uglify gulp-concat gulp-htmlmin gulp-rename gulp-uglify gulp-jshint gulp-replace gulp-connect gulp-clean gulp-angular-templatecache git+http://git.focasoftware.com/npm/foca-directivas.git"
12	12	},
13	13	"pre-commit": [
14	14	"gulp-pre-commit"
15	15	],
16	16	"repository": {
17	17	"type": "git",
18		- "url": "https://debo.suite.repo/modulos-npm/foca-modal-tarifa-flete.git"
	18	+ "url": "http://git.focasoftware.com/npm/foca-modal-tarifa-flete.git"
19	19	},
20	20	"author": "Foca Software",
21	21	"license": "ISC",
22	22	"devDependencies": {
23	23	"angular": "^1.7.5",
24	24	"bootstrap": "^4.1.3",
25		- "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
	25	+ "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git",
26	26	"font-awesome": "^4.7.0",
27	27	"gulp": "^3.9.1",
28	28	"gulp-angular-templatecache": "^2.2.2",
...	...	@@ -19,6 +19,7 @@
19	19	ng-model="parametrosTarifaFlete.costo"
20	20	foca-focus="true"
21	21	ng-keypress="$event.keyCode == 13 && !validar() && aceptar()"
	22	+ teclado-virtual
22	23	/>
23	24	</div>
24	25	</div>