From 09e9b4e7501ffaf82c48622ade1b8b7b9ab84895 Mon Sep 17 00:00:00 2001 From: Paladox none Date: Fri, 25 Oct 2019 19:06:57 +0000 Subject: [PATCH] Add undefined check to _paramsChanged Change-Id: I65e05df2e00f13028c5a8501d3b6bc32d6cd7a09 --- .../diff/gr-diff-view/gr-diff-view.js | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js index b2ba148669..a138baa3ef 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js +++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js @@ -562,7 +562,7 @@ * @return {?Object} */ _getNavLinkPath(path, fileList, direction, opt_noUp) { - if (!path || fileList.length === 0) { return null; } + if (!path || !fileList || fileList.length === 0) { return null; } let idx = fileList.indexOf(path); if (idx === -1) { @@ -640,22 +640,24 @@ promises.push(this._getChangeDetail(this._changeNum).then(change => { let commit; let baseCommit; - for (const commitSha in change.revisions) { - if (!change.revisions.hasOwnProperty(commitSha)) continue; - const revision = change.revisions[commitSha]; - const patchNum = revision._number.toString(); - if (patchNum === this._patchRange.patchNum) { - commit = commitSha; - const commitObj = revision.commit || {}; - const parents = commitObj.parents || []; - if (this._patchRange.basePatchNum === PARENT && parents.length) { - baseCommit = parents[parents.length - 1].commit; + if (change) { + for (const commitSha in change.revisions) { + if (!change.revisions.hasOwnProperty(commitSha)) continue; + const revision = change.revisions[commitSha]; + const patchNum = revision._number.toString(); + if (patchNum === this._patchRange.patchNum) { + commit = commitSha; + const commitObj = revision.commit || {}; + const parents = commitObj.parents || []; + if (this._patchRange.basePatchNum === PARENT && parents.length) { + baseCommit = parents[parents.length - 1].commit; + } + } else if (patchNum === this._patchRange.basePatchNum) { + baseCommit = commitSha; } - } else if (patchNum === this._patchRange.basePatchNum) { - baseCommit = commitSha; } + this._commitRange = {commit, baseCommit}; } - this._commitRange = {commit, baseCommit}; })); promises.push(this._loadComments());