diff options
Diffstat (limited to 'chromium/ui/keyboard/resources')
6 files changed, 7 insertions, 221 deletions
diff --git a/chromium/ui/keyboard/resources/elements/kb-key-base.html b/chromium/ui/keyboard/resources/elements/kb-key-base.html index 0b017ff3d45..497da30f6c4 100644 --- a/chromium/ui/keyboard/resources/elements/kb-key-base.html +++ b/chromium/ui/keyboard/resources/elements/kb-key-base.html @@ -110,7 +110,7 @@ }, down: function(event) { var detail = { - char: this.charValue, + char: this.char || this.textContent, toLayout: this.toLayout, repeat: this.repeat }; @@ -121,7 +121,7 @@ this.fire('key-down', detail); this.longPressTimer = this.asyncMethod(function() { var detail = { - char: this.charValue, + char: this.char || this.textContent, superscript: this.superscript }; if (this.keysetRules && this.keysetRules.long != undefined) { @@ -137,7 +137,7 @@ up: function(event) { clearTimeout(this.longPressTimer); var detail = { - char: this.charValue, + char: this.char || this.textContent, toLayout: this.toLayout }; if (this.keysetRules && this.keysetRules.up != undefined) { @@ -145,17 +145,7 @@ detail.nextKeyset = this.keysetRules.up[NEXT_KEYSET - OFFSET]; } this.fire('key-up', detail); - }, - - /** - * Character value associated with the key. Typically, the value is a - * single charcater, but may be multi-character in cases like a ".com" - * button. - * @type {string} - */ - get charValue() { - return this.char || this.textContent; - }, + } }); </script> </polymer-element> diff --git a/chromium/ui/keyboard/resources/elements/kb-key-codes.html b/chromium/ui/keyboard/resources/elements/kb-key-codes.html deleted file mode 100644 index cf1a7c23fa3..00000000000 --- a/chromium/ui/keyboard/resources/elements/kb-key-codes.html +++ /dev/null @@ -1,172 +0,0 @@ -<!-- - -- Copyright 2013 The Chromium Authors. All rights reserved. - -- Use of this source code is governed by a BSD-style license that can be - -- found in the LICENSE file. - --> - -<polymer-element name="kb-key-codes"> -<script> - (function() { - // Keycodes have been deprecated in the KeyEvent specification, but are - // nonetheless required to support legacy web content. The Keycodes in the - // following table are based on subset of US-EN 101-key keyboard. These - // codes are used in the absence of explicit keycodes for kb-key and - // kb-keysequence elements. Keyboard layout authors may explicitly set the - // keyCode attribute for kb-key or kb-keysequence elements to refer to - // indices in this table in order to emulate a physical keyboard with an - // alternate layout. Not all keys on a virtual keyboard are required to - // have keyCodes. - var keyCodes = { - '\b': {keyCode: 0x08, shiftModifier: false}, - '\t': {keyCode: 0x09, shiftModifier: false}, - '\n': {keyCode: 0x0D, shiftModifier: false}, - ' ': {keyCode: 0x20, shiftModifier: false}, - '0': {keyCode: 0x30, shiftModifier: false}, - ')': {keyCode: 0x30, shiftModifier: true}, - '1': {keyCode: 0x31, shiftModifier: false}, - '!': {keyCode: 0x31, shiftModifier: true}, - '2': {keyCode: 0x32, shiftModifier: false}, - '@': {keyCode: 0x32, shiftModifier: true}, - '3': {keyCode: 0x33, shiftModifier: false}, - '#': {keyCode: 0x33, shiftModifier: true}, - '4': {keyCode: 0x34, shiftModifier: false}, - '$': {keyCode: 0x34, shiftModifier: true}, - '5': {keyCode: 0x35, shiftModifier: false}, - '%': {keyCode: 0x35, shiftModifier: true}, - '6': {keyCode: 0x36, shiftModifier: false}, - '^': {keyCode: 0x36, shiftModifier: true}, - '7': {keyCode: 0x37, shiftModifier: false}, - '&': {keyCode: 0x37, shiftModifier: true}, - '8': {keyCode: 0x38, shiftModifier: false}, - '*': {keyCode: 0x38, shiftModifier: true}, - '9': {keyCode: 0x39, shiftModifier: false}, - '(': {keyCode: 0x39, shiftModifier: true}, - 'a': {keyCode: 0x41, shiftModifier: false}, - 'A': {keyCode: 0x41, shiftModifier: true}, - 'b': {keyCode: 0x42, shiftModifier: false}, - 'B': {keyCode: 0x42, shiftModifier: true}, - 'c': {keyCode: 0x43, shiftModifier: false}, - 'C': {keyCode: 0x43, shiftModifier: true}, - 'd': {keyCode: 0x44, shiftModifier: false}, - 'D': {keyCode: 0x44, shiftModifier: true}, - 'e': {keyCode: 0x45, shiftModifier: false}, - 'E': {keyCode: 0x45, shiftModifier: true}, - 'f': {keyCode: 0x46, shiftModifier: false}, - 'F': {keyCode: 0x46, shiftModifier: true}, - 'g': {keyCode: 0x47, shiftModifier: false}, - 'G': {keyCode: 0x47, shiftModifier: true}, - 'h': {keyCode: 0x48, shiftModifier: false}, - 'H': {keyCode: 0x48, shiftModifier: true}, - 'i': {keyCode: 0x49, shiftModifier: false}, - 'I': {keyCode: 0x49, shiftModifier: true}, - 'j': {keyCode: 0x4A, shiftModifier: false}, - 'J': {keyCode: 0x4A, shiftModifier: true}, - 'k': {keyCode: 0x4B, shiftModifier: false}, - 'K': {keyCode: 0x4B, shiftModifier: true}, - 'l': {keyCode: 0x4C, shiftModifier: false}, - 'L': {keyCode: 0x4C, shiftModifier: true}, - 'm': {keyCode: 0x4D, shiftModifier: false}, - 'M': {keyCode: 0x4D, shiftModifier: true}, - 'n': {keyCode: 0x4E, shiftModifier: false}, - 'N': {keyCode: 0x4E, shiftModifier: true}, - 'o': {keyCode: 0x4F, shiftModifier: false}, - 'O': {keyCode: 0x4F, shiftModifier: true}, - 'p': {keyCode: 0x50, shiftModifier: false}, - 'P': {keyCode: 0x50, shiftModifier: true}, - 'q': {keyCode: 0x51, shiftModifier: false}, - 'Q': {keyCode: 0x51, shiftModifier: true}, - 'r': {keyCode: 0x52, shiftModifier: false}, - 'R': {keyCode: 0x52, shiftModifier: true}, - 's': {keyCode: 0x53, shiftModifier: false}, - 'S': {keyCode: 0x53, shiftModifier: true}, - 't': {keyCode: 0x54, shiftModifier: false}, - 'T': {keyCode: 0x54, shiftModifier: true}, - 'u': {keyCode: 0x55, shiftModifier: false}, - 'U': {keyCode: 0x55, shiftModifier: true}, - 'v': {keyCode: 0x56, shiftModifier: false}, - 'V': {keyCode: 0x56, shiftModifier: true}, - 'w': {keyCode: 0x57, shiftModifier: false}, - 'W': {keyCode: 0x57, shiftModifier: true}, - 'x': {keyCode: 0x58, shiftModifier: false}, - 'X': {keyCode: 0x58, shiftModifier: true}, - 'y': {keyCode: 0x59, shiftModifier: false}, - 'Y': {keyCode: 0x59, shiftModifier: true}, - 'z': {keyCode: 0x5A, shiftModifier: false}, - 'Z': {keyCode: 0x5A, shiftModifier: true}, - ';': {keyCode: 0xBA, shiftModifier: false}, - ':': {keyCode: 0xBA, shiftModifier: true}, - '=': {keyCode: 0xBB, shiftModifier: false}, - '+': {keyCode: 0xBB, shiftModifier: true}, - ',': {keyCode: 0xBC, shiftModifier: false}, - '<': {keyCode: 0xBC, shiftModifier: true}, - '-': {keyCode: 0xBD, shiftModifier: false}, - '_': {keyCode: 0xBD, shiftModifier: true}, - '.': {keyCode: 0xBE, shiftModifier: false}, - '>': {keyCode: 0xBE, shiftModifier: true}, - '/': {keyCode: 0xBF, shiftModifier: false}, - '?': {keyCode: 0xBF, shiftModifier: true}, - '`': {keyCode: 0xC0, shiftModifier: false}, - '~': {keyCode: 0xC0, shiftModifier: true}, - '[': {keyCode: 0xDB, shiftModifier: false}, - '{': {keyCode: 0xDB, shiftModifier: true}, - '\\': {keyCode: 0xDC, shiftModifier: false}, - '|': {keyCode: 0xDC, shiftModifier: true}, - ']': {keyCode: 0xDD, shiftModifier: false}, - '}': {keyCode: 0xDD, shiftModifier: true}, - '\'': {keyCode: 0xDE, shiftModifier: false}, - '"': {keyCode: 0xDE, shiftModifier: true}, - }; - - Polymer('kb-key-codes', { - /** - * Retrieves the keyCode and status of the shift modifier. - * @param {string} id ID of an entry in the code table. - * @return {keyCode: numeric, shiftModifier: boolean} - */ - GetKeyCodeAndModifiers: function(id) { - var entry = keyCodes[id]; - if (entry) { - return { - keyCode: entry.keyCode, - shiftModifier: entry.shiftModifier - }; - } - return { - keyCode: 0, - shiftModifier: false - }; - }, - - /** - * Creates a virtual key event for use with the keyboard extension API. - * @param {kb-key} key Instance of the kb-key element being pressed or - * released. - * @param {string} type The type of key event, which may be keydown - * or keyreleased. - * @return {keyCode: numeric, - * modifiers: Array.<string>, - * type: string, - * value: string} - */ - CreateVirtualKeyEvent: function(key, type) { - var keyCode = key.keyCode; - var shiftModifier = key.shiftModifier; - if (keyCode == undefined) { - var state = this.GetKeyCodeAndModifiers(key.charValue); - keyCode = state.keyCode; - shiftModifier = state.shiftModifier; - } - var modifiers = []; - if (shiftModifier) - modifiers.push('shiftKey'); - return { - keyCode: keyCode, - modifiers: modifiers, - type: type, - value: key.charValue, - }; - }, - }); - })(); -</script> -</polymer-element> diff --git a/chromium/ui/keyboard/resources/elements/kb-key-sequence.html b/chromium/ui/keyboard/resources/elements/kb-key-sequence.html index e57521280e9..dee295bec3b 100644 --- a/chromium/ui/keyboard/resources/elements/kb-key-sequence.html +++ b/chromium/ui/keyboard/resources/elements/kb-key-sequence.html @@ -4,7 +4,7 @@ -- found in the LICENSE file. --> -<polymer-element name="kb-key-sequence" attributes="keys superscripts keyCodes"> +<polymer-element name="kb-key-sequence" attributes="keys superscripts"> <template> <style> @host { @@ -13,7 +13,6 @@ } } </style> - <kb-key-codes id="keyCodeMetadata"></kb-key-codes> </template> <script> Polymer('kb-key-sequence', { @@ -29,11 +28,6 @@ console.error('keys and superscripts do not match'); return; } - var keyCodes = this.keyCodes || newKeys; - if (keyCodes && newKeys.length != keyCodes.length) { - console.error('keys and keyCodes do not match'); - return; - } var replacement = document.createDocumentFragment(); for (var i = 0; i < newKeys.length; i++) { var key = document.createElement('kb-key'); @@ -41,12 +35,6 @@ key.accents = newKeys[i]; if (newSuperScripts) key.superscript = newSuperScripts[i]; - var state = this.$.keyCodeMetadata.GetKeyCodeAndModifiers( - keyCodes[i]); - if (state) { - key.keyCode = state.keyCode; - key.shiftModifier = state.shiftModifier; - } replacement.appendChild(key); } result = replacement; diff --git a/chromium/ui/keyboard/resources/elements/kb-key.html b/chromium/ui/keyboard/resources/elements/kb-key.html index c37d7071666..fc366bbee92 100644 --- a/chromium/ui/keyboard/resources/elements/kb-key.html +++ b/chromium/ui/keyboard/resources/elements/kb-key.html @@ -4,8 +4,7 @@ -- found in the LICENSE file. --> -<polymer-element name="kb-key" extends="kb-key-base" - attributes="keyCode shiftModifier weight"> +<polymer-element name="kb-key" extends="kb-key-base" attributes="weight"> <template> <style> @host { @@ -21,24 +20,6 @@ </template> <script> Polymer('kb-key', { - /** - * Key codes have been deprecated in DOM3 key events, but are required - * for legacy web content. The key codes depend on the position of the - * key on the keyboard and is independent of which modifier keys (shift, - * alt, ...) are active. - * @type {number|undefined} - */ - keyCode: undefined, - /** - * Whether the shift key is pressed when producing the key value. - * @type {boolean} - */ - shiftModifier: false, - /** - * Weighting to use for layout in order to properly size the key. - * Keys with a high weighting are wider than normal keys. - * @type {number} - */ weight: 1 }); </script> diff --git a/chromium/ui/keyboard/resources/index.html b/chromium/ui/keyboard/resources/index.html index 3812f9f72f2..ac2982b4bc0 100644 --- a/chromium/ui/keyboard/resources/index.html +++ b/chromium/ui/keyboard/resources/index.html @@ -23,7 +23,7 @@ <link rel="import" href="elements/kb-altkey.html"> <link rel="import" href="elements/kb-altkey-data.html"> <link rel="import" href="elements/kb-altkey-set.html"> - <link rel="import" href="elements/kb-key-codes.html"> + <link rel="import" href="elements/kb-key-base.html"> <link rel="import" href="elements/kb-key.html"> <link rel="import" href="elements/kb-keyboard.html"> diff --git a/chromium/ui/keyboard/resources/webui_index.html b/chromium/ui/keyboard/resources/webui_index.html index ed6329c3dcf..48b1637571f 100644 --- a/chromium/ui/keyboard/resources/webui_index.html +++ b/chromium/ui/keyboard/resources/webui_index.html @@ -25,7 +25,6 @@ <link rel="import" href="elements/kb-altkey-container.html"> <link rel="import" href="elements/kb-altkey-data.html"> <link rel="import" href="elements/kb-altkey-set.html"> - <link rel="import" href="elements/kb-key-codes.html"> <link rel="import" href="elements/kb-key-base.html"> <link rel="import" href="elements/kb-key.html"> <link rel="import" href="elements/kb-keyboard.html"> |