Merge pull request #86 from brave/fix/object-values

polyfill Object.values for webkit browsers
brave · May 8, 2017 · 5017451 · 5017451
2 parents c775b0c + ebd7a1b
commit 5017451
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ npm-debug.log*
 pids
 *.pid
 *.seed
+*.source.*.html
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov

diff --git a/client/recordUtil.js b/client/recordUtil.js
@@ -198,7 +198,8 @@ const mergeRecords = (recordsAndObjects) => {
       objectIdMap[id] = recordAndObject
     }
   })
-  return Object.values(objectIdMap)
+  // webkit does not support Object.values
+  return Object.keys(objectIdMap).map((key) => objectIdMap[key])
 }
 
 /**

diff --git a/package.json b/package.json
@@ -9,7 +9,8 @@
     "build": "yarn build-proto && browserify client/sync.js | uglifyjs - > bundles/bundle.js",
     "build-proto": "pbjs --target=static-module lib/api.proto > lib/api.proto.js",
     "browsertest": "yarn build-proto; yarn start-test; browserify test/client/*.js test/*.js | uglifyjs - | tape-run; exitCode=$?; yarn stop-test; exit $exitCode",
-    "browsertest-client": "yarn build-proto; yarn start-test; browserify test/client/*.js | tape-run --browser chrome; exitCode=$?; yarn stop-test; exit $exitCode",
+    "browsertest-chrome": "yarn build-proto; yarn start-test; browserify test/client/*.js | tape-run --browser chrome; exitCode=$?; yarn stop-test; exit $exitCode",
+    "browsertest-safari": "yarn build-proto; yarn start-test; browserify test/client/*.js | tape-run --browser safari; exitCode=$?; yarn stop-test; exit $exitCode",
     "check": "nsp check",
     "client": "yarn build && python -m SimpleHTTPServer",
     "coverage": "NODE_CONFIG_DIR=server/config/ istanbul cover tape test/*.js test/server/**/*.js --report lcovonly -- -R spec",