diff options
author | Phil Hughes <me@iamphill.com> | 2018-01-31 18:45:02 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-01-31 18:45:02 +0300 |
commit | 5d88e736acc8c70d1903496db4948a219a69ae5f (patch) | |
tree | 742add34d883943e98b5c42c551d8f80d9cf8718 /app/assets/javascripts/lib/utils/common_utils.js | |
parent | 7bd66940d9f1d79e7277dedfa6cb2749857660d6 (diff) | |
parent | 078dac4268cb5e991cc0012f5ad01ca3cb9a39c8 (diff) |
Merge branch 'master' into ph-axios-2
Diffstat (limited to 'app/assets/javascripts/lib/utils/common_utils.js')
-rw-r--r-- | app/assets/javascripts/lib/utils/common_utils.js | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js index 0fcf8b410af..13e0b0de437 100644 --- a/app/assets/javascripts/lib/utils/common_utils.js +++ b/app/assets/javascripts/lib/utils/common_utils.js @@ -1,5 +1,6 @@ import axios from './axios_utils'; import { getLocationHash } from './url_utility'; +import axios from './axios_utils'; export const getPagePath = (index = 0) => $('body').attr('data-page').split(':')[index]; @@ -380,22 +381,16 @@ export const resetFavicon = () => { } }; -export const setCiStatusFavicon = (pageUrl) => { - $.ajax({ - url: pageUrl, - dataType: 'json', - success: (data) => { +export const setCiStatusFavicon = pageUrl => + axios.get(pageUrl) + .then(({ data }) => { if (data && data.favicon) { setFavicon(data.favicon); } else { resetFavicon(); } - }, - error: () => { - resetFavicon(); - }, - }); -}; + }) + .catch(resetFavicon); export const spriteIcon = (icon, className = '') => { const classAttribute = className.length > 0 ? `class="${className}"` : ''; |