From 08c3920ce14628e90244fba5f580ca4d7bdabdbd Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 18 Sep 2018 14:43:46 -0500 Subject: Move findAndFollowLink to lib/utils --- app/assets/javascripts/lib/utils/navigation_utility.js | 15 +++++++++++++++ app/assets/javascripts/shortcuts.js | 2 +- app/assets/javascripts/shortcuts_dashboard_navigation.js | 15 --------------- app/assets/javascripts/shortcuts_navigation.js | 2 +- app/assets/javascripts/shortcuts_wiki.js | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 app/assets/javascripts/lib/utils/navigation_utility.js delete mode 100644 app/assets/javascripts/shortcuts_dashboard_navigation.js (limited to 'app') diff --git a/app/assets/javascripts/lib/utils/navigation_utility.js b/app/assets/javascripts/lib/utils/navigation_utility.js new file mode 100644 index 00000000000..1579b225e44 --- /dev/null +++ b/app/assets/javascripts/lib/utils/navigation_utility.js @@ -0,0 +1,15 @@ +import { visitUrl } from './url_utility'; + +/** + * Helper function that finds the href of the fiven selector and updates the location. + * + * @param {String} selector + */ +export default function findAndFollowLink(selector) { + const element = document.querySelector(selector); + const link = element && element.getAttribute('href'); + + if (link) { + visitUrl(link); + } +} diff --git a/app/assets/javascripts/shortcuts.js b/app/assets/javascripts/shortcuts.js index 99c71d6524a..bc1ae5c4976 100644 --- a/app/assets/javascripts/shortcuts.js +++ b/app/assets/javascripts/shortcuts.js @@ -3,7 +3,7 @@ import Cookies from 'js-cookie'; import Mousetrap from 'mousetrap'; import axios from './lib/utils/axios_utils'; import { refreshCurrentPage, visitUrl } from './lib/utils/url_utility'; -import findAndFollowLink from './shortcuts_dashboard_navigation'; +import findAndFollowLink from './lib/utils/navigation_utility'; const defaultStopCallback = Mousetrap.stopCallback; Mousetrap.stopCallback = (e, element, combo) => { diff --git a/app/assets/javascripts/shortcuts_dashboard_navigation.js b/app/assets/javascripts/shortcuts_dashboard_navigation.js deleted file mode 100644 index 9f69f110d06..00000000000 --- a/app/assets/javascripts/shortcuts_dashboard_navigation.js +++ /dev/null @@ -1,15 +0,0 @@ -import { visitUrl } from './lib/utils/url_utility'; - -/** - * Helper function that finds the href of the fiven selector and updates the location. - * - * @param {String} selector - */ -export default function findAndFollowLink(selector) { - const element = document.querySelector(selector); - const link = element && element.getAttribute('href'); - - if (link) { - visitUrl(link); - } -} diff --git a/app/assets/javascripts/shortcuts_navigation.js b/app/assets/javascripts/shortcuts_navigation.js index 6b595764bc5..e496fadaaa3 100644 --- a/app/assets/javascripts/shortcuts_navigation.js +++ b/app/assets/javascripts/shortcuts_navigation.js @@ -1,5 +1,5 @@ import Mousetrap from 'mousetrap'; -import findAndFollowLink from './shortcuts_dashboard_navigation'; +import findAndFollowLink from './lib/utils/navigation_utility'; import Shortcuts from './shortcuts'; export default class ShortcutsNavigation extends Shortcuts { diff --git a/app/assets/javascripts/shortcuts_wiki.js b/app/assets/javascripts/shortcuts_wiki.js index 41865dcf4ba..d30abfdd807 100644 --- a/app/assets/javascripts/shortcuts_wiki.js +++ b/app/assets/javascripts/shortcuts_wiki.js @@ -1,6 +1,6 @@ import Mousetrap from 'mousetrap'; import ShortcutsNavigation from './shortcuts_navigation'; -import findAndFollowLink from './shortcuts_dashboard_navigation'; +import findAndFollowLink from './lib/utils/navigation_utility'; export default class ShortcutsWiki extends ShortcutsNavigation { constructor() { -- cgit v1.2.1