diff options
| author | rsadam@chromium.org <rsadam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 20:17:20 +0000 |
|---|---|---|
| committer | rsadam@chromium.org <rsadam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 20:17:20 +0000 |
| commit | 41f6281c727b0fef21c18b7950f40bbf31b81c28 (patch) | |
| tree | c4c03dd2be7ff44be7097f89ed6f201cd3997c5c /ui/keyboard | |
| parent | 4ce3ba0ee735226189b0e2223bfc85a0204b9065 (diff) | |
| download | chromium_src-41f6281c727b0fef21c18b7950f40bbf31b81c28.zip chromium_src-41f6281c727b0fef21c18b7950f40bbf31b81c28.tar.gz chromium_src-41f6281c727b0fef21c18b7950f40bbf31b81c28.tar.bz2 | |
Fixes inverted characters not being displayed correctly on longpress.
BUG=303768
Review URL: https://codereview.chromium.org/25418004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/keyboard')
| -rw-r--r-- | ui/keyboard/resources/elements/kb-key-base.html | 16 | ||||
| -rw-r--r-- | ui/keyboard/resources/layouts/qwerty.html | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/ui/keyboard/resources/elements/kb-key-base.html b/ui/keyboard/resources/elements/kb-key-base.html index 89a1748..63aa2d2 100644 --- a/ui/keyboard/resources/elements/kb-key-base.html +++ b/ui/keyboard/resources/elements/kb-key-base.html @@ -132,12 +132,20 @@ /** * Character value associated with the key. Typically, the value is a - * single charcater, but may be multi-character in cases like a ".com" + * single character, but may be multi-character in cases like a ".com" * button. - * @type {string} + * @return {string} */ get charValue() { - return this.char || this.textContent; + return this.invert? this.hintText : (this.char || this.textContent); + }, + + /* Hint text value associated with the key. Typically, the value is a + * single character. + * @return {string} + */ + get hintTextValue() { + return this.invert? (this.char || this.textContent) : this.hintText; }, populateDetails: function() { @@ -152,7 +160,7 @@ return this.asyncMethod(function() { var detail = { char: this.charValue, - hintText: this.hintText + hintText: this.hintTextValue }; if (this.keysetRules && this.keysetRules.long != undefined) { detail.toKeyset = this.keysetRules.long[TO_KEYSET - OFFSET]; diff --git a/ui/keyboard/resources/layouts/qwerty.html b/ui/keyboard/resources/layouts/qwerty.html index 6bb679a..e1acfb6 100644 --- a/ui/keyboard/resources/layouts/qwerty.html +++ b/ui/keyboard/resources/layouts/qwerty.html @@ -21,8 +21,8 @@ <kb-row> <kb-shift-key weight="1.8" align="left">shift</kb-shift-key> <kb-key-sequence keys="ZXCVBNM"></kb-key-sequence> - <kb-key invert hintText="!" char="!">,</kb-key> - <kb-key invert hintText="?" char="?">.</kb-key> + <kb-key invert hintText="!" char=",">,</kb-key> + <kb-key invert hintText="?" char=".">.</kb-key> <kb-shift-key weight="1.8" align="right">shift</kb-shift-key> </kb-row> <kb-row> |