| OLD | NEW |
| 1 <!-- | 1 <!-- |
| 2 -- Copyright (c) 2013 The Chromium Authors. All rights reserved. | 2 -- Copyright (c) 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-enable-dbl="enableDbl" attributes="keyset layout rows"> | 9 on-enable-dbl="enableDbl" attributes="keyset layout rows"> |
| 10 <template> | 10 <template> |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 var toKeyset = detail.toKeyset; | 209 var toKeyset = detail.toKeyset; |
| 210 // Keyset transition key. | 210 // Keyset transition key. |
| 211 if (toKeyset) { | 211 if (toKeyset) { |
| 212 this.keyset = toKeyset; | 212 this.keyset = toKeyset; |
| 213 this.querySelector('#' + this.layout + '-' + this.keyset).nextKeyset = | 213 this.querySelector('#' + this.layout + '-' + this.keyset).nextKeyset = |
| 214 detail.nextKeyset; | 214 detail.nextKeyset; |
| 215 } | 215 } |
| 216 var toLayout = detail.toLayout; | 216 var toLayout = detail.toLayout; |
| 217 // Layout transition key. | 217 // Layout transition key. |
| 218 if (toLayout) | 218 if (toLayout) |
| 219 this.layout = toLayout; | 219 hideKeyboard(); |
| 220 var char = detail.char; | 220 var char = detail.char; |
| 221 if (enterUpperOnSpace) { | 221 if (enterUpperOnSpace) { |
| 222 enterUpperOnSpace = false; | 222 enterUpperOnSpace = false; |
| 223 if (char == ' ') | 223 if (char == ' ') |
| 224 this.keyset = 'upper'; | 224 this.keyset = 'upper'; |
| 225 } | 225 } |
| 226 switch(char) { | 226 switch(char) { |
| 227 case 'Invalid': | 227 case 'Invalid': |
| 228 case 'Shift': | 228 case 'Shift': |
| 229 return; | 229 return; |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 } | 298 } |
| 299 } | 299 } |
| 300 if (keysetsLoaded) | 300 if (keysetsLoaded) |
| 301 console.error('No default keyset found for ' + this.layout); | 301 console.error('No default keyset found for ' + this.layout); |
| 302 return false; | 302 return false; |
| 303 } | 303 } |
| 304 }); | 304 }); |
| 305 </script> | 305 </script> |
| 306 </polymer-element> | 306 </polymer-element> |
| 307 | 307 |
| OLD | NEW |