diff --git a/app/options/options.vue b/app/options/options.vue index 7a336f2..3f85dda 100644 --- a/app/options/options.vue +++ b/app/options/options.vue @@ -212,7 +212,10 @@ export default { }, methods: { saveShortcuts: function() { - this.keys.forEach(key => delete key.sidebarOpen); + this.keys.forEach((key) => { + key.sitesArray = key.sites.split('\n') + delete key.sidebarOpen + }); localStorage.shortkeys = JSON.stringify({keys: this.keys}); this.$buefy.snackbar.open(`Shortcuts have been saved!`); }, diff --git a/app/scripts/background.js b/app/scripts/background.js index 370498a..68a4519 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -87,11 +87,11 @@ let globToRegex = function (glob) { * @returns {boolean} */ let isAllowedSite = function (keySetting, url) { - if (keySetting.blacklist !== 'true' && keySetting.blacklist !== 'whitelist') { + if (!keySetting.blacklist || keySetting.blacklist === 'false') { // This shortcut is allowed on all sites (not blacklisted or whitelisted). return true } - let allowed = keySetting.blacklist === 'true' + let allowed = (keySetting.blacklist === true || keySetting.blacklist === 'true') keySetting.sitesArray.forEach((site) => { if (url.match(globToRegex(site))) { allowed = !allowed diff --git a/app/scripts/content.js b/app/scripts/content.js index 7141b86..229423c 100644 --- a/app/scripts/content.js +++ b/app/scripts/content.js @@ -108,7 +108,6 @@ Mousetrap.prototype.stopCallback = function (e, element, combo) { */ browser.runtime.sendMessage({action: 'getKeys', url: document.URL}).then(function (response) { if (response) { - console.log(response); Shortkeys.keys = response if (Shortkeys.keys.length > 0) { Shortkeys.keys.forEach((key) => {