diff --git a/src/components/quickConnectSettings/quickConnectSettings.js b/src/components/quickConnectSettings/quickConnectSettings.js deleted file mode 100644 index d91bc07295..0000000000 --- a/src/components/quickConnectSettings/quickConnectSettings.js +++ /dev/null @@ -1,42 +0,0 @@ -import globalize from '../../scripts/globalize'; -import toast from '../toast/toast'; -import Dashboard from '../../scripts/clientUtils'; - -export class QuickConnectSettings { - constructor() { } - - authorize(code) { - const url = ApiClient.getUrl('/QuickConnect/Authorize?Code=' + code); - ApiClient.ajax({ - type: 'POST', - url: url - }, true).then(() => { - toast(globalize.translate('QuickConnectAuthorizeSuccess')); - }).catch(() => { - toast(globalize.translate('QuickConnectAuthorizeFail')); - }); - - // prevent bubbling - return false; - } - - activate() { - const url = ApiClient.getUrl('/QuickConnect/Activate'); - return ApiClient.ajax({ - type: 'POST', - url: url - }).then(() => { - toast(globalize.translate('QuickConnectActivationSuccessful')); - return true; - }).catch((e) => { - console.error('Error activating quick connect. Error:', e); - Dashboard.alert({ - title: globalize.translate('HeaderError'), - message: globalize.translate('DefaultErrorMessage') - }); - throw e; - }); - } -} - -export default QuickConnectSettings; diff --git a/src/controllers/user/quickConnect/helper.js b/src/controllers/user/quickConnect/helper.js new file mode 100644 index 0000000000..54e16d72bb --- /dev/null +++ b/src/controllers/user/quickConnect/helper.js @@ -0,0 +1,36 @@ +import globalize from '../../../scripts/globalize'; +import toast from '../../../components/toast/toast'; +import Dashboard from '../../../scripts/clientUtils'; + +export const authorize = (code) => { + const url = ApiClient.getUrl('/QuickConnect/Authorize?Code=' + code); + ApiClient.ajax({ + type: 'POST', + url: url + }, true).then(() => { + toast(globalize.translate('QuickConnectAuthorizeSuccess')); + }).catch(() => { + toast(globalize.translate('QuickConnectAuthorizeFail')); + }); + + // prevent bubbling + return false; +}; + +export const activate = () => { + const url = ApiClient.getUrl('/QuickConnect/Activate'); + return ApiClient.ajax({ + type: 'POST', + url: url + }).then(() => { + toast(globalize.translate('QuickConnectActivationSuccessful')); + return true; + }).catch((e) => { + console.error('Error activating quick connect. Error:', e); + Dashboard.alert({ + title: globalize.translate('HeaderError'), + message: globalize.translate('DefaultErrorMessage') + }); + throw e; + }); +}; diff --git a/src/controllers/user/quickConnect/index.js b/src/controllers/user/quickConnect/index.js index 162f3d9783..2d8fcf1ab6 100644 --- a/src/controllers/user/quickConnect/index.js +++ b/src/controllers/user/quickConnect/index.js @@ -1,17 +1,13 @@ -import QuickConnectSettings from '../../../components/quickConnectSettings/quickConnectSettings'; +import { activate, authorize } from './helper'; import globalize from '../../../scripts/globalize'; import toast from '../../../components/toast/toast'; export default function (view) { - let quickConnectSettingsInstance = null; - view.addEventListener('viewshow', function () { const codeElement = view.querySelector('#txtQuickConnectCode'); - quickConnectSettingsInstance = new QuickConnectSettings(); - view.querySelector('#btnQuickConnectActivate').addEventListener('click', () => { - quickConnectSettingsInstance.activate(quickConnectSettingsInstance).then(() => { + activate().then(() => { renderPage(); }); }); @@ -24,7 +20,7 @@ export default function (view) { } const code = codeElement.value; - quickConnectSettingsInstance.authorize(code); + authorize(code); }); view.querySelector('.quickConnectSettingsContainer').addEventListener('submit', (e) => {