Merge pull request #24080 from RudyLu/keyboard/Bug1053672-symbol_refi…

…nement Bug 1053672 - Refine the symbol panel. r=timdream.
mozilla-b2g · Sep 18, 2014 · 879bd62 · 879bd62
2 parents 4e4b871 + 14ee798
commit 879bd62
Show file tree

Hide file tree

Showing 25 changed files with 373 additions and 298 deletions.
diff --git a/apps/keyboard/js/keyboard/layout_loader.js b/apps/keyboard/js/keyboard/layout_loader.js
@@ -22,9 +22,12 @@ Keyboards.defaultLayout = {
         '8': ['⁸'],
         '9': ['⁹'],
         '0': ['⁰', 'º'],
-        '$': ['¥', '€', '£', 'R$', '¢', '₠'],
+        '$': [ '€', '£', '¢', '¥'],
+        '"': ['“', '”'],
+        '\'':['‘', '’'],
         '?': ['¿'],
-        '!': ['¡']
+        '!': ['¡'],
+        '+': ['-', '×', '÷', '±']
       },
       keys: [
         [
@@ -49,7 +52,7 @@ Keyboards.defaultLayout = {
           },
           { value: ':' },
           { value: ';' }, { value: '"' },
-          { value: '\'' }, { value: '?' }, { value: '!' },
+          { value: '\'' }, { value: '!' }, { value: '?' },
           { value: '⌫', ratio: 1.5, keyCode: KeyboardEvent.DOM_VK_BACK_SPACE }
         ], [
           { value: '&nbsp', ratio: 8, keyCode: KeyboardEvent.DOM_VK_SPACE },
@@ -59,16 +62,16 @@ Keyboards.defaultLayout = {
     },
     { /* The 2nd page, used to be called 'symbolLayout' */
       alt: {
-        '+': '±'
+        '+': ['-', '×', '÷', '±'],
+        '®': ['™']
       },
       keys: [
         [
-          { value: '¥' }, { value: '€' }, { value: '£' }, { value: '¢' },
-          { value: '₠' }, { value: '%' }, { value: '©' }, { value: '®' },
+          { value: '€' }, { value: '£' }, { value: '¢' }, { value: '¥' },
+          { value: '%' }, { value: '©' }, { value: '®' }, { value: '·' },
           { value: '|' }, { value: '\\' }
         ], [
-          { value: '~' }, { value: '°C', compositeKey: '°C' },
-          { value: '°F', compositeKey: '°F' }, { value: '°' },
+          { value: '~' }, { value: '℃' }, { value: '℉' }, { value: '°' },
           { value: '<' }, { value: '>' }, { value: '[' }, { value: ']' },
           { value: '{' }, { value: '}' }
         ], [
@@ -78,7 +81,7 @@ Keyboards.defaultLayout = {
             targetPage: 1
           },
           { value: '+' }, { value: '=' }, { value: '`' },
-          { value: '^' }, { value: '§' }, { value: '¿'}, {value: '¡'},
+          { value: '^' }, { value: '§' }, { value: '«'}, {value: '»'},
           { value: '⌫', ratio: 1.5, keyCode: KeyboardEvent.DOM_VK_BACK_SPACE }
         ], [
           { value: '&nbsp', ratio: 8, keyCode: KeyboardEvent.DOM_VK_SPACE },

diff --git a/apps/keyboard/js/layouts/bn-Avro.js b/apps/keyboard/js/layouts/bn-Avro.js
@@ -32,16 +32,16 @@ Keyboards['bn-Avro'] = {
     x: 'X',
     y: 'Y',
     z: 'Z',
-    '.': ',?!;:'
+    '.': ',?!;:…'
   },
   keys: [
     [
       { value: 'q' }, { value: 'w' }, { value: 'e' } , { value: 'r' },
-      { value: 't' } , { value: 'y' }, { value: 'u' } , { value: 'i' },
+      { value: 't' }, { value: 'y' }, { value: 'u' } , { value: 'i' },
       { value: 'o' }, { value: 'p' }
     ], [
       { value: 'a' }, { value: 's' }, { value: 'd' }, { value: 'f' },
-      { value: 'g' } , { value: 'h' }, { value: 'j' }, { value: 'k' },
+      { value: 'g' }, { value: 'h' }, { value: 'j' }, { value: 'k' },
       { value: 'l' }, { value: 'ঁ' }
     ], [
       { value: '⇪', ratio: 1.25, keyCode: KeyEvent.DOM_VK_CAPS_LOCK },
@@ -56,19 +56,22 @@ Keyboards['bn-Avro'] = {
   ],
   pages: [undefined, {
     alt: {
-      '০': 'º',
-      '১': '1 ',
-      '২': '2 ',
-      '৩': '3 ',
-      '৪': '4 ',
-      '৫': '5 ',
-      '৬': '6 ',
-      '৭': '7 ',
-      '৮': '8 ',
-      '৯': '9 ',
-      '৳': '₹ $ € £ ¥',
-      '?': '¿',
-      '!': '¡'
+      '০': ['º'],
+      '১': ['1'],
+      '২': ['2'],
+      '৩': ['3'],
+      '৪': ['4'],
+      '৫': ['5'],
+      '৬': ['6'],
+      '৭': ['7'],
+      '৮': ['8'],
+      '৯': ['9'],
+      '৳': ['₹', '$', '€', '£', '¢', '¥'],
+      '"': ['“', '”'],
+      '\'':['‘', '’'],
+      '?': ['¿'],
+      '!': ['¡'],
+      '+': ['-', '×', '÷', '±']
     },
     // These are based on the en layout, with top row modifed and $ localized.
     keys: [
@@ -92,7 +95,7 @@ Keyboards['bn-Avro'] = {
             value: ','
           }
         }, { value: ':' }, { value: ';' }, { value: '"' },
-        { value: '\'' }, { value: '?' }, { value: '!' },
+        { value: '\'' }, { value: '!' }, { value: '?' },
         { value: '⌫', ratio: 1.5, keyCode: KeyEvent.DOM_VK_BACK_SPACE }
       ], [
         { value: '&nbsp', ratio: 8, keyCode: KeyboardEvent.DOM_VK_SPACE },

diff --git a/apps/keyboard/js/layouts/bn-Probhat.js b/apps/keyboard/js/layouts/bn-Probhat.js
@@ -61,20 +61,22 @@ Keyboards['bn-Probhat'] = {
   },
   pages: [undefined, {
     alt: {
-      '০': '0 º',
-      '১': '১ম 1',
-      '২': '২য় 2',
-      '৩': '৩য় 3',
-      '৪': '৪র্থ 4',
-      '৫': '৫ম 5',
-      '৬': '৬ষ্ঠ 6',
-      '৭': '৭ম 7',
-      '৮': '৮ম 8',
-      '৯': '৯ম 9',
-      '৳': '₹ $ € £ ¥',
-      '?': '¿',
-      '!': '¡',
-      '-': '_'
+      '০': ['0', 'º'],
+      '১': ['১ম', '1'],
+      '২': ['২য়', '2'],
+      '৩': ['৩য়', '3'],
+      '৪': ['৪র্থ', '4'],
+      '৫': ['৫ম', '5'],
+      '৬': ['৬ষ্ঠ', '6'],
+      '৭': ['৭ম', '7'],
+      '৮': ['৮ম', '8'],
+      '৯': ['৯ম', '9'],
+      '৳': ['₹', '$', '€', '£', '¢', '¥'],
+      '"': ['“', '”'],
+      '\'':['‘', '’'],
+      '?': ['¿'],
+      '!': ['¡'],
+      '+': ['-', '×', '÷', '±']
     },
     // These are based on the en layout, with top row modifed and $ localized.
     keys: [
@@ -98,7 +100,7 @@ Keyboards['bn-Probhat'] = {
             value: ','
           }
         }, { value: ':' }, { value: ';' }, { value: '"' },
-        { value: '\'' }, { value: '?' }, { value: '!' },
+        { value: '\'' }, { value: '!' }, { value: '?' },
         { value: '⌫', ratio: 1.5, keyCode: KeyEvent.DOM_VK_BACK_SPACE }
       ], [
         { value: '&nbsp', ratio: 8, keyCode: KeyboardEvent.DOM_VK_SPACE },

diff --git a/apps/keyboard/js/layouts/ca.js b/apps/keyboard/js/layouts/ca.js
@@ -46,22 +46,23 @@ Keyboards.ca = {
   ],
   pages: [undefined, {
     alt: {
-      '0': 'º',
-      '1': '1r 1a',
-      '2': '2n 2a',
-      '3': '3r 3a',
-      '4': '4t 4a',
-      '5': '5è 5a 5é',
-      '6': '6è 6a 6é',
-      '7': '7è 7a 7é',
-      '8': '8è 8a 8é',
-      '9': '9è 9a 9é',
-      '€': '$ £ ¥',
-      '-': '—_',
-      '?': '¿',
-      '"': '«»',
-      '.': ',;:·…',
-      '!': '¡'
+      '0': ['º'],
+      '1': ['1r', '1a'],
+      '2': ['2n', '2a'],
+      '3': ['3r', '3a'],
+      '4': ['4t', '4a'],
+      '5': ['5è', '5a', '5é'],
+      '6': ['6è', '6a', '6é'],
+      '7': ['7è', '7a', '7é'],
+      '8': ['8è', '8a', '8é'],
+      '9': ['9è', '9a', '9é'],
+      '€': ['$', '£', '¢', '¥'],
+      '"': ['“', '”', '«', '»'],
+      '\'':['‘', '’'],
+      '?': ['¿'],
+      '!': ['¡'],
+      '+': ['-', '×', '÷', '±'],
+      '.': ['·']
     },
     // These are based on the en layout, with $ localized.
     keys: [
@@ -85,7 +86,7 @@ Keyboards.ca = {
             value: ','
           }
         }, { value: ':' }, { value: ';' }, { value: '"' },
-        { value: '\'' }, { value: '?' }, { value: '!' },
+        { value: '\'' }, { value: '!' }, { value: '?' },
         { value: '⌫', ratio: 1.5, keyCode: KeyEvent.DOM_VK_BACK_SPACE }
       ], [
         { value: '&nbsp', ratio: 8, keyCode: KeyboardEvent.DOM_VK_SPACE },

diff --git a/apps/keyboard/js/layouts/dz-BT.js b/apps/keyboard/js/layouts/dz-BT.js
@@ -69,35 +69,35 @@ Keyboards['dz-BT'] = {
   pages: [undefined, {
     needsCommaKey: true,
     alt: {
-      '༡': '1',
-      '༢': '2',
-      '༣': '3',
-      '༤': '4',
-      '༥': '5',
-      '༦': '6',
-      '༧': '7',
-      '༨': '8',
-      '༩': '9',
-      '༠': '0',
+      '༡': ['1'],
+      '༢': ['2'],
+      '༣': ['3'],
+      '༤': ['4'],
+      '༥': ['5'],
+      '༦': ['6'],
+      '༧': ['7'],
+      '༨': ['8'],
+      '༩': ['9'],
+      '༠': ['0'],
 
-      '༆': '༄ ༅ @',
-      '༉': '࿑ ༊ ࿐ #',
-      '༈': '-_',
-      '₨': '$ € £ ¥',
-      '༴': '྾ %',
-      'ཿ': '&',
-      '༷': '༵ *',
-      '༔': '+',
-      '༼': '(',
-      '༽': ')',
+      '༆': ['༄ ', '༅', '@'],
+      '༉': ['࿑', '༊', '࿐', '#'],
+      '༈': ['-', '_'],
+      '₨': ['$', '€', '£', '¢', '¥'],
+      '༴': ['྾', '%'],
+      'ཿ': ['&'],
+      '༷': [ '༵', '*'],
+      '༔': ['+'],
+      '༼': ['('],
+      '༽': [')'],
 
-      '༃': '༂ !',
-      '༑': "༏ ༐ '",
-      '྅': 'ྊ ྋ \"',
-      'ྈ': ':',
-      'ྉ': ';',
-      '࿙': '/',
-      '྿': '?'
+      '༃': ['༂ ', '!'],
+      '༑': ['༏', '༐', '\''],
+      '྅': ['ྊ', 'ྋ', '"'],
+      'ྈ': [':'],
+      'ྉ': [';'],
+      '࿙': ['/'],
+      '྿': ['?']
     },
     keys: [
       [

diff --git a/apps/keyboard/js/layouts/en-Neo.js b/apps/keyboard/js/layouts/en-Neo.js
@@ -18,7 +18,7 @@ Keyboards['en-Neo'] = {
     l: 'ł£',
     y: 'ÿ¥',
     z: 'žźż',
-    '.': ',?!;:'
+    '.': ',?!;:…'
   },
   keys: [
     [
@@ -42,19 +42,22 @@ Keyboards['en-Neo'] = {
   pages: [undefined, {
     needsCommaKey: true,
     alt: {
-      '0': 'º',
-      '1': '1st ',
-      '2': '2nd ',
-      '3': '3rd ',
-      '4': '4th ',
-      '5': '5th ',
-      '6': '6th ',
-      '7': '7th ',
-      '8': '8th ',
-      '9': '9th ',
-      '$': '€ £ ¥',
-      '?': '¿',
-      '!': '¡',
+      '1': ['¹', '1st'],
+      '2': ['²', '2nd'],
+      '3': ['³', '3rd'],
+      '4': ['⁴', '4th'],
+      '5': ['⁵', '5th'],
+      '6': ['⁶', '6th'],
+      '7': ['⁷', '7th'],
+      '8': ['⁸', '8th'],
+      '9': ['⁹', '9th'],
+      '0': ['⁰', 'º'],
+      '$': [ '€', '£', '¢', '¥'],
+      '"': ['“', '”'],
+      '\'':['‘', '’'],
+      '?': ['¿'],
+      '!': ['¡'],
+      '+': ['-', '×', '÷', '±'],
       '/': '\\'
     },
     keys: [
@@ -83,6 +86,9 @@ Keyboards['en-Neo'] = {
       ]
     ]
   }, {
+    alt: {
+      '®': ['™']
+    },
     needsCommaKey: true,
     keys: [
       [

diff --git a/apps/keyboard/js/layouts/en.js b/apps/keyboard/js/layouts/en.js
@@ -18,7 +18,7 @@ Keyboards.en = {
     l: 'ł£',
     y: 'ÿ¥',
     z: 'žźż',
-    '.': ',?!;:'
+    '.': ',?!;:…'
   },
   keys: [
     [
@@ -51,9 +51,12 @@ Keyboards.en = {
       '8': ['⁸', '8th'],
       '9': ['⁹', '9th'],
       '0': ['⁰', 'º'],
-      '$': ['¥', '€', '£', '¢', '₠'],
+      '$': [ '€', '£', '¢', '¥'],
+      '"': ['“', '”'],
+      '\'':['‘', '’'],
       '?': ['¿'],
-      '!': ['¡']
+      '!': ['¡'],
+      '+': ['-', '×', '÷', '±']
     },
     keys: [
       [
@@ -76,7 +79,7 @@ Keyboards.en = {
             value: ','
           }
         }, { value: ':' }, { value: ';' }, { value: '"' },
-        { value: '\'' }, { value: '?' }, { value: '!' },
+        { value: '\'' }, { value: '!' }, { value: '?' },
         { value: '⌫', ratio: 1.5, keyCode: KeyEvent.DOM_VK_BACK_SPACE }
       ], [
         { value: '&nbsp', ratio: 8, keyCode: KeyboardEvent.DOM_VK_SPACE },