From 1c625d45786fa8b3f0d285d3165e4dd346985fac Mon Sep 17 00:00:00 2001 From: "Andrew E. Rhyne" Date: Sat, 17 Dec 2016 22:53:56 -0800 Subject: [PATCH] bit of cleanup + linting fixes --- .eslintrc | 3 ++- Makefile | 2 +- browser.js | 7 +++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.eslintrc b/.eslintrc index 21bfbb5a..658f7d8f 100644 --- a/.eslintrc +++ b/.eslintrc @@ -9,7 +9,8 @@ "node": true }, "rules": { - "no-console": 0 + "no-console": 0, + "no-empty": [1, { "allowEmptyCatch": true }] }, "extends": "eslint:recommended" } diff --git a/Makefile b/Makefile index 19716b29..ae247985 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ node_modules: package.json @touch node_modules lint: .FORCE - eslint debug.js + eslint browser.js debug.js index.js node.js test: .FORCE mocha diff --git a/browser.js b/browser.js index a2552839..b0fe9887 100644 --- a/browser.js +++ b/browser.js @@ -10,9 +10,9 @@ exports.formatArgs = formatArgs; exports.save = save; exports.load = load; exports.useColors = useColors; -exports.storage = 'undefined' != typeof chrome - && 'undefined' != typeof chrome.storage - ? chrome.storage.local +exports.storage = 'undefined' != typeof window.chrome + && 'undefined' != typeof window.chrome.storage + ? window.chrome.storage.local : localstorage(); /** @@ -148,7 +148,6 @@ function save(namespaces) { */ function load() { - var r; try { return exports.storage.debug; } catch(e) {}