Replace "Show Comments Only" button with a paper-toggle-button

Bug: Issue 8107
Change-Id: I9ea1e3b36b4f52292cf1ffc2670f725f325f0ca8
This commit is contained in:
Becky Siegel
2018-01-08 15:29:12 -08:00
parent a2be8e437d
commit a977ee8d9f
3 changed files with 17 additions and 24 deletions

View File

@@ -15,6 +15,7 @@ limitations under the License.
--> -->
<link rel="import" href="../../../bower_components/polymer/polymer.html"> <link rel="import" href="../../../bower_components/polymer/polymer.html">
<link rel="import" href="../../../bower_components/paper-toggle-button/paper-toggle-button.html">
<link rel="import" href="../../core/gr-reporting/gr-reporting.html"> <link rel="import" href="../../core/gr-reporting/gr-reporting.html">
<link rel="import" href="../../shared/gr-button/gr-button.html"> <link rel="import" href="../../shared/gr-button/gr-button.html">
<link rel="import" href="../gr-message/gr-message.html"> <link rel="import" href="../gr-message/gr-message.html">
@@ -70,6 +71,10 @@ limitations under the License.
align-items: center; align-items: center;
display: flex; display: flex;
} }
paper-toggle-button {
--paper-toggle-button-checked-bar-color: var(--color-link);
--paper-toggle-button-checked-button-color: var(--color-link);
}
</style> </style>
<div class="header"> <div class="header">
<h3>Messages</h3> <h3>Messages</h3>
@@ -78,12 +83,9 @@ limitations under the License.
id="automatedMessageToggleContainer" id="automatedMessageToggleContainer"
class="container" class="container"
hidden$="[[!_hasAutomatedMessages(messages)]]"> hidden$="[[!_hasAutomatedMessages(messages)]]">
<gr-button <paper-toggle-button
id="automatedMessageToggle" id="automatedMessageToggle"
link checked="{{_hideAutomated}}"></paper-toggle-button>Only comments
on-tap="_handleAutomatedMessageToggleTap">
[[_computeAutomatedToggleText(_hideAutomated)]]
</gr-button>
<span class="transparent separator"></span> <span class="transparent separator"></span>
</span> </span>
<gr-button <gr-button

View File

@@ -175,12 +175,6 @@
this.handleExpandCollapse(!this._expanded); this.handleExpandCollapse(!this._expanded);
}, },
_handleAutomatedMessageToggleTap(e) {
e.preventDefault();
this._hideAutomated = !this._hideAutomated;
},
_handleScrollTo(e) { _handleScrollTo(e) {
this.scrollToMessage(e.detail.message.id); this.scrollToMessage(e.detail.message.id);
}, },
@@ -199,10 +193,6 @@
return expanded ? 'Collapse all' : 'Expand all'; return expanded ? 'Collapse all' : 'Expand all';
}, },
_computeAutomatedToggleText(hideAutomated) {
return hideAutomated ? 'Show all messages' : 'Show comments only';
},
/** /**
* Computes message author's file comments for change's message. * Computes message author's file comments for change's message.
* Method uses this.messages to find next message and relies on messages * Method uses this.messages to find next message and relies on messages

View File

@@ -484,7 +484,7 @@ limitations under the License.
assert.isFalse(!!allHiddenMessageEls.length); assert.isFalse(!!allHiddenMessageEls.length);
}); });
test('autogenerated messages hidden after hide button tap', () => { test('autogenerated messages hidden after comments only toggle', () => {
let allHiddenMessageEls = getHiddenMessages(); let allHiddenMessageEls = getHiddenMessages();
element._hideAutomated = false; element._hideAutomated = false;
@@ -497,16 +497,17 @@ limitations under the License.
assert.equal(allHiddenMessageEls.length, allMessageEls.length); assert.equal(allHiddenMessageEls.length, allMessageEls.length);
}); });
test('autogenerated messages not hidden after show button tap', () => { test('autogenerated messages not hidden after comments only toggle',
let allHiddenMessageEls = getHiddenMessages(); () => {
let allHiddenMessageEls = getHiddenMessages();
element._hideAutomated = true; element._hideAutomated = true;
MockInteractions.tap(element.$.automatedMessageToggle); MockInteractions.tap(element.$.automatedMessageToggle);
allHiddenMessageEls = getHiddenMessages(); allHiddenMessageEls = getHiddenMessages();
// Autogenerated messages are now hidden. // Autogenerated messages are now hidden.
assert.isFalse(!!allHiddenMessageEls.length); assert.isFalse(!!allHiddenMessageEls.length);
}); });
test('_getDelta', () => { test('_getDelta', () => {
let messages = [randomMessage()]; let messages = [randomMessage()];