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

Fix error when adding a bookmark folder #9746

Merged
merged 1 commit into from
Jun 28, 2017
Merged

Fix error when adding a bookmark folder #9746

merged 1 commit into from
Jun 28, 2017

Conversation

diracdeltas
Copy link
Member

@diracdeltas diracdeltas commented Jun 28, 2017 •
edited
Loading

fix #9745

Test Plan:

  1. open fresh browser profile
  2. right click to add a bookmark folder
  3. there should be no errors in the browser console

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.

Test Plan:

Reviewer Checklist:

Tests

  • Adequate test coverage exists to prevent regressions
  • Tests should be independent and work correctly when run individually or as a suite ref
  • New files have MPL2 license header

@diracdeltas diracdeltas added this to the 0.18.x (Developer Channel) milestone Jun 28, 2017
@diracdeltas diracdeltas self-assigned this Jun 28, 2017
NejcZdovc
NejcZdovc suggested changes Jun 28, 2017
View reviewed changes
app/renderer/components/bookmarks/addEditBookmarkHanger.js Outdated
@@ -160,8 +161,8 @@ class AddEditBookmarkHanger extends React.Component {

mergeProps (state, ownProps) {
const currentWindow = state.get('currentWindow')
const bookmarkDetail = currentWindow.get('bookmarkDetail')
const currentDetail = bookmarkDetail.get('currentDetail')
const bookmarkDetail = currentWindow.get('bookmarkDetail') || new Immutable.Map()
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's do it like this, which is more reliable. Same for currentDetail.

currentWindow.get('bookmarkDetail', Immutable.Map())

@diracdeltas
Fix error when adding a bookmark folder
0ba5ace 
Test Plan:
1. open fresh browser profile
2. right click to add a bookmark folder
3. there should be no errors in the browser console
@diracdeltas diracdeltas requested a review from NejcZdovc June 28, 2017 05:52
@diracdeltas
Copy link
Member Author

@NejcZdovc fixed

bsclifton
bsclifton approved these changes Jun 28, 2017
View reviewed changes
Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

++ 👍

@NejcZdovc NejcZdovc merged commit 08d61da into master Jun 28, 2017
@diracdeltas diracdeltas mentioned this pull request Jun 28, 2017
Closed
@diracdeltas diracdeltas deleted the fix/9745 branch June 28, 2017 21:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@NejcZdovc NejcZdovc NejcZdovc approved these changes

@bsclifton bsclifton bsclifton approved these changes

Assignees

@diracdeltas diracdeltas

Labels
feature/bookmarks
Projects
None yet
Milestone
0.18.x Release
Development

Successfully merging this pull request may close these issues.

adding a bookmarks folder makes the browser unresponsive
4 participants
@diracdeltas @bsclifton @NejcZdovc @luixxiul