Merge branch 'master' into 'master'

Master See merge request !10

Merge branch 'master' into 'master'
Master See merge request !10
Eric Fernandez
2 parents da65afbf2d 17bdcefdde
Showing 2 changed files Show diff stats
src/js/app.js
src/js/controller.js
@@ -3,6 +3,7 @@ angular.module(&#39;focaBotoneraFacturador&#39;, [])
         templateUrl: 'src/views/botonera-facturador.html',
         controller: 'focaBotoneraFacturadorController',
         bindings: { 
-            botones: '<'
+            botones: '<',
+            max: '<'
         }
     });
@@ -5,9 +5,10 @@ angular.module(&#39;focaBotoneraFacturador&#39;)
         function($scope, $window) {
             this.$onInit = function() {
                 $scope.botones = $scope.$ctrl.botones;
+                var max = ($scope.$ctrl.max) ? $scope.$ctrl.max : 12;
  
                 if($window.innerWidth > 576) {
-                    while(($scope.botones.length % 12) !== 0) {
+                    while(($scope.botones.length % max) !== 0) {
                         $scope.botones.push('');
                     }
                 }else {
...	...	@@ -3,6 +3,7 @@ angular.module('focaBotoneraFacturador', [])
3	3	templateUrl: 'src/views/botonera-facturador.html',
4	4	controller: 'focaBotoneraFacturadorController',
5	5	bindings: {
6		- botones: '<'
	6	+ botones: '<',
	7	+ max: '<'
7	8	}
8	9	});
...	...	@@ -5,9 +5,10 @@ angular.module('focaBotoneraFacturador')
5	5	function($scope, $window) {
6	6	this.$onInit = function() {
7	7	$scope.botones = $scope.$ctrl.botones;
	8	+ var max = ($scope.$ctrl.max) ? $scope.$ctrl.max : 12;
8	9
9	10	if($window.innerWidth > 576) {
10		- while(($scope.botones.length % 12) !== 0) {
	11	+ while(($scope.botones.length % max) !== 0) {
11	12	$scope.botones.push('');
12	13	}
13	14	}else {