| OLD | NEW |
| 1 <!-- | 1 <!-- |
| 2 -- Copyright 2013 The Chromium Authors. All rights reserved. | 2 -- Copyright 2013 The Chromium Authors. All rights reserved. |
| 3 -- Use of this source code is governed by a BSD-style license that can be | 3 -- Use of this source code is governed by a BSD-style license that can be |
| 4 -- found in the LICENSE file. | 4 -- found in the LICENSE file. |
| 5 --> | 5 --> |
| 6 | 6 |
| 7 <polymer-element name="kb-keyboard" on-key-over="keyOver" on-key-up="keyUp" | 7 <polymer-element name="kb-keyboard" on-key-over="keyOver" on-key-up="keyUp" |
| 8 on-key-down="keyDown" on-key-longpress="keyLongpress" on-pointerup="up" | 8 on-key-down="keyDown" on-key-longpress="keyLongpress" on-pointerup="up" |
| 9 on-pointerdown="down" on-enable-sel="enableSel" | 9 on-pointerdown="down" on-enable-sel="enableSel" |
| 10 on-enable-dbl="enableDbl" attributes="keyset layout rows capsLocked"> | 10 on-enable-dbl="enableDbl" attributes="keyset layout rows capsLocked"> |
| (...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 var toKeysetId = detail.toKeyset; | 402 var toKeysetId = detail.toKeyset; |
| 403 // Keyset transition key. | 403 // Keyset transition key. |
| 404 if (toKeysetId) { | 404 if (toKeysetId) { |
| 405 this.keyset = toKeysetId; | 405 this.keyset = toKeysetId; |
| 406 this.querySelector('#' + this.layout + '-' + this.keyset).nextKeyset = | 406 this.querySelector('#' + this.layout + '-' + this.keyset).nextKeyset = |
| 407 detail.nextKeyset; | 407 detail.nextKeyset; |
| 408 } | 408 } |
| 409 var toLayoutId = detail.toLayout; | 409 var toLayoutId = detail.toLayout; |
| 410 // Layout transition key. | 410 // Layout transition key. |
| 411 if (toLayoutId) | 411 if (toLayoutId) |
| 412 this.layout = toLayoutId; | 412 hideKeyboard(); |
| 413 var char = detail.char; | 413 var char = detail.char; |
| 414 if (enterUpperOnSpace) { | 414 if (enterUpperOnSpace) { |
| 415 enterUpperOnSpace = false; | 415 enterUpperOnSpace = false; |
| 416 if (char == ' ') | 416 if (char == ' ') |
| 417 this.keyset = 'upper'; | 417 this.keyset = 'upper'; |
| 418 } | 418 } |
| 419 switch(char) { | 419 switch(char) { |
| 420 case 'Invalid': | 420 case 'Invalid': |
| 421 swipeStatus.swipeFlags = 0; | 421 swipeStatus.swipeFlags = 0; |
| 422 return; | 422 return; |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 530 } | 530 } |
| 531 } | 531 } |
| 532 if (keysetsLoaded) | 532 if (keysetsLoaded) |
| 533 console.error('No default keyset found for ' + this.layout); | 533 console.error('No default keyset found for ' + this.layout); |
| 534 return false; | 534 return false; |
| 535 } | 535 } |
| 536 }); | 536 }); |
| 537 </script> | 537 </script> |
| 538 </polymer-element> | 538 </polymer-element> |
| 539 | 539 |
| OLD | NEW |