diff options
author | Phil Hughes <me@iamphill.com> | 2018-01-26 09:19:03 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-01-30 09:12:56 +0000 |
commit | a16cdd0b3eeae3e9af722c417a6c5fab36f228d1 (patch) | |
tree | 7a5eff5f3e3c762eaba9bcbf3e90def4685a78e0 /app/assets/javascripts/blob | |
parent | e0b4d919cd8c97e9c6e96304e0770737c6bb3e52 (diff) | |
download | gitlab-ce-a16cdd0b3eeae3e9af722c417a6c5fab36f228d1.tar.gz |
converted blob viewer to axios
Diffstat (limited to 'app/assets/javascripts/blob')
-rw-r--r-- | app/assets/javascripts/blob/viewer/index.js | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/app/assets/javascripts/blob/viewer/index.js b/app/assets/javascripts/blob/viewer/index.js index 54132e8537b..612f604e725 100644 --- a/app/assets/javascripts/blob/viewer/index.js +++ b/app/assets/javascripts/blob/viewer/index.js @@ -1,5 +1,6 @@ import Flash from '../../flash'; import { handleLocationHash } from '../../lib/utils/common_utils'; +import axios from '../../lib/utils/axios_utils'; export default class BlobViewer { constructor() { @@ -127,25 +128,18 @@ export default class BlobViewer { const viewer = viewerParam; const url = viewer.getAttribute('data-url'); - return new Promise((resolve, reject) => { - if (!url || viewer.getAttribute('data-loaded') || viewer.getAttribute('data-loading')) { - resolve(viewer); - return; - } + if (!url || viewer.getAttribute('data-loaded') || viewer.getAttribute('data-loading')) { + return Promise.resolve(viewer); + } - viewer.setAttribute('data-loading', 'true'); + viewer.setAttribute('data-loading', 'true'); - $.ajax({ - url, - dataType: 'JSON', - }) - .fail(reject) - .done((data) => { + return axios.get(url) + .then(({ data }) => { viewer.innerHTML = data.html; viewer.setAttribute('data-loaded', 'true'); - resolve(viewer); + return viewer; }); - }); } } |