Skip to content

refactor: simplify loadClient function by extracting handleData #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DanAlejandroRodriguez wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: simplify loadClient function by extracting handleData #340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions public/src/modules/translator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,33 @@
const factory = require('./translator.common');

define('translator', ['jquery', 'utils'], function (jQuery, utils) {
function handleData(data, language, namespace, resolve) {
require(['hooks'], function (hooks) {
const payload = {
language: language,
namespace: namespace,
data: data,
};
hooks.fire('action:translator.loadClient', payload);
resolve(payload.promise ? Promise.resolve(payload.promise) : data);
});
}

function loadClient(language, namespace) {
const url = [config.asset_base_url, 'language', language, namespace].join('/') + '.json?' + config['cache-buster'];

return new Promise(function (resolve, reject) {
jQuery.getJSON([config.asset_base_url, 'language', language, namespace].join('/') + '.json?' + config['cache-buster'], function (data) {
const payload = {
language: language,
namespace: namespace,
data: data,
};
require(['hooks'], function (hooks) {
hooks.fire('action:translator.loadClient', payload);
resolve(payload.promise ? Promise.resolve(payload.promise) : data);
jQuery.getJSON(url)
.done(function (data) {
handleData(data, language, namespace, resolve);
})
.fail(function (jqxhr, textStatus, error) {
reject(new Error(textStatus + ', ' + error));
});
}).fail(function (jqxhr, textStatus, error) {
reject(new Error(textStatus + ', ' + error));
});
});
}

const warn = function () { console.warn.apply(console, arguments); };

return factory(utils, loadClient, warn);
});
});
Loading