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

Commit

Permalink
Fix error when adding a bookmark folder
Browse files Browse the repository at this point in the history
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
  • Loading branch information
diracdeltas committed Jun 28, 2017
1 parent 27b0547 commit 3b44160
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions app/renderer/components/bookmarks/addEditBookmarkHanger.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const Immutable = require('immutable')

// Components
const ReduxComponent = require('../reduxComponent')
Expand Down Expand Up @@ -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()
const currentDetail = bookmarkDetail.get('currentDetail') || new Immutable.Map()
const originalDetail = bookmarkDetail.get('originalDetail')

const props = {}
Expand Down

0 comments on commit 3b44160

Please sign in to comment.