chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js - Issue 1880283004: [Media Router WebUI] Put sink list in conditional template.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js

Issue 1880283004: [Media Router WebUI] Put sink list in conditional template. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 4 years, 8 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

« no previous file with comments | « chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html ('k') | chrome/test/data/webui/media_router/media_router_container_cast_mode_list_tests.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js

diff --git a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js

index 624d10ac4002cbcfd597790c07fb12d750a385ad..4aebf74bb9c72fc4110d74f9d01e790e18416c39 100644

--- a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js

+++ b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js

@@ -1302,7 +1302,7 @@ Polymer({

onSinkClick_: function(event) {

var clickedSink = (this.isUserSearching_) ?

this.$$('#searchResults').itemForElement(event.target).sinkItem :

- this.$.sinkList.itemForElement(event.target);

+ this.$$('#sinkList').itemForElement(event.target);

this.showOrCreateRoute_(clickedSink);

this.fire('sink-click', {index: event['model'].index});

@@ -1634,12 +1634,15 @@ Polymer({

this.$['container-header'].style.marginTop = firstRunFlowHeight + 'px';

this.$['content'].style.marginTop =

firstRunFlowHeight + headerHeight + 'px';

- this.$['sink-list'].style.maxHeight =

- this.dialogHeight_ - headerHeight - firstRunFlowHeight -

- issueHeight - searchHeight + 'px';

- var searchResults = this.$$('#search-results');

- if (searchResults) {

- searchResults.style.maxHeight = this.$['sink-list'].style.maxHeight;

+ var sinkList = this.$$('#sink-list');

+ if (sinkList) {

+ sinkList.style.maxHeight =

+ this.dialogHeight_ - headerHeight - firstRunFlowHeight -

+ issueHeight - searchHeight + 'px';

+ var searchResults = this.$$('#search-results');

+ if (searchResults)

+ searchResults.style.maxHeight = sinkList.style.maxHeight;

}

});