diff --git a/js/about/aboutActions.js b/js/about/aboutActions.js index 32a011344c8..71eb1886276 100644 --- a/js/about/aboutActions.js +++ b/js/about/aboutActions.js @@ -123,8 +123,8 @@ const AboutActions = { ipc.send(messages.SET_RESOURCE_ENABLED, resourceName, enabled) }, - clearBrowsingDataNow: function () { - ipc.sendToHost(messages.CLEAR_BROWSING_DATA_NOW) + clearBrowsingDataNow: function (clearBrowsingDataDetail) { + ipc.sendToHost(messages.CLEAR_BROWSING_DATA_NOW, clearBrowsingDataDetail) }, createWallet: function () { diff --git a/js/about/history.js b/js/about/history.js index 16acafc4636..964928dae68 100644 --- a/js/about/history.js +++ b/js/about/history.js @@ -25,8 +25,8 @@ require('../../node_modules/font-awesome/css/font-awesome.css') class HistoryDay extends ImmutableComponent { navigate (entry) { aboutActions.newFrame({ - location: entry.get('location'), - partitionNumber: entry.get('partitionNumber') + location: entry.location, + partitionNumber: entry.partitionNumber }) } render () { @@ -125,7 +125,7 @@ class AboutHistory extends React.Component { }) } historyDescendingOrder () { - return this.state.history.filter((site) => site.get('tags').isEmpty()) + return this.state.history.filter((site) => site.get('lastAccessedTime')) .sort((left, right) => { if (left.get('lastAccessedTime') < right.get('lastAccessedTime')) return 1 if (left.get('lastAccessedTime') > right.get('lastAccessedTime')) return -1 @@ -133,7 +133,7 @@ class AboutHistory extends React.Component { }).slice(-500) } clearBrowsingDataNow () { - aboutActions.clearBrowsingDataNow() + aboutActions.clearBrowsingDataNow({browserHistory: true}) } render () { return
diff --git a/js/components/frame.js b/js/components/frame.js index 2b5fd55426c..4e7fb799204 100644 --- a/js/components/frame.js +++ b/js/components/frame.js @@ -650,7 +650,8 @@ class Frame extends ImmutableComponent { } break case messages.CLEAR_BROWSING_DATA_NOW: - windowActions.setClearBrowsingDataDetail({}) + method = (clearBrowsingDataDetail) => + windowActions.setClearBrowsingDataDetail(clearBrowsingDataDetail) break } method.apply(this, e.args) diff --git a/less/about/history.less b/less/about/history.less index 2c5b59089ba..0dead586247 100644 --- a/less/about/history.less +++ b/less/about/history.less @@ -52,7 +52,6 @@ body { margin: 0; padding: 0; width: 0; - cursor: pointer; position: relative; left: -35px; } diff --git a/less/sortableTable.less b/less/sortableTable.less index 1c250d91f08..fc4f2152b76 100644 --- a/less/sortableTable.less +++ b/less/sortableTable.less @@ -18,7 +18,6 @@ table.sortableTable { th { background: @lightGray; color: @darkGray; - cursor: pointer; text-align: left; font-weight: 300; padding: 8px; @@ -59,7 +58,6 @@ table.sortableTable { height: 1em; border-radius: 50%; box-shadow: 0 0 6px @black25; - cursor: pointer; } } } @@ -67,5 +65,4 @@ table.sortableTable { } tr.rowHover:hover { background: #ffcc99; - cursor: pointer; }