From 36a301a3c9cbb788860b8c4b020b5095fd3a3363 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Thu, 8 Feb 2018 09:47:31 +0100 Subject: Replaced use of $.get with axios.get and updated tests --- app/assets/javascripts/diff.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'app/assets/javascripts/diff.js') diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js index a162424b3cf..b26422ab725 100644 --- a/app/assets/javascripts/diff.js +++ b/app/assets/javascripts/diff.js @@ -1,3 +1,6 @@ +import axios from '~/lib/utils/axios_utils'; +import flash from '~/flash'; +import { __ } from '~/locale'; import { getLocationHash } from './lib/utils/url_utility'; import FilesCommentButton from './files_comment_button'; import SingleFileDiff from './single_file_diff'; @@ -69,7 +72,10 @@ export default class Diff { const view = file.data('view'); const params = { since, to, bottom, offset, unfold, view }; - $.get(link, params, response => $target.parent().replaceWith(response)); + // $.get(link, params, response => $target.parent().replaceWith(response)); + axios.get(link, { params }) + .then(({ data }) => $target.parent().replaceWith(data)) + .catch(() => flash(__('An error occurred while loading diff'))); } openAnchoredDiff(cb) { -- cgit v1.2.1 From 7959d46a892f90614306ba01f338bfc9009181fd Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Thu, 8 Feb 2018 15:37:43 +0100 Subject: Fixed typo, updated test, and removed commented code --- app/assets/javascripts/diff.js | 1 - 1 file changed, 1 deletion(-) (limited to 'app/assets/javascripts/diff.js') diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js index b26422ab725..3ab8f3ab7ad 100644 --- a/app/assets/javascripts/diff.js +++ b/app/assets/javascripts/diff.js @@ -72,7 +72,6 @@ export default class Diff { const view = file.data('view'); const params = { since, to, bottom, offset, unfold, view }; - // $.get(link, params, response => $target.parent().replaceWith(response)); axios.get(link, { params }) .then(({ data }) => $target.parent().replaceWith(data)) .catch(() => flash(__('An error occurred while loading diff'))); -- cgit v1.2.1