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

Set bookmark url if no title present fixes #3442 #3445

Closed
wants to merge 2 commits into from
Closed

Set bookmark url if no title present fixes #3442 #3445

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0b4964
Set bookamrk url if no title present fixes #3442
Aug 26, 2016
d161057
Validate bookmark name only for folders
Aug 27, 2016
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
16 changes: 9 additions & 7 deletions js/components/addEditBookmark.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,10 @@ class AddEditBookmark extends ImmutableComponent {
get isBlankTab () {
return ['about:blank', 'about:newtab'].includes(this.props.currentDetail.get('location'))
}

get bookmarkNameValid () {
let title = (this.props.currentDetail.get('title') || this.props.currentDetail.get('customTitle'))
return ((typeof title === 'string') && title.trim().length > 0)
}

get isFolder () {
return siteUtil.isFolder(this.props.currentDetail)
}
Expand Down Expand Up @@ -102,10 +100,10 @@ class AddEditBookmark extends ImmutableComponent {
}
onSave () {
// First check if the title of the currentDetail is set
if (!this.bookmarkNameValid) {
if (this.isFolder && !this.bookmarkNameValid) {
return false
}

this.showToolbarOnFirstBookmark()
const tag = this.isFolder ? siteTags.BOOKMARK_FOLDER : siteTags.BOOKMARK
appActions.addSite(this.props.currentDetail, tag, this.props.originalDetail, this.props.destinationDetail)
Expand All @@ -121,15 +119,19 @@ class AddEditBookmark extends ImmutableComponent {
if (this.props.currentDetail.get('customTitle') !== undefined) {
return this.props.currentDetail.get('customTitle')
}
return this.props.currentDetail.get('title') || this.props.currentDetail.get('location')
return ''
}
get placeholderName () {
let title = this.props.currentDetail.get('title')
return title ? title : this.props.currentDetail.get('location')
}
render () {
return <Dialog onHide={this.onClose} isClickDismiss>
<div className='genericForm' onClick={this.onClick}>
<div className='genericFormTable'>
<div id='bookmarkName' className='formRow'>
<label data-l10n-id='nameField' htmlFor='bookmarkName' />
<input spellCheck='false' onKeyDown={this.onKeyDown} onChange={this.onNameChange} value={this.displayBookmarkName} ref={(bookmarkName) => { this.bookmarkName = bookmarkName }} />
<input spellCheck='false' onKeyDown={this.onKeyDown} onChange={this.onNameChange} placeholder={this.placeholderName} value={this.displayBookmarkName} ref={(bookmarkName) => { this.bookmarkName = bookmarkName }} />
</div>
{
!this.isFolder
Expand All @@ -155,7 +157,7 @@ class AddEditBookmark extends ImmutableComponent {
? <a data-l10n-id='delete' className='removeBookmarkLink link' onClick={this.onRemoveBookmark} />
: null
}
<Button l10nId='save' disabled={!this.bookmarkNameValid} className='primaryButton' onClick={this.onSave} />
<Button l10nId='save' disabled={this.isFolder && !this.bookmarkNameValid} className='primaryButton' onClick={this.onSave} />
</div>
</div>
</div>
Expand Down