From 7729c51cc4f210a6bb8e83d10147a9e2f79d9f30 Mon Sep 17 00:00:00 2001 From: epriestley Date: Thu, 7 Jun 2018 09:43:59 -0700 Subject: [PATCH] Fix an issue where scrolling down, then up, then down fails to show changeset header in Differential Summary: Ref T13151. See PHI616. There's a bug where the current banner changeset isn't cleared correctly when we hide the banner. Test Plan: - View revision with several changesets. - Scroll down slowly through first changeset until banner appears. - Scroll up until banner disappears. - Scroll back down. - Before: banner fails to reappear (code still thinks it's visible and we don't want to update it). - After: banner reappears correctly. Reviewers: amckinley, jmeador Reviewed By: jmeador Maniphest Tasks: T13151 Differential Revision: https://secure.phabricator.com/D19474 --- resources/celerity/map.php | 14 +++++++------- .../rsrc/js/application/diff/DiffChangesetList.js | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index bef8bd053a..42620af957 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -12,7 +12,7 @@ return array( 'core.pkg.css' => '8e3d1fb7', 'core.pkg.js' => '2058ec09', 'differential.pkg.css' => '06dc617c', - 'differential.pkg.js' => 'c2ca903a', + 'differential.pkg.js' => 'ef19e026', 'diffusion.pkg.css' => 'a2d17c7d', 'diffusion.pkg.js' => '6134c5a1', 'maniphest.pkg.css' => '4845691a', @@ -373,7 +373,7 @@ return array( 'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375', 'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63', 'rsrc/js/application/diff/DiffChangeset.js' => 'b49b59d6', - 'rsrc/js/application/diff/DiffChangesetList.js' => 'e74b7517', + 'rsrc/js/application/diff/DiffChangesetList.js' => 'f0ffe8c3', 'rsrc/js/application/diff/DiffInline.js' => 'e83d28f3', 'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832', 'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07', @@ -752,7 +752,7 @@ return array( 'phabricator-darkmessage' => 'c48cccdd', 'phabricator-dashboard-css' => 'fe5b1869', 'phabricator-diff-changeset' => 'b49b59d6', - 'phabricator-diff-changeset-list' => 'e74b7517', + 'phabricator-diff-changeset-list' => 'f0ffe8c3', 'phabricator-diff-inline' => 'e83d28f3', 'phabricator-drag-and-drop-file-upload' => '58dea2fa', 'phabricator-draggable-list' => 'bea6e7f4', @@ -2068,10 +2068,6 @@ return array( 'javelin-behavior', 'javelin-dom', ), - 'e74b7517' => array( - 'javelin-install', - 'phuix-button-view', - ), 'e83d28f3' => array( 'javelin-dom', ), @@ -2121,6 +2117,10 @@ return array( 'javelin-workflow', 'javelin-json', ), + 'f0ffe8c3' => array( + 'javelin-install', + 'phuix-button-view', + ), 'f1ff5494' => array( 'phui-button-css', 'phui-button-simple-css', diff --git a/webroot/rsrc/js/application/diff/DiffChangesetList.js b/webroot/rsrc/js/application/diff/DiffChangesetList.js index 5eba051d93..9e87fb0f31 100644 --- a/webroot/rsrc/js/application/diff/DiffChangesetList.js +++ b/webroot/rsrc/js/application/diff/DiffChangesetList.js @@ -1381,6 +1381,7 @@ JX.install('DiffChangesetList', { var changeset = this._getVisibleChangeset(); if (!changeset) { + this._bannerChangeset = null; JX.DOM.remove(node); return; }