Merge pull request #4104 from darkdh/4099

Fix sortableTable hover effect and searchTab onClick
brave · Sep 19, 2016 · 6655cc9 · 6655cc9
2 parents 0ca31d7 + 4ed8adb
commit 6655cc9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -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 () {

diff --git a/js/components/sortableTable.js b/js/components/sortableTable.js
@@ -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>