| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 cr.define('options', function() { | 5 cr.define('options', function() { |
| 6 var OptionsPage = options.OptionsPage; | 6 var OptionsPage = options.OptionsPage; |
| 7 var Page = cr.ui.pageManager.Page; | 7 var Page = cr.ui.pageManager.Page; |
| 8 var PageManager = cr.ui.pageManager.PageManager; | 8 var PageManager = cr.ui.pageManager.PageManager; |
| 9 var ArrayDataModel = cr.ui.ArrayDataModel; | 9 var ArrayDataModel = cr.ui.ArrayDataModel; |
| 10 var RepeatingButton = cr.ui.RepeatingButton; | 10 var RepeatingButton = cr.ui.RepeatingButton; |
| (...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 874 if (section.hasTransitionEndListener_) | 874 if (section.hasTransitionEndListener_) |
| 875 return; | 875 return; |
| 876 | 876 |
| 877 section.addEventListener('webkitTransitionEnd', | 877 section.addEventListener('webkitTransitionEnd', |
| 878 this.onTransitionEnd_.bind(this)); | 878 this.onTransitionEnd_.bind(this)); |
| 879 section.hasTransitionEndListener_ = true; | 879 section.hasTransitionEndListener_ = true; |
| 880 }, | 880 }, |
| 881 | 881 |
| 882 /** | 882 /** |
| 883 * Called after an animation transition has ended. | 883 * Called after an animation transition has ended. |
| 884 * @param {Event} The webkitTransitionEnd event. NOTE: May be synthetic. | 884 * @param {Event} event The webkitTransitionEnd event. NOTE: May be |
| 885 * synthetic. |
| 885 * @private | 886 * @private |
| 886 */ | 887 */ |
| 887 onTransitionEnd_: function(event) { | 888 onTransitionEnd_: function(event) { |
| 888 if (event.propertyName && event.propertyName != 'height') { | 889 if (event.propertyName && event.propertyName != 'height') { |
| 889 // If not a synthetic event or a real transition we care about, bail. | 890 // If not a synthetic event or a real transition we care about, bail. |
| 890 return; | 891 return; |
| 891 } | 892 } |
| 892 | 893 |
| 893 var section = event.target; | 894 var section = event.target; |
| 894 section.classList.remove('sliding'); | 895 section.classList.remove('sliding'); |
| (...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1978 BrowserOptions.getLoggedInUsername = function() { | 1979 BrowserOptions.getLoggedInUsername = function() { |
| 1979 return BrowserOptions.getInstance().username_; | 1980 return BrowserOptions.getInstance().username_; |
| 1980 }; | 1981 }; |
| 1981 } | 1982 } |
| 1982 | 1983 |
| 1983 // Export | 1984 // Export |
| 1984 return { | 1985 return { |
| 1985 BrowserOptions: BrowserOptions | 1986 BrowserOptions: BrowserOptions |
| 1986 }; | 1987 }; |
| 1987 }); | 1988 }); |
| OLD | NEW |