Merge branch 'master' into 'master'

Master See merge request !8

Merge branch 'master' into 'master'
Master See merge request !8
Nicolás Guarnieri
2 parents 2b71bfcc2b b155399b40
Showing 2 changed files Show diff stats
src/js/service.js
src/views/botonera-lateral.html
@@ -2,6 +2,7 @@ angular.module(&#39;focaBotoneraLateral&#39;)
     .service('focaBotoneraLateralService', function() {
  
         this.botones = {
+            teclado: true,
             salir: false,
             cancelar: false,
             pausar: false,
@@ -12,6 +13,9 @@ angular.module(&#39;focaBotoneraLateral&#39;)
             custom: []
         };
  
+        this.showTeclado = function(value) {
+            this.botones.teclado = value;
+        };
         this.showSalir = function(value) {
             this.botones.custom = [];
             this.botones.salir = value;
@@ -61,7 +61,7 @@
         </div>
     </div>
 </div>
-<div class="container botonera-lateral teclado">
+<div class="container botonera-lateral teclado" ng-show="botones.teclado">
         <div class="row">
             <div class="col-auto my-2 col-2 offset-10 d-none d-md-flex" style="min-height: 176px">
                 <div class="px-2 mt-auto">
...	...	@@ -2,6 +2,7 @@ angular.module('focaBotoneraLateral')
2	2	.service('focaBotoneraLateralService', function() {
3	3
4	4	this.botones = {
	5	+ teclado: true,
5	6	salir: false,
6	7	cancelar: false,
7	8	pausar: false,
...	...	@@ -12,6 +13,9 @@ angular.module('focaBotoneraLateral')
12	13	custom: []
13	14	};
14	15
	16	+ this.showTeclado = function(value) {
	17	+ this.botones.teclado = value;
	18	+ };
15	19	this.showSalir = function(value) {
16	20	this.botones.custom = [];
17	21	this.botones.salir = value;
...	...	@@ -61,7 +61,7 @@
61	61	</div>
62	62	</div>
63	63	</div>
64		-<div class="container botonera-lateral teclado">
	64	+<div class="container botonera-lateral teclado" ng-show="botones.teclado">
65	65	<div class="row">
66	66	<div class="col-auto my-2 col-2 offset-10 d-none d-md-flex" style="min-height: 176px">
67	67	<div class="px-2 mt-auto">