Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
don't create a new frame for about:error pages on pinned tabs
Browse files Browse the repository at this point in the history
fix #4036
auditors @bbondy

Test Plan:
1. Add a pinned tab for brave.com
2. Disconnect from the network
3. Open a new window
Pinned tab should show network error page

1. Add a pinned tab for brave.com
2. Go to the pinned tab and navigate to cnn.com
3. cnn.com should open in new tab
  • Loading branch information
bridiver committed Sep 21, 2016
1 parent d4d561b commit e33b55d
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion js/actions/windowActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ const windowActions = {
location = location.trim()
let newFrame = false
if (frame.get('pinnedLocation') && location !== 'about:certerror' &&
frame.get('location') !== 'about:certerror') {
frame.get('location') !== 'about:certerror' &&
location !== 'about:error' &&
frame.get('location') !== 'about:error') {
try {
const origin1 = new window.URL(frame.get('location')).origin
const origin2 = new window.URL(location).origin
Expand Down

1 comment on commit e33b55d

@bbondy
Copy link
Member

@bbondy bbondy commented on e33b55d Sep 22, 2016

Choose a reason for hiding this comment

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

++

Please sign in to comment.