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

Fix sortableTable hover effect and searchTab onClick #4104

Merged
merged 1 commit into from
Sep 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 js/about/preferences.js
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ class SearchTab extends ImmutableComponent {
}

hoverCallback (rows) {
this.props.onChangeSetting(settings.DEFAULT_SEARCH_ENGINE, rows[1].props.children.props.name)
this.props.onChangeSetting(settings.DEFAULT_SEARCH_ENGINE, rows[1].value)
}

render () {
Expand Down
3 changes: 2 additions & 1 deletion js/components/sortableTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ class SortableTable extends ImmutableComponent {
const rowAttributes = this.getRowAttributes(row, i)
return <tr {...rowAttributes}
data-context-menu-disable={rowAttributes.onContextMenu ? true : undefined}
className={this.hasRowClassNames ? this.props.rowClassNames[i] : undefined}>{entry}</tr>
className={this.hasRowClassNames ? this.props.rowClassNames[i] + ' ' + rowAttributes.className
: rowAttributes.className}>{entry}</tr>
})
}
</tbody>
Expand Down