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 858 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
869 if (section.hasTransitionEndListener_) | 869 if (section.hasTransitionEndListener_) |
870 return; | 870 return; |
871 | 871 |
872 section.addEventListener('webkitTransitionEnd', | 872 section.addEventListener('webkitTransitionEnd', |
873 this.onTransitionEnd_.bind(this)); | 873 this.onTransitionEnd_.bind(this)); |
874 section.hasTransitionEndListener_ = true; | 874 section.hasTransitionEndListener_ = true; |
875 }, | 875 }, |
876 | 876 |
877 /** | 877 /** |
878 * Called after an animation transition has ended. | 878 * Called after an animation transition has ended. |
879 * @param {Event} The webkitTransitionEnd event. NOTE: May be synthetic. | 879 * @param {Event} event The webkitTransitionEnd event. NOTE: May be |
| 880 * synthetic. |
880 * @private | 881 * @private |
881 */ | 882 */ |
882 onTransitionEnd_: function(event) { | 883 onTransitionEnd_: function(event) { |
883 if (event.propertyName && event.propertyName != 'height') { | 884 if (event.propertyName && event.propertyName != 'height') { |
884 // If not a synthetic event or a real transition we care about, bail. | 885 // If not a synthetic event or a real transition we care about, bail. |
885 return; | 886 return; |
886 } | 887 } |
887 | 888 |
888 var section = event.target; | 889 var section = event.target; |
889 section.classList.remove('sliding'); | 890 section.classList.remove('sliding'); |
(...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1973 BrowserOptions.getLoggedInUsername = function() { | 1974 BrowserOptions.getLoggedInUsername = function() { |
1974 return BrowserOptions.getInstance().username_; | 1975 return BrowserOptions.getInstance().username_; |
1975 }; | 1976 }; |
1976 } | 1977 } |
1977 | 1978 |
1978 // Export | 1979 // Export |
1979 return { | 1980 return { |
1980 BrowserOptions: BrowserOptions | 1981 BrowserOptions: BrowserOptions |
1981 }; | 1982 }; |
1982 }); | 1983 }); |
OLD | NEW |