diff --git a/CHANGELOG.md b/CHANGELOG.md index 9864bbf..5ca9444 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,3 +28,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Update README with example configuration and instructions for local installation +## [1.0.22] - 2019-03-28 +### Changed +- Change the default value of subdomain to `unset` to have a well-formed URL. diff --git a/package.json b/package.json index 3ce38d4..b9a5101 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "moco-browser-extensions", "description": "Browser plugin for MOCO", - "version": "1.0.21", + "version": "1.0.22", "license": "MIT", "scripts": { "start": "yarn start:chrome", diff --git a/src/js/utils/browser.js b/src/js/utils/browser.js index 37de4cb..753bb08 100644 --- a/src/js/utils/browser.js +++ b/src/js/utils/browser.js @@ -2,6 +2,8 @@ import { head } from "lodash/fp" export const isChrome = () => typeof browser === "undefined" && chrome export const isFirefox = () => typeof browser !== "undefined" && chrome +const DEFAULT_SUBDOMAIN = "unset" + export const getSettings = (withDefaultSubdomain = true) => { const keys = ["subdomain", "apiKey"] const { version } = chrome.runtime.getManifest() @@ -9,7 +11,7 @@ export const getSettings = (withDefaultSubdomain = true) => { return new Promise(resolve => { chrome.storage.sync.get(keys, data => { if (withDefaultSubdomain) { - data.subdomain = data.subdomain || "__unset__" + data.subdomain = data.subdomain || DEFAULT_SUBDOMAIN } resolve({ ...data, version }) }) @@ -17,7 +19,7 @@ export const getSettings = (withDefaultSubdomain = true) => { } else { return browser.storage.sync.get(keys).then(data => { if (withDefaultSubdomain) { - data.subdomain = data.subdomain || "__unset__" + data.subdomain = data.subdomain || DEFAULT_SUBDOMAIN } return { ...data, version } })