opendev/gerrit
Code Issues Proposed changes

Fix clicking on label for rebase on tip

Browse Source 
There was an issue with a duplicate ID 'rebaseOnTip' which caused
clicking the label to not select the radio button. This change addresses
the problem and standardizes naming conventions.

Change-Id: Ic7100f0099f6a14f306bc6806e0a8bd627899940
This commit is contained in:
Becky Siegel
2017-02-24 11:22:26 -08:00
parent b3ae6f0d6a
commit 2b561e6fd7
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.html
View File

@@ -53,13 +53,13 @@ limitations under the License.
on-cancel="_handleCancelTap">
<div class="header">Confirm rebase</div>
<div class="main">
<div id="rebaseOnParentContainer" class="rebaseOption"
<div id="rebaseOnParent" class="rebaseOption"
hidden$="[[!_displayParentOption(rebaseOnCurrent, hasParent)]]">
<input id="rebaseOnParent"
<input id="rebaseOnParentInput"
name="rebaseOptions"
type="radio"
on-tap="_handleRebaseOnParent">
<label id="rebaseOnParentLabel" for="rebaseOnParent">
<label id="rebaseOnParentLabel" for="rebaseOnParentInput">
Rebase on parent change
</label>
</div>
@@ -69,12 +69,12 @@ limitations under the License.
</div>
<div id="rebaseOnTip" class="rebaseOption"
hidden$="[[!_displayTipOption(rebaseOnCurrent, hasParent)]]">
<input id="rebaseOnTip"
<input id="rebaseOnTipInput"
name="rebaseOptions"
type="radio"
disabled$="[[!_displayTipOption(rebaseOnCurrent, hasParent)]]"
on-tap="_handleRebaseOnTip">
<label id="rebaseOnTipLabel" for="rebaseOnTip">
<label id="rebaseOnTipLabel" for="rebaseOnTipInput">
Rebase on top of the [[branch]] branch<span hidden="[[!hasParent]]">
(breaks relation chain)
</span>

4
polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.js
View File

@@ -91,10 +91,10 @@
*/
_updateSelectedOption: function(rebaseOnCurrent, hasParent) {
if (this._displayParentOption(rebaseOnCurrent, hasParent)) {
this.$.rebaseOnParent.checked = true;
this.$.rebaseOnParentInput.checked = true;
this._handleRebaseOnParent();
} else if (this._displayTipOption(rebaseOnCurrent, hasParent)) {
this.$.rebaseOnTip.checked = true;
this.$.rebaseOnTipInput.checked = true;
this._handleRebaseOnTip();
} else {
this.$.rebaseOnOtherInput.checked = true;

14
polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_test.html
View File

@@ -42,8 +42,8 @@ limitations under the License.
element.rebaseOnCurrent = true;
element.hasParent = true;
flushAsynchronousOperations();
assert.isTrue(element.$.rebaseOnParent.checked);
assert.isFalse(element.$.rebaseOnParentContainer.hasAttribute('hidden'));
assert.isTrue(element.$.rebaseOnParentInput.checked);
assert.isFalse(element.$.rebaseOnParent.hasAttribute('hidden'));
assert.isTrue(element.$.parentUpToDateMsg.hasAttribute('hidden'));
assert.isFalse(element.$.rebaseOnTip.hasAttribute('hidden'));
assert.isTrue(element.$.tipUpToDateMsg.hasAttribute('hidden'));
@@ -53,8 +53,8 @@ limitations under the License.
element.rebaseOnCurrent = false;
element.hasParent = true;
flushAsynchronousOperations();
assert.isTrue(element.$.rebaseOnTip.checked);
assert.isTrue(element.$.rebaseOnParentContainer.hasAttribute('hidden'));
assert.isTrue(element.$.rebaseOnTipInput.checked);
assert.isTrue(element.$.rebaseOnParent.hasAttribute('hidden'));
assert.isFalse(element.$.parentUpToDateMsg.hasAttribute('hidden'));
assert.isFalse(element.$.rebaseOnTip.hasAttribute('hidden'));
assert.isTrue(element.$.tipUpToDateMsg.hasAttribute('hidden'));
@@ -64,8 +64,8 @@ limitations under the License.
element.rebaseOnCurrent = true;
element.hasParent = false;
flushAsynchronousOperations();
assert.isTrue(element.$.rebaseOnTip.checked);
assert.isTrue(element.$.rebaseOnParentContainer.hasAttribute('hidden'));
assert.isTrue(element.$.rebaseOnTipInput.checked);
assert.isTrue(element.$.rebaseOnParent.hasAttribute('hidden'));
assert.isTrue(element.$.parentUpToDateMsg.hasAttribute('hidden'));
assert.isFalse(element.$.rebaseOnTip.hasAttribute('hidden'));
assert.isTrue(element.$.tipUpToDateMsg.hasAttribute('hidden'));
@@ -76,7 +76,7 @@ limitations under the License.
element.hasParent = false;
flushAsynchronousOperations();
assert.isTrue(element.$.rebaseOnOtherInput.checked);
assert.isTrue(element.$.rebaseOnParentContainer.hasAttribute('hidden'));
assert.isTrue(element.$.rebaseOnParent.hasAttribute('hidden'));
assert.isTrue(element.$.parentUpToDateMsg.hasAttribute('hidden'));
assert.isTrue(element.$.rebaseOnTip.hasAttribute('hidden'));
assert.isFalse(element.$.tipUpToDateMsg.hasAttribute('hidden'));