fix: Close #112

howdy39 · Jan 4, 2017 · 800f2cc · 800f2cc
1 parent cdf0044
commit 800f2cc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -50,6 +50,7 @@
     "mocha": "^3.1.2",
     "npm-run-all": "^3.1.1",
     "object-assign": "^4.1.0",
+    "object.values": "^1.0.4",
     "postcss-loader": "^1.2.1",
     "postcss-nesting": "^2.3.1",
     "raw-loader": "^0.5.1",

diff --git a/src/common/util.js b/src/common/util.js
@@ -1,4 +1,5 @@
 import objectAssign from 'object-assign';
+import objectValues from 'object.values';
 import ChromeStorage from './chrome-storage';
 
 export default class Util {
@@ -25,12 +26,12 @@ export default class Util {
   }
 
   static removeOldHistories(histories, maxSize = 1000) {
-    const sortedHistories = Object.values(histories).sort((itemA, itemB) => (itemA.date < itemB.date) ? 1 : -1);
+    const sortedHistories = objectValues(histories).sort((itemA, itemB) => (itemA.date < itemB.date) ? 1 : -1);
     if (sortedHistories.length < maxSize) {
       return histories;
     }
 
-    const items = Object.values(histories).sort((itemA, itemB) => (itemA.date > itemB.date) ? 1 : -1);
+    const items = objectValues(histories).sort((itemA, itemB) => (itemA.date > itemB.date) ? 1 : -1);
 
     const removeSize = sortedHistories.length - maxSize;
 

diff --git a/src/components/settings/histories.js b/src/components/settings/histories.js
@@ -1,3 +1,4 @@
+import objectValues from 'object.values';
 import Vue from 'vue';
 import Util from '../../common/util';
 
@@ -32,7 +33,7 @@ export default function (histories) {
             </mdl-dialog>
           </section>`,
     data: () => {
-      const items = Object.values(histories).sort((itemA, itemB) => (itemA.date < itemB.date) ? 1 : -1);
+      const items = objectValues(histories).sort((itemA, itemB) => (itemA.date < itemB.date) ? 1 : -1);
       const search = '';
       return {
         items,

diff --git a/src/content_scripts/popular-items/mute-already-read-article-content.js b/src/content_scripts/popular-items/mute-already-read-article-content.js
@@ -1,3 +1,4 @@
+import objectValues from 'object.values';
 import Util from '../../common/util';
 import PopularItemsDomHandler from './popular-items-dom-handler.js';
 
@@ -6,7 +7,7 @@ export default class MuteAlreadyReadArticleContent {
 
   run() {
     Util.getHistories(historiesObj => {
-      const histories = Object.values(historiesObj);
+      const histories = objectValues(historiesObj);
       const handler = new PopularItemsDomHandler();
 
       handler.getArticles().forEach(article => {