From 40803c651d590d079b6eeb1de1aa33d9e5fcc466 Mon Sep 17 00:00:00 2001 From: Jose Pinto Date: Wed, 19 Dec 2018 13:02:59 -0300 Subject: [PATCH] z-index solo en boton "Teclado", agrego boton cancelar --- src/js/controller.js | 9 +++- src/js/service.js | 15 ++++-- src/views/botonera-lateral.html | 102 +++++++++++++++++++++++++--------------- 3 files changed, 82 insertions(+), 44 deletions(-) diff --git a/src/js/controller.js b/src/js/controller.js index 23f735a..c7c1d28 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -2,10 +2,11 @@ angular.module('focaBotoneraLateral') .controller('focaBotoneraLateralController', [ '$scope', '$location', + '$window', 'focaBotoneraLateralService', - function($scope, $location, focaBotoneraLateralService) { + function($scope, $location, $window, focaBotoneraLateralService) { - $scope.service = focaBotoneraLateralService.variables; + $scope.botones = focaBotoneraLateralService.botones; $scope.cambioUsoTeclado = function() { $scope.$parent.cambioUsoTeclado(); @@ -14,4 +15,8 @@ angular.module('focaBotoneraLateral') $scope.salir = function() { $location.path('/'); }; + + $scope.cancelar = function() { + $window.history.back(); + }; }]); diff --git a/src/js/service.js b/src/js/service.js index 9c34ea8..e74c757 100644 --- a/src/js/service.js +++ b/src/js/service.js @@ -1,22 +1,27 @@ angular.module('focaBotoneraLateral') .service('focaBotoneraLateralService', function() { - this.variables = { + this.botones = { salir: false, + cancelar: false, pausar: false, guardar: false, funcionGuardar: undefined }; this.showSalir = function(value) { - this.variables.salir = value; + this.botones.salir = value; }; this.showPausar = function(value) { - this.variables.pausar = value; + this.botones.pausar = value; + }; + this.showCancelar = function(value, funcion) { + this.botones.cancelar = value; + if(value) this.botones.funcionCancelar = funcion; }; this.showGuardar = function(value, funcion) { - this.variables.guardar = value; - if(value) this.variables.funcionGuardar = funcion; + this.botones.guardar = value; + if(value) this.botones.funcionGuardar = funcion; }; }); diff --git a/src/views/botonera-lateral.html b/src/views/botonera-lateral.html index ed37af1..6721672 100644 --- a/src/views/botonera-lateral.html +++ b/src/views/botonera-lateral.html @@ -1,42 +1,70 @@
- - - -
- +
+
+
+
+ + + + +
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
\ No newline at end of file -- 1.9.1