Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(429)

Unified Diff: chrome/browser/resources/settings/internet_page/network_summary_item.html

Issue 2260613003: MD Settings: Intenet: Fix network list (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_638377_scrollable_behavior
Patch Set: . Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/internet_page/network_summary_item.html
diff --git a/chrome/browser/resources/settings/internet_page/network_summary_item.html b/chrome/browser/resources/settings/internet_page/network_summary_item.html
index 3bbceebc3c3f37afaa9aa58247457b38b739d1f2..80c0569a45f0349da475c68bcb33ecbca8b44b8e 100644
--- a/chrome/browser/resources/settings/internet_page/network_summary_item.html
+++ b/chrome/browser/resources/settings/internet_page/network_summary_item.html
@@ -1,4 +1,5 @@
<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html">
@@ -18,7 +19,6 @@
.button-row {
align-items: center;
- border-top: var(--settings-separator-line);
display: flex;
min-height: var(--settings-row-min-height);
}
@@ -60,18 +60,20 @@
</div>
</div>
</div>
- <template is="dom-if" if="[[expanded]]">
- <div class="list-frame">
- <cr-network-list id="networkList" max-height="[[maxHeight]]"
- networks="[[networkStateList]]" opened="{{expanded}}" show-buttons>
- </cr-network-list>
- <template is="dom-if"
- if="[[knownNetworksIsVisible_(activeNetworkState)]]">
- <div class="button-row" actionable on-tap="onKnownNetworksTap_">
- <a is="action-link">$i18n{knownNetworksButton}</a>
- </div>
- </template>
- </div>
+ <template is="dom-if" if="[[domIfIsVisible_(expanded, wasExpanded)]]">
+ <iron-collapse opened="[[ironCollapseIsOpened_(expanded, wasExpanded)]]">
dschuyler 2016/08/18 23:30:18 nit: The function names domIfIsVisible_ and ironC
stevenjb 2016/08/19 00:20:43 You mean like networkListDomIfIsVisible? That's ge
dschuyler 2016/08/19 21:05:20 This is just a suggestion, feel free to ignore it.
stevenjb 2016/08/22 15:16:02 I appreciate the suggestion, and after some though
+ <div class="list-frame">
+ <cr-network-list id="networkList" max-height="[[maxHeight]]"
+ networks="[[networkStateList]]" show-buttons>
+ </cr-network-list>
+ <template is="dom-if"
+ if="[[knownNetworksIsVisible_(activeNetworkState)]]">
+ <div class="button-row" actionable on-tap="onKnownNetworksTap_">
+ <a is="action-link">$i18n{knownNetworksButton}</a>
+ </div>
+ </template>
+ </div>
+ </iron-collapse>
</template>
</template>
<script src="network_summary_item.js"></script>

Powered by Google App Engine
This is Rietveld 408576698