Reset input value when closing dialog within gr-edit-controls Change-Id: I5948bab3e8b4be672656851235e5367d5160f3ed
diff --git a/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls.ts b/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls.ts index e61d0b8..4163f9a8 100644 --- a/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls.ts +++ b/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls.ts
@@ -180,21 +180,19 @@ } } - _closeDialog(dialog?: GrDialog, clearInputs = false) { + _closeDialog(dialog?: GrDialog) { if (!dialog) return; - if (clearInputs) { - // Dialog may have autocompletes and plain inputs -- as these have - // different properties representing their bound text, it is easier to - // just make two separate queries. - dialog.querySelectorAll('gr-autocomplete').forEach(input => { - input.text = ''; - }); + // Dialog may have autocompletes and plain inputs -- as these have + // different properties representing their bound text, it is easier to + // just make two separate queries. + dialog.querySelectorAll('gr-autocomplete').forEach(input => { + input.text = ''; + }); - dialog.querySelectorAll('iron-input').forEach(input => { - input.bindValue = ''; - }); - } + dialog.querySelectorAll('iron-input').forEach(input => { + input.bindValue = ''; + }); dialog.classList.toggle('invisible', true); return this.$.overlay.close(); @@ -211,12 +209,12 @@ this.patchNum ); GerritNav.navigateToRelativeUrl(url); - this._closeDialog(this._getDialogFromEvent(e), true); + this._closeDialog(this._getDialogFromEvent(e)); } _handleUploadConfirm(path: string, fileData: string) { if (!this.change || !path || !fileData) { - this._closeDialog(this.$.openDialog, true); + this._closeDialog(this.$.openDialog); return Promise.resolve(); } return this.restApiService @@ -225,7 +223,7 @@ if (!res || !res.ok) { return; } - this._closeDialog(this.$.openDialog, true); + this._closeDialog(this.$.openDialog); GerritNav.navigateToChange(this.change); }); } @@ -240,7 +238,7 @@ if (!res || !res.ok) { return; } - this._closeDialog(dialog, true); + this._closeDialog(dialog); GerritNav.navigateToChange(this.change); }); } @@ -253,7 +251,7 @@ if (!res || !res.ok) { return; } - this._closeDialog(dialog, true); + this._closeDialog(dialog); GerritNav.navigateToChange(this.change); }); } @@ -266,7 +264,7 @@ if (!res || !res.ok) { return; } - this._closeDialog(dialog, true); + this._closeDialog(dialog); GerritNav.navigateToChange(this.change); }); }
diff --git a/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls_test.ts b/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls_test.ts index d9f5cd7..a0b5392 100644 --- a/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls_test.ts +++ b/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls_test.ts
@@ -117,7 +117,7 @@ assert.isFalse(editDiffStub.called); assert.isFalse(navStub.called); assert.isTrue(closeDialogSpy.called); - assert.equal(element._path, 'src/test.cpp'); + assert.equal(element._path, ''); }); }); }); @@ -202,7 +202,7 @@ ); assert.isFalse(navStub.called); assert.isTrue(closeDialogSpy.called); - assert.equal(element._path, 'src/test.cpp'); + assert.equal(element._path, ''); }); }); }); @@ -296,8 +296,8 @@ ); assert.isFalse(navStub.called); assert.isTrue(closeDialogSpy.called); - assert.equal(element._path, 'src/test.cpp'); - assert.equal(element._newPath, 'src/test.newPath'); + assert.equal(element._path, ''); + assert.equal(element._newPath, ''); }); }); }); @@ -365,7 +365,7 @@ ); assert.isFalse(navStub.called); assert.isTrue(closeDialogSpy.called); - assert.equal(element._path, 'src/test.cpp'); + assert.equal(element._path, ''); }); }); });