Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/slider/slider_host_behav ior.html"> | |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/html/cr.html"> | |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slid er.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slid er.html"> |
| 5 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> | 7 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> |
| 6 <link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.ht ml"> | 8 <link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.ht ml"> |
| 7 <link rel="import" href="chrome://md-settings/i18n_setup.html"> | 9 <link rel="import" href="chrome://md-settings/i18n_setup.html"> |
| 8 <link rel="import" href="chrome://md-settings/prefs/prefs_behavior.html"> | |
| 9 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> | 10 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> |
| 10 | 11 |
| 11 <dom-module id="settings-keyboard"> | 12 <dom-module id="settings-keyboard"> |
| 12 <template> | 13 <template> |
| 13 <style include="settings-shared"></style> | 14 <style include="settings-shared"></style> |
| 14 <div class="settings-box first"> | 15 <div class="settings-box first"> |
| 15 <div class="start">$i18n{keyboardKeySearch}</div> | 16 <div class="start">$i18n{keyboardKeySearch}</div> |
| 16 <settings-dropdown-menu | 17 <settings-dropdown-menu |
| 17 pref="{{prefs.settings.language.xkb_remap_search_key_to}}" | 18 pref="{{prefs.settings.language.xkb_remap_search_key_to}}" |
| 18 menu-options="[[keyMapTargetsWithCapsLock_]]"> | 19 menu-options="[[keyMapTargetsWithCapsLock_]]"> |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 63 label="$i18n{keyboardEnableAutoRepeat}"> | 64 label="$i18n{keyboardEnableAutoRepeat}"> |
| 64 </settings-checkbox> | 65 </settings-checkbox> |
| 65 </div> | 66 </div> |
| 66 <iron-collapse | 67 <iron-collapse |
| 67 opened="[[prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]"> | 68 opened="[[prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]"> |
| 68 <div class="settings-box continuation settings-checkbox-spacer"> | 69 <div class="settings-box continuation settings-checkbox-spacer"> |
| 69 <div class="start" id="repeatDelayLabel">$i18n{keyRepeatDelay}</div> | 70 <div class="start" id="repeatDelayLabel">$i18n{keyRepeatDelay}</div> |
| 70 <div class="layout horizontal center"> | 71 <div class="layout horizontal center"> |
| 71 <div>$i18n{keyRepeatDelayLong}</div> | 72 <div>$i18n{keyRepeatDelayLong}</div> |
| 72 <paper-slider id="delaySlider" class="always-on" snaps | 73 <paper-slider id="delaySlider" class="always-on" snaps |
| 73 max="[[delayMaxTick_()]]" on-change="onDelaySliderChange_" | 74 data-value-path="prefs.settings.language.xkb_auto_repeat_delay_r2. value" |
|
stevenjb
2016/05/11 16:37:40
nit: split line (here and below)?
michaelpg
2016/05/14 04:44:33
meh. sometimes it helps, sometimes it doesn't, and
| |
| 75 slider-tick-values="[[autoRepeatDelays_]]" | |
| 76 value="[[getSliderIndexFromValue( | |
| 77 prefs.settings.language.xkb_auto_repeat_delay_r2.value, | |
| 78 autoRepeatDelays_)]]" | |
| 79 on-change="onSliderChange" on-value-change="onSliderValueChange" | |
| 74 disabled="[[!prefs.settings.language.xkb_auto_repeat_enabled_r2.va lue]]" | 80 disabled="[[!prefs.settings.language.xkb_auto_repeat_enabled_r2.va lue]]" |
| 75 aria-labelledby="repeatDelayLabel"> | 81 aria-labelledby="repeatDelayLabel"> |
| 76 </paper-slider> | 82 </paper-slider> |
| 77 <div>$i18n{keyRepeatDelayShort}</div> | 83 <div>$i18n{keyRepeatDelayShort}</div> |
| 78 </div> | 84 </div> |
| 79 </div> | 85 </div> |
| 80 <div class="settings-box continuation settings-checkbox-spacer"> | 86 <div class="settings-box continuation settings-checkbox-spacer"> |
| 81 <div class="start" id="repeatRateLabel">$i18n{keyRepeatRate}</div> | 87 <div class="start" id="repeatRateLabel">$i18n{keyRepeatRate}</div> |
| 82 <div class="layout horizontal center"> | 88 <div class="layout horizontal center"> |
| 83 <div>$i18n{keyRepeatRateSlow}</div> | 89 <div>$i18n{keyRepeatRateSlow}</div> |
| 84 <paper-slider id="repeatRateSlider" class="always-on" snaps | 90 <paper-slider id="repeatRateSlider" class="always-on" snaps |
| 85 max="[[repeatRateMaxTick_()]]" | 91 data-value-path="prefs.settings.language.xkb_auto_repeat_interval_ r2.value" |
| 86 on-change="onRepeatRateSliderChange_" | 92 slider-tick-values="[[autoRepeatIntervals_]]" |
| 87 disabled="{{!prefs.settings.language.xkb_auto_repeat_enabled_r2.va lue}}" | 93 value="[[getSliderIndexFromValue( |
| 94 prefs.settings.language.xkb_auto_repeat_interval_r2.value, | |
| 95 autoRepeatIntervals_)]]" | |
| 96 on-change="onSliderChange" on-value-change="onSliderValueChange" | |
| 97 disabled="[[!prefs.settings.language.xkb_auto_repeat_enabled_r2.va lue]]" | |
| 88 aria-labelledby="repeatRateLabel"> | 98 aria-labelledby="repeatRateLabel"> |
| 89 </paper-slider> | 99 </paper-slider> |
| 90 <div>$i18n{keyRepeatRateFast}</div> | 100 <div>$i18n{keyRepeatRateFast}</div> |
| 91 </div> | 101 </div> |
| 92 </div> | 102 </div> |
| 93 </iron-collapse> | 103 </iron-collapse> |
| 94 <div id="keyboardOverlay" class="settings-box" | 104 <div id="keyboardOverlay" class="settings-box" |
| 95 on-tap="onShowKeyboardShortcutsOverlayTap_"> | 105 on-tap="onShowKeyboardShortcutsOverlayTap_"> |
| 96 $i18n{showKeyboardShortcutsOverlay} | 106 $i18n{showKeyboardShortcutsOverlay} |
| 97 </div> | 107 </div> |
| 98 <div class="settings-box" on-tap="onShowLanguageInputTap_"> | 108 <div class="settings-box" on-tap="onShowLanguageInputTap_"> |
| 99 $i18n{keyboardShowLanguageAndInput} | 109 $i18n{keyboardShowLanguageAndInput} |
| 100 </div> | 110 </div> |
| 101 </template> | 111 </template> |
| 102 <script src="keyboard.js"></script> | 112 <script src="keyboard.js"></script> |
| 103 </dom-module> | 113 </dom-module> |
| OLD | NEW |