Various history fixes

brave · Aug 23, 2016 · 57086b8 · 57086b8
1 parent 042af99
commit 57086b8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git 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
@@ -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,15 +125,15 @@ 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
         return 0
       }).slice(-500)
   }
   clearBrowsingDataNow () {
-    aboutActions.clearBrowsingDataNow()
+    aboutActions.clearBrowsingDataNow({browserHistory: true})
   }
   render () {
     return <div className='siteDetailsPage'>

diff --git 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
@@ -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
@@ -18,7 +18,6 @@ table.sortableTable {
     th {
       background: @lightGray;
       color: @darkGray;
-      cursor: pointer;
       text-align: left;
       font-weight: 300;
       padding: 8px;
@@ -59,13 +58,11 @@ table.sortableTable {
           height: 1em;
           border-radius: 50%;
           box-shadow: 0 0 6px @black25;
-          cursor: pointer;
         }
       }
     }
   }
 }
 tr.rowHover:hover {
   background: #ffcc99;
-  cursor: pointer;
 }