Skip to content

Commit

Permalink
Merge pull request mozilla-b2g#9888 from gaye/bug-866746-followup
Browse files Browse the repository at this point in the history
Bug 866746 - Fix lint errors introduced by 1419f0 r=RudyLu
  • Loading branch information
Gareth Aye committed May 20, 2013
2 parents 3854d20 + 2f87e6b commit 26701c8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 3 additions & 2 deletions apps/keyboard/js/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -1302,7 +1302,8 @@ const Keyboards = {
], [
{ value: 'a' }, { value: 's' }, { value: 'd' }, { value: 'f' },
{ value: 'g' } , { value: 'h' }, { value: 'j' }, { value: 'k' },
{ value: 'l' }, { value: 'ç' }, { value: "'", keyCode: 39, hidden: ['email', 'url'] },
{ value: 'l' }, { value: 'ç' },
{ value: "'", keyCode: 39, hidden: ['email', 'url'] },
{ value: ':', visible: ['url']}, { value: '_', visible: ['email']}
], [
{ value: '⇪', ratio: 1.5, keyCode: KeyEvent.DOM_VK_CAPS_LOCK },
Expand All @@ -1327,7 +1328,7 @@ const Keyboards = {
'8': '8è 8a 8é',
'9': '9è 9a 9é',
'€': '$ £ ¥ R$',
'-': '—_',
'-': '—_',
'?': '¿',
'"': '«»',
'.': ',;:·…',
Expand Down
3 changes: 2 additions & 1 deletion apps/keyboard/js/render.js
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,8 @@ const IMERender = (function() {
for (var k = 0, key; key = keys[k]; k += 1) {
ratio = layout.keys[r][k].ratio || 1;
// divide by 10 to convert the unit from px to rem
key.style.width = Math.floor(placeHolderWidth * ratio) / changeScale + 'rem';
key.style.width =
Math.floor(placeHolderWidth * ratio) / changeScale + 'rem';

// to get the visual width/height of the key
// for better proximity info
Expand Down

0 comments on commit 26701c8

Please sign in to comment.