Commit 32f00bd61267ab407d0e8372196fa6e0318d4395

Authored by Pablo Marco del Pont
Exists in master

Merge branch 'master' into 'master'

las coma rompen los cálculos entonces reemplazo por punto porque tenemos que presentar esto rápidp

See merge request modulos-npm/foca-teclado!4
src/js/controller.js
1 angular.module('focaTeclado') 1 angular.module('focaTeclado')
2 .controller('focaTecladoController', [ 2 .controller('focaTecladoController', [
3 '$scope', 3 '$scope',
4 function($scope) { 4 function($scope) {
5 $scope.rows = {}; 5 $scope.rows = {};
6 $scope.rows.alfa = [ 6 $scope.rows.alfa = [
7 ['q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p'], 7 ['q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p'],
8 ['a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'ñ'], 8 ['a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'ñ'],
9 ['z', 'x', 'c', 'v', 'b', 'n', 'm', 9 ['z', 'x', 'c', 'v', 'b', 'n', 'm',
10 {type: 'erase', colspan: 3, text: 'spr'} 10 {type: 'erase', colspan: 3, text: 'spr'}
11 ], 11 ],
12 [ 12 [
13 {type: 'margin', colspan: 1}, 13 {type: 'margin', colspan: 1},
14 {type: 'button', colspan: 6, text: ' '} 14 {type: 'button', colspan: 6, text: ' '}
15 ] 15 ]
16 ]; 16 ];
17 17
18 $scope.rows.numeric = [ 18 $scope.rows.numeric = [
19 [ 19 [
20 {type: 'number', text: '7'}, 20 {type: 'number', text: '7'},
21 {type: 'number', text: '8'}, 21 {type: 'number', text: '8'},
22 {type: 'number', text: '9'} 22 {type: 'number', text: '9'}
23 ], 23 ],
24 [ 24 [
25 {type: 'number', text: '4'}, 25 {type: 'number', text: '4'},
26 {type: 'number', text: '5'}, 26 {type: 'number', text: '5'},
27 {type: 'number', text: '6'} 27 {type: 'number', text: '6'}
28 ], 28 ],
29 [ 29 [
30 {type: 'number', text: '1'}, 30 {type: 'number', text: '1'},
31 {type: 'number', text: '2'}, 31 {type: 'number', text: '2'},
32 {type: 'number', text: '3'} 32 {type: 'number', text: '3'}
33 ], 33 ],
34 [ 34 [
35 {type: 'number', text: '0', colspan: 2}, 35 {type: 'number', text: '0', colspan: 2},
36 {type: 'number', text: '/'} 36 {type: 'number', text: '/'}
37 ], 37 ],
38 [ 38 [
39 {type: 'number', text: ','}, 39 {type: 'number', text: '.'},
40 {type: 'number', text: '*'}, 40 {type: 'number', text: '*'},
41 {type: 'number', text: '+'} 41 {type: 'number', text: '+'}
42 ] 42 ]
43 ]; 43 ];
44 }]); 44 }]);
45 45