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

- History now uses title (not custom title) #4048

Merged
merged 1 commit into from
Sep 17, 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
6 changes: 3 additions & 3 deletions js/about/history.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ class HistoryDay extends ImmutableComponent {
: '',
value: entry.get('lastAccessedTime')
},
entry.get('customTitle') || entry.get('title')
? entry.get('customTitle') || entry.get('title')
entry.get('title')
? entry.get('title')
: entry.get('location'),
urlutils.getHostname(entry.get('location'), true)
])}
Expand Down Expand Up @@ -134,7 +134,7 @@ class AboutHistory extends React.Component {
}
searchedSiteDetails (searchTerm, siteDetails) {
return siteDetails.filter((siteDetail) => {
const title = siteDetail.get('customTitle') + siteDetail.get('title') + siteDetail.get('location')
const title = siteDetail.get('title') + siteDetail.get('location')
return title.match(new RegExp(searchTerm, 'gi'))
})
}
Expand Down
4 changes: 4 additions & 0 deletions less/about/history.less
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ body {
margin-right: 10px;
}
}

.sortableTable {
cursor: default;
}
}
}
}