Merge branch 'master' into 'master'

Master(efernandez) See merge request !12

Merge branch 'master' into 'master'
Master(efernandez) See merge request !12
Eric Fernandez
2 parents ad1f83ff27 b57e4439bb
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -2,11 +2,13 @@ angular.module(&#39;focaBotoneraFacturador&#39;)
     .controller('focaBotoneraFacturadorController', [
         '$scope',
         '$window',
-        function($scope, $window) {
+        'APP',
+        function($scope, $window, APP) {
             this.$onInit = function() {
                 $scope.botones = $scope.$ctrl.botones;
+                //TODO: controlar que no se estiren los botones
+                if(APP) return;
                 var max = ($scope.$ctrl.max) ? $scope.$ctrl.max : 12;
-
                 if($window.innerWidth > 576) {
                     while(($scope.botones.length % max) !== 0) {
                         $scope.botones.push('');
...	...	@@ -2,11 +2,13 @@ angular.module('focaBotoneraFacturador')
2	2	.controller('focaBotoneraFacturadorController', [
3	3	'$scope',
4	4	'$window',
5		- function($scope, $window) {
	5	+ 'APP',
	6	+ function($scope, $window, APP) {
6	7	this.$onInit = function() {
7	8	$scope.botones = $scope.$ctrl.botones;
	9	+ //TODO: controlar que no se estiren los botones
	10	+ if(APP) return;
8	11	var max = ($scope.$ctrl.max) ? $scope.$ctrl.max : 12;
9		-
10	12	if($window.innerWidth > 576) {
11	13	while(($scope.botones.length % max) !== 0) {
12	14	$scope.botones.push('');