Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #2437: The current panel will not be added to the history if it’s already the last panel #2674

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −19
Open

Fix #2437: The current panel will not be added to the history if it’s already the last panel #2674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 10 additions & 18 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/js/popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
},

async showPanel(panel, currentIdentity = null, backwards = false, addToPreviousPanelPath = true) {
if ((!backwards && addToPreviousPanelPath) || !this._currentPanel) {
if ((!backwards && addToPreviousPanelPath) && this._currentPanel && this._currentPanel !== panel) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While the change seems to work in this specific step-to-reproduce, it introduces an issue in the conditional logic in the following scenario:

  1. Open popup to show containerList
  2. Click on the right arrow of the Personal container to go to the containerInfo panel
  3. In containerInfo panel, click on "manage this container" button
  4. In containerEdit panel, click on the back button to go to the previous panel containerInfo
  5. In containerInfo panel, click on the back button to go to the previous panel containerList

On the last step, backwards value is set to false but it should be set to true since we clicked on the back button.

this._previousPanelPath.push(this._currentPanel);
}

Expand Down Expand Up @@ -837,7 +837,7 @@
const td = document.createElement("td");
const openTabs = identity.numberOfOpenTabs || "" ;

// TODO get UX and content decision on how to message and block clicks to containers with Mozilla VPN proxy configs

Check warning on line 840 in src/js/popup.js

View workflow job for this annotation

GitHub Actions / Run tests 

Unexpected 'todo' comment: 'TODO get UX and content decision on how...'
// when Mozilla VPN app is disconnected.

td.innerHTML = Utils.escaped`
Expand Down
Loading