Fix clicking on label for rebase on tip
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
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.html b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.html
index c53a741..b27e6ba 100644
--- a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.html
+++ b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.html
@@ -53,13 +53,13 @@
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 @@
</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>
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.js b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.js
index e1fbc09..4ecb31f 100644
--- a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.js
+++ b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.js
@@ -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;
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_test.html b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_test.html
index 4f9bc96..f48fe36 100644
--- a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_test.html
+++ b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_test.html
@@ -42,8 +42,8 @@
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 @@
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 @@
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 @@
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'));
