OLD | NEW |
1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
2 <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/promise_resolver.html"> | 3 <link rel="import" href="chrome://resources/html/promise_resolver.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
6 <link rel="import" href="/about_page/about_page.html"> | 6 <link rel="import" href="/about_page/about_page.html"> |
7 <link rel="import" href="/advanced_page/advanced_page.html"> | 7 <link rel="import" href="/advanced_page/advanced_page.html"> |
8 <link rel="import" href="/basic_page/basic_page.html"> | 8 <link rel="import" href="/basic_page/basic_page.html"> |
9 <link rel="import" href="/route.html"> | 9 <link rel="import" href="/route.html"> |
10 <link rel="import" href="/settings_page/main_page_behavior.html"> | 10 <link rel="import" href="/settings_page/main_page_behavior.html"> |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 </style> | 58 </style> |
59 <content select="paper-icon-button"></content> | 59 <content select="paper-icon-button"></content> |
60 <div id="noSearchResults" hidden$="[[!showNoResultsFound_]]"> | 60 <div id="noSearchResults" hidden$="[[!showNoResultsFound_]]"> |
61 <div>$i18n{searchNoResults}</div> | 61 <div>$i18n{searchNoResults}</div> |
62 <div>$i18nRaw{searchNoResultsHelp}</div> | 62 <div>$i18nRaw{searchNoResultsHelp}</div> |
63 </div> | 63 </div> |
64 <template is="dom-if" if="[[showBasicPage_( | 64 <template is="dom-if" if="[[showBasicPage_( |
65 showPages_.basic, inSearchMode_, hasExpandedSection_)]]"> | 65 showPages_.basic, inSearchMode_, hasExpandedSection_)]]"> |
66 <settings-basic-page route="BASIC" prefs="{{prefs}}" | 66 <settings-basic-page route="BASIC" prefs="{{prefs}}" |
67 page-visibility="[[pageVisibility]]" | 67 page-visibility="[[pageVisibility]]" |
68 on-subpage-expand="onSubpageExpand_"> | 68 on-subpage-expand="onSubpageExpand_" |
| 69 on-freeze-scroll="onFreezeScroll_"> |
69 </settings-basic-page> | 70 </settings-basic-page> |
70 </template> | 71 </template> |
71 <template is="dom-if" | 72 <template is="dom-if" |
72 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> | 73 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> |
73 <template is="dom-if" if="[[showAdvancedToggle_( | 74 <template is="dom-if" if="[[showAdvancedToggle_( |
74 showPages_.basic, hasExpandedSection_, inSearchMode_)]]"> | 75 showPages_.basic, hasExpandedSection_, inSearchMode_)]]"> |
75 <div id="toggleSpacer"></div> | 76 <div id="toggleSpacer"></div> |
76 <div id="toggleContainer"> | 77 <div id="toggleContainer"> |
77 <paper-button id="advancedToggle" on-tap="toggleAdvancedPage_"> | 78 <paper-button id="advancedToggle" on-tap="toggleAdvancedPage_"> |
78 <span>$i18n{advancedPageTitle}</span> | 79 <span>$i18n{advancedPageTitle}</span> |
79 <iron-icon icon="[[arrowState_(advancedToggleExpanded_)]]"> | 80 <iron-icon icon="[[arrowState_(advancedToggleExpanded_)]]"> |
80 </iron-icon> | 81 </iron-icon> |
81 </paper-button> | 82 </paper-button> |
82 </div> | 83 </div> |
83 </template> | 84 </template> |
84 <template is="dom-if" if="[[showAdvancedPage_( | 85 <template is="dom-if" if="[[showAdvancedPage_( |
85 showPages_.advanced, inSearchMode_, hasExpandedSection_)]]"> | 86 showPages_.advanced, inSearchMode_, hasExpandedSection_)]]"> |
86 <settings-advanced-page route="ADVANCED" prefs="{{prefs}}" | 87 <settings-advanced-page route="ADVANCED" prefs="{{prefs}}" |
87 page-visibility="[[pageVisibility]]" | 88 page-visibility="[[pageVisibility]]" |
88 on-subpage-expand="onSubpageExpand_"> | 89 on-subpage-expand="onSubpageExpand_" |
| 90 on-freeze-scroll="onFreezeScroll_"> |
89 </settings-advanced-page> | 91 </settings-advanced-page> |
90 </template> | 92 </template> |
91 </template> | 93 </template> |
92 <template is="dom-if" if="[[showPages_.about]]"> | 94 <template is="dom-if" if="[[showPages_.about]]"> |
93 <settings-about-page route="ABOUT"></settings-about-page> | 95 <settings-about-page route="ABOUT"></settings-about-page> |
94 </template> | 96 </template> |
95 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> | 97 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> |
96 </template> | 98 </template> |
97 <script src="settings_main.js"></script> | 99 <script src="settings_main.js"></script> |
98 <script src="/search_settings.js"></script> | 100 <script src="/search_settings.js"></script> |
99 </dom-module> | 101 </dom-module> |
OLD | NEW |