Fix template problems with gr-confirm-rebase-dialog
Change-Id: Ifa594553bde22230d475b206abe9d0a8f2ac70f9
diff --git a/polygerrit-ui/app/BUILD b/polygerrit-ui/app/BUILD
index 6fc95de..828851c 100644
--- a/polygerrit-ui/app/BUILD
+++ b/polygerrit-ui/app/BUILD
@@ -95,7 +95,6 @@
"elements/change/gr-confirm-abandon-dialog/gr-confirm-abandon-dialog_html.ts",
"elements/change/gr-confirm-cherrypick-dialog/gr-confirm-cherrypick-dialog_html.ts",
"elements/change/gr-confirm-move-dialog/gr-confirm-move-dialog_html.ts",
- "elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_html.ts",
"elements/change/gr-file-list-header/gr-file-list-header_html.ts",
"elements/change/gr-file-list/gr-file-list_html.ts",
"elements/change/gr-label-score-row/gr-label-score-row_html.ts",
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.ts b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.ts
index 4e6c963..e1cc233 100644
--- a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.ts
+++ b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.ts
@@ -77,10 +77,10 @@
rebaseOnCurrent?: boolean;
@property({type: String})
- _text?: string;
+ _text = '';
@property({type: Object})
- _query?: AutocompleteQuery;
+ _query: AutocompleteQuery = () => Promise.resolve([]);
@property({type: Array})
_recentChanges?: RebaseChange[];
@@ -146,15 +146,15 @@
);
}
- _displayParentOption(rebaseOnCurrent: boolean, hasParent: boolean) {
+ _displayParentOption(rebaseOnCurrent?: boolean, hasParent?: boolean) {
return hasParent && rebaseOnCurrent;
}
- _displayParentUpToDateMsg(rebaseOnCurrent: boolean, hasParent: boolean) {
+ _displayParentUpToDateMsg(rebaseOnCurrent?: boolean, hasParent?: boolean) {
return hasParent && !rebaseOnCurrent;
}
- _displayTipOption(rebaseOnCurrent: boolean, hasParent: boolean) {
+ _displayTipOption(rebaseOnCurrent?: boolean, hasParent?: boolean) {
return !(!rebaseOnCurrent && !hasParent);
}
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_html.ts b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_html.ts
index bed9240..1052201 100644
--- a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_html.ts
+++ b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_html.ts
@@ -79,7 +79,6 @@
name="rebaseOptions"
type="radio"
disabled$="[[!_displayTipOption(rebaseOnCurrent, hasParent)]]"
- on-click="_handleRebaseOnTip"
/>
<label id="rebaseOnTipLabel" for="rebaseOnTipInput">
Rebase on top of the [[branch]] branch<span hidden$="[[!hasParent]]">
