| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Redefine '$' here rather than including 'cr.js', since this is | 5 // Redefine '$' here rather than including 'cr.js', since this is |
| 6 // the only function needed. This allows this file to be loaded | 6 // the only function needed. This allows this file to be loaded |
| 7 // in a browser directly for layout and some testing purposes. | 7 // in a browser directly for layout and some testing purposes. |
| 8 var $ = function(id) { return document.getElementById(id); }; | 8 var $ = function(id) { return document.getElementById(id); }; |
| 9 | 9 |
| 10 /** | 10 /** |
| (...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 label: 'Complete when overscrolled (horizontal)', | 324 label: 'Complete when overscrolled (horizontal)', |
| 325 units: '%' | 325 units: '%' |
| 326 }, | 326 }, |
| 327 { | 327 { |
| 328 key: 'vertical_threshold_complete', | 328 key: 'vertical_threshold_complete', |
| 329 label: 'Complete when overscrolled (vertical)', | 329 label: 'Complete when overscrolled (vertical)', |
| 330 units: '%' | 330 units: '%' |
| 331 }, | 331 }, |
| 332 { | 332 { |
| 333 key: 'minimum_threshold_start', | 333 key: 'minimum_threshold_start', |
| 334 label: 'Start overscroll gesture after scrolling', | 334 label: 'Start overscroll gesture (horizontal)', |
| 335 units: 'pixels' | 335 units: 'pixels' |
| 336 }, | 336 }, |
| 337 { | 337 { |
| 338 key: 'vertical_threshold_start', |
| 339 label: 'Start overscroll gesture (vertical)', |
| 340 units: 'pixels' |
| 341 }, |
| 342 { |
| 338 key: 'horizontal_resist_threshold', | 343 key: 'horizontal_resist_threshold', |
| 339 label: 'Start resisting overscroll after (horizontal)', | 344 label: 'Start resisting overscroll after (horizontal)', |
| 340 units: 'pixels' | 345 units: 'pixels' |
| 341 }, | 346 }, |
| 342 { | 347 { |
| 343 key: 'vertical_resist_threshold', | 348 key: 'vertical_resist_threshold', |
| 344 label: 'Start resisting overscroll after (vertical)', | 349 label: 'Start resisting overscroll after (vertical)', |
| 345 units: 'pixels' | 350 units: 'pixels' |
| 346 }, | 351 }, |
| 347 ]; | 352 ]; |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 */ | 590 */ |
| 586 updatePreferenceValueResult: function(prefName, value, isDefault) { | 591 updatePreferenceValueResult: function(prefName, value, isDefault) { |
| 587 prefName = prefName.substring(prefName.indexOf('.') + 1); | 592 prefName = prefName.substring(prefName.indexOf('.') + 1); |
| 588 $(prefName).value = value; | 593 $(prefName).value = value; |
| 589 this.updateResetButton($(prefName + '-reset'), isDefault); | 594 this.updateResetButton($(prefName + '-reset'), isDefault); |
| 590 this.updateResetAllButton(this.areAllPrefsSetToDefault()); | 595 this.updateResetAllButton(this.areAllPrefsSetToDefault()); |
| 591 }, | 596 }, |
| 592 }; | 597 }; |
| 593 | 598 |
| 594 document.addEventListener('DOMContentLoaded', gesture_config.initialize); | 599 document.addEventListener('DOMContentLoaded', gesture_config.initialize); |
| OLD | NEW |