| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 /** | 5 /** |
| 6 * @typedef {{about: boolean, settings: boolean}} | 6 * @typedef {{about: boolean, settings: boolean}} |
| 7 */ | 7 */ |
| 8 var MainPageVisibility; | 8 var MainPageVisibility; |
| 9 | 9 |
| 10 /** | 10 /** |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 * @private | 119 * @private |
| 120 */ | 120 */ |
| 121 setOverscroll_: function(opt_minHeight) { | 121 setOverscroll_: function(opt_minHeight) { |
| 122 var scroller = this.offsetParent; | 122 var scroller = this.offsetParent; |
| 123 if (!scroller) | 123 if (!scroller) |
| 124 return; | 124 return; |
| 125 var overscroll = this.$.overscroll; | 125 var overscroll = this.$.overscroll; |
| 126 var visibleBottom = scroller.scrollTop + scroller.clientHeight; | 126 var visibleBottom = scroller.scrollTop + scroller.clientHeight; |
| 127 var overscrollBottom = overscroll.offsetTop + overscroll.scrollHeight; | 127 var overscrollBottom = overscroll.offsetTop + overscroll.scrollHeight; |
| 128 // How much of the overscroll is visible (may be negative). | 128 // How much of the overscroll is visible (may be negative). |
| 129 var visibleOverscroll = overscroll.scrollHeight - | 129 var visibleOverscroll = |
| 130 (overscrollBottom - visibleBottom); | 130 overscroll.scrollHeight - (overscrollBottom - visibleBottom); |
| 131 this.overscroll_ = | 131 this.overscroll_ = |
| 132 Math.max(opt_minHeight || 0, Math.ceil(visibleOverscroll)); | 132 Math.max(opt_minHeight || 0, Math.ceil(visibleOverscroll)); |
| 133 }, | 133 }, |
| 134 | 134 |
| 135 /** | 135 /** |
| 136 * Enables or disables user scrolling, via overscroll: hidden. Room for the | 136 * Enables or disables user scrolling, via overscroll: hidden. Room for the |
| 137 * hidden scrollbar is added to prevent the page width from changing back and | 137 * hidden scrollbar is added to prevent the page width from changing back and |
| 138 * forth. Also freezes the overscroll height. | 138 * forth. Also freezes the overscroll height. |
| 139 * @param {!Event} e |e.detail| is true to freeze, false to unfreeze. | 139 * @param {!Event} e |e.detail| is true to freeze, false to unfreeze. |
| 140 * @private | 140 * @private |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 return Math.max(0, this.offsetParent.clientHeight - distance); | 227 return Math.max(0, this.offsetParent.clientHeight - distance); |
| 228 }, | 228 }, |
| 229 | 229 |
| 230 /** | 230 /** |
| 231 * Returns the root page (if it exists) for a route. | 231 * Returns the root page (if it exists) for a route. |
| 232 * @param {!settings.Route} route | 232 * @param {!settings.Route} route |
| 233 * @return {(?SettingsAboutPageElement|?SettingsBasicPageElement)} | 233 * @return {(?SettingsAboutPageElement|?SettingsBasicPageElement)} |
| 234 */ | 234 */ |
| 235 getPage_: function(route) { | 235 getPage_: function(route) { |
| 236 if (settings.Route.ABOUT.contains(route)) { | 236 if (settings.Route.ABOUT.contains(route)) { |
| 237 return /** @type {?SettingsAboutPageElement} */( | 237 return /** @type {?SettingsAboutPageElement} */ ( |
| 238 this.$$('settings-about-page')); | 238 this.$$('settings-about-page')); |
| 239 } | 239 } |
| 240 if (settings.Route.BASIC.contains(route) || | 240 if (settings.Route.BASIC.contains(route) || |
| 241 settings.Route.ADVANCED.contains(route)) { | 241 settings.Route.ADVANCED.contains(route)) { |
| 242 return /** @type {?SettingsBasicPageElement} */( | 242 return /** @type {?SettingsBasicPageElement} */ ( |
| 243 this.$$('settings-basic-page')); | 243 this.$$('settings-basic-page')); |
| 244 } | 244 } |
| 245 assertNotReached(); | 245 assertNotReached(); |
| 246 }, | 246 }, |
| 247 | 247 |
| 248 /** | 248 /** |
| 249 * @param {string} query | 249 * @param {string} query |
| 250 * @return {!Promise} A promise indicating that searching finished. | 250 * @return {!Promise} A promise indicating that searching finished. |
| 251 */ | 251 */ |
| 252 searchContents: function(query) { | 252 searchContents: function(query) { |
| (...skipping 25 matching lines...) Expand all Loading... |
| 278 text: this.showNoResultsFound_ ? | 278 text: this.showNoResultsFound_ ? |
| 279 loadTimeData.getString('searchNoResults') : | 279 loadTimeData.getString('searchNoResults') : |
| 280 loadTimeData.getStringF('searchResults', query) | 280 loadTimeData.getStringF('searchResults', query) |
| 281 }); | 281 }); |
| 282 } | 282 } |
| 283 }.bind(this)); | 283 }.bind(this)); |
| 284 }.bind(this), 0); | 284 }.bind(this), 0); |
| 285 }.bind(this)); | 285 }.bind(this)); |
| 286 }, | 286 }, |
| 287 }); | 287 }); |
| OLD | NEW |