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

Fixes Other bookmarks not being usable #10610

Merged
merged 1 commit into from
Sep 28, 2017
Merged

Fixes Other bookmarks not being usable #10610

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
2 changes: 1 addition & 1 deletion app/common/lib/bookmarkFoldersUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ const buildFolder = (folderDetails, folders) => {
title: folderDetails.get('title'),
folderId: Number(key),
key: key.toString(),
parentFolderId: ~~folderDetails.get('parentFolderId', 0),
parentFolderId: Number(folderDetails.get('parentFolderId', 0)),
partitionNumber: Number(folderDetails.get('partitionNumber', 0)),
objectId: folderDetails.get('objectId', null),
type: siteTags.BOOKMARK_FOLDER,
Expand Down
2 changes: 1 addition & 1 deletion app/common/lib/bookmarkUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ const buildBookmark = (state, bookmarkDetail) => {
return makeImmutable({
title: bookmarkDetail.get('title', ''),
location: bookmarkDetail.get('location'),
parentFolderId: ~~bookmarkDetail.get('parentFolderId', 0),
parentFolderId: Number(bookmarkDetail.get('parentFolderId', 0)),
partitionNumber: Number(dataItem.get('partitionNumber', 0)),
objectId: bookmarkDetail.get('objectId', null),
favicon: dataItem.get('favicon'),
Expand Down
6 changes: 3 additions & 3 deletions app/common/state/bookmarkFoldersState.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const bookmarkFoldersState = {

const newFolder = oldFolder.merge(makeImmutable({
title: folderDetails.get('title'),
parentFolderId: ~~folderDetails.get('parentFolderId', 0)
parentFolderId: Number(folderDetails.get('parentFolderId', 0))
}))

if (oldFolder.get('parentFolderId') !== newFolder.get('parentFolderId')) {
Expand All @@ -90,7 +90,7 @@ const bookmarkFoldersState = {
syncActions.removeSites([folder.toJS()])
}

folders.filter(folder => folder.get('parentFolderId') === ~~folderKey)
folders.filter(folder => folder.get('parentFolderId') === Number(folderKey))
.map(folder => {
state = bookmarksState.removeBookmarksByParentId(state, folder.get('folderId'))
state = bookmarkFoldersState.removeFolder(state, folder.get('folderId'))
Expand Down Expand Up @@ -150,7 +150,7 @@ const bookmarkFoldersState = {
: destinationItem.get('folderId')

state = bookmarkOrderCache.removeCacheKey(state, folder.get('parentFolderId'), folderKey)
folder = folder.set('parentFolderId', ~~parentFolderId)
folder = folder.set('parentFolderId', Number(parentFolderId))
const newKey = bookmarkFoldersUtil.getKey(folder)
state = state.deleteIn([STATE_SITES.BOOKMARK_FOLDERS, folderKey])
state = bookmarkOrderCache.addFolderToCache(state, folder.get('parentFolderId'), newKey)
Expand Down
11 changes: 7 additions & 4 deletions app/common/state/bookmarksState.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ const bookmarksState = {
const removedBookmarks = []
const bookmarks = bookmarksState.getBookmarks(state)
.filter(bookmark => {
if (bookmark.get('parentFolderId') !== ~~parentFolderId) {
if (bookmark.get('parentFolderId') !== Number(parentFolderId)) {
return true
}
if (syncEnabled) {
Expand Down Expand Up @@ -205,14 +205,17 @@ const bookmarksState = {

// move bookmark into a new folder
if (moveIntoParent || destinationItem.get('parentFolderId') !== bookmark.get('parentFolderId')) {
const parentFolderId = destinationItem.get('type') === siteTags.BOOKMARK
let parentFolderId = destinationItem.get('type') === siteTags.BOOKMARK
? destinationItem.get('parentFolderId')
: destinationItem.get('folderId')

if (parentFolderId == null) {
parentFolderId = destinationKey
}

state = bookmarkOrderCache.removeCacheKey(state, bookmark.get('parentFolderId'), bookmarkKey)
state = bookmarkLocationCache.removeCacheKey(state, bookmark.get('location'), bookmarkKey)

bookmark = bookmark.set('parentFolderId', ~~parentFolderId)
bookmark = bookmark.set('parentFolderId', Number(parentFolderId))
const newKey = bookmarkUtil.getKey(bookmark)

state = state.deleteIn([STATE_SITES.BOOKMARKS, bookmarkKey])
Expand Down
3 changes: 2 additions & 1 deletion app/renderer/components/bookmarks/addEditBookmarkFolderForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class AddEditBookmarkFolderForm extends React.Component {

onParentFolderChange (e) {
this.setState({
parentFolderId: ~~e.target.value
parentFolderId: Number(e.target.value)
})
}

Expand Down Expand Up @@ -185,6 +185,7 @@ class AddEditBookmarkFolderForm extends React.Component {
defaultValue={this.state.parentFolderId}
onChange={this.onParentFolderChange} >
<option value='0' data-l10n-id='bookmarksToolbar' />
<option value='-1' data-l10n-id='otherBookmarks' />
{
this.props.folders.map((folder) => <option value={folder.folderId}>{folder.label}</option>)
}
Expand Down
3 changes: 2 additions & 1 deletion app/renderer/components/bookmarks/addEditBookmarkForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class AddEditBookmarkForm extends React.Component {

onParentFolderChange (e) {
this.setState({
parentFolderId: ~~e.target.value
parentFolderId: Number(e.target.value)
})
}

Expand Down Expand Up @@ -221,6 +221,7 @@ class AddEditBookmarkForm extends React.Component {
defaultValue={this.state.parentFolderId}
onChange={this.onParentFolderChange} >
<option value='0' data-l10n-id='bookmarksToolbar' />
<option value='-1' data-l10n-id='otherBookmarks' />
{
this.props.folders.map((folder) => <option value={folder.folderId}>{folder.label}</option>)
}
Expand Down