diff options
author | Scott Escue <scott.escue@gmail.com> | 2018-12-02 09:46:11 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2019-01-10 09:00:39 +0300 |
commit | 87c571f8a3e9af9de0d979dc26f9838bb0fc924d (patch) | |
tree | 696c6b5f9e6d77996608acdd6f952826e2c52e8f /app/assets/javascripts/lib/utils | |
parent | 2cbc475e5327a860032414561916c7bd725685ac (diff) |
Addressing feedback from most recent reviews.
Diffstat (limited to 'app/assets/javascripts/lib/utils')
-rw-r--r-- | app/assets/javascripts/lib/utils/common_utils.js | 8 | ||||
-rw-r--r-- | app/assets/javascripts/lib/utils/url_utility.js | 6 |
2 files changed, 2 insertions, 12 deletions
diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js index afdca012127..fc34d243dd7 100644 --- a/app/assets/javascripts/lib/utils/common_utils.js +++ b/app/assets/javascripts/lib/utils/common_utils.js @@ -4,14 +4,6 @@ import { getLocationHash } from './url_utility'; import { convertToCamelCase } from './text_utility'; import { isObject } from './type_utility'; -/** - * Simply returns `window.location`. This function exists to provide a means to spy - * `window.location` in unit tests. - * - * @returns {Location | string | any} The browser's `window.location` - */ -export const windowLocation = () => window.location; - export const getPagePath = (index = 0) => { const page = $('body').attr('data-page') || ''; diff --git a/app/assets/javascripts/lib/utils/url_utility.js b/app/assets/javascripts/lib/utils/url_utility.js index 61f53a632b8..4ba84589705 100644 --- a/app/assets/javascripts/lib/utils/url_utility.js +++ b/app/assets/javascripts/lib/utils/url_utility.js @@ -1,5 +1,3 @@ -import { windowLocation } from './common_utils'; - // Returns an array containing the value(s) of the // of the key passed as an argument export function getParameterValues(sParam) { @@ -53,11 +51,11 @@ export function mergeUrlParams(params, url) { * @param {string} [url=windowLocation().href] - url from which the query param will be removed * @returns {string} A copy of the original url but without the query param */ -export function removeParams(params, url = windowLocation().href) { +export function removeParams(params, url = window.location.href) { const [rootAndQuery, fragment] = url.split('#'); const [root, query] = rootAndQuery.split('?'); - if (query === undefined) { + if (!query) { return url; } |