From 4431c2c8d85175f546d6785d9343da9227725477 Mon Sep 17 00:00:00 2001 From: Pablo Marco del Pont Date: Tue, 6 Nov 2018 16:04:24 -0300 Subject: [PATCH] =?UTF-8?q?Cambios=20seg=C3=BAn=20codereview.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/angular-on-screen-keyboard-directive.js | 37 ++++++++++++++++---------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/src/js/angular-on-screen-keyboard-directive.js b/src/js/angular-on-screen-keyboard-directive.js index 704610c..c597cd1 100644 --- a/src/js/angular-on-screen-keyboard-directive.js +++ b/src/js/angular-on-screen-keyboard-directive.js @@ -15,11 +15,11 @@ angular.module('onScreenKeyboard', ['ngSanitize']) if (!ctrl.rows) { ctrl.rows = [ - ['1', '2', '3','4','5','6','7','8', '9', '0', { + ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0', { type: 'erase', colspan: 2, text: '⇐' }], - ['q','w','e','r','t','y','u','i','o','p','@'], - ['a','s','d','f','g','h','j','k','l','-','_', {type: 'margin'}], + ['q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '@'], + ['a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', '-', '_', {type: 'margin'}], [ {type: 'shift', upperCase: '⇓', lowerCase: '⇑'}, 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', @@ -30,23 +30,28 @@ angular.module('onScreenKeyboard', ['ngSanitize']) } ctrl.getText = function(key) { - if (key.type === 'margin') + if (key.type === 'margin') { return ''; + } var val = ''; - if (key.text) + if (key.text) { val = key.text; - else if (key.lowerCase && !ctrl.isUpperCase) + } + else if (key.lowerCase && !ctrl.isUpperCase) { val = key.lowerCase; - else if (key.upperCase && ctrl.isUpperCase) + } + else if (key.upperCase && ctrl.isUpperCase) { val = key.upperCase; + } else { val = ctrl.isUpperCase ? key.toUpperCase() : key.toLowerCase(); } - if (val && val.indexOf('&') > -1) + if (val && val.indexOf('&') > -1) { return $sce.trustAsHtml(val); + } return val; }; @@ -66,8 +71,9 @@ angular.module('onScreenKeyboard', ['ngSanitize']) ctrl.printKeyStroke = function(key, event) { - if (!ctrl.lastInputCtrl) + if (!ctrl.lastInputCtrl) { return; + } ctrl.startPos = ctrl.lastInputCtrl.selectionStart; ctrl.endPos = ctrl.lastInputCtrl.selectionEnd; @@ -101,8 +107,9 @@ angular.module('onScreenKeyboard', ['ngSanitize']) }; ctrl.eraseKeyStroke = function() { - if (!ctrl.lastInputCtrl) + if (!ctrl.lastInputCtrl) { return; + } var hasSel = ctrl.startPos !== ctrl.endPos; @@ -132,16 +139,18 @@ angular.module('onScreenKeyboard', ['ngSanitize']) ctrl.isUpperCase = true; return; } - else if (ctrl.lastInputCtrl.className && ctrl.isUpperCase) + else if (ctrl.lastInputCtrl.className && ctrl.isUpperCase) { ctrl.isUpperCase = true; + } else if (angular.element(ctrl.lastInputCtrl).val().length === 0) { ctrl.isUpperCase = true; } else if ( angular.element(ctrl.lastInputCtrl).val().slice(-1) === ' ' && !ctrl.isUpperCase && attr.uppercaseAllWords !== undefined - ) + ) { ctrl.isUpperCase = true; + } else{ ctrl.isUpperCase = true; } @@ -183,8 +192,8 @@ angular.module('onScreenKeyboard', ['ngSanitize']) $timeout(function() { ctrl.isUpperCase = true; - },0); + }, 0); }, templateUrl: 'src/views/angular-on-screen-keyboard.html' }; - }]); \ No newline at end of file + }]); -- 1.9.1