Skip to content

Commit

Permalink
Merge branch '4.0-dev' into amenu
Browse files Browse the repository at this point in the history
  • Loading branch information
@ylahav
ylahav committed Dec 30, 2018
2 parents fd484fc + 0d68d9e commit ccbdbb2
Show file tree
Hide file tree
Showing 3 changed files with 112 additions and 107 deletions.
52 changes: 28 additions & 24 deletions build/media_src/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
View file
Expand Up @@ -11,27 +11,42 @@
document.addEventListener('DOMContentLoaded', () => {
if (Joomla.getOptions('js-extensions-update')) {
const options = Joomla.getOptions('js-extensions-update');

const update = (type, text) => {
const link = document.getElementById('plg_quickicon_extensionupdate');
const linkSpans = [].slice.call(link.querySelectorAll('span.j-links-link'));
if (link) {
link.classList.add(type);
}

if (linkSpans.length) {
linkSpans.forEach((span) => {
span.innerHTML = text;
});
}
};

Joomla.request({
url: `${options.ajaxUrl}&eid=0&skip=700`,
method: 'GET',
data: '',
perform: true,
onSuccess: (response) => {
const link = document.getElementById('plg_quickicon_extensionupdate');
const linkSpan = link.querySelectorAll('span.j-links-link');
const updateInfoList = JSON.parse(response);

if (updateInfoList instanceof Array) {
if (Array.isArray(updateInfoList)) {
if (updateInfoList.length === 0) {
// No updates
link.classList.add('success');
for (let i = 0, len = linkSpan.length; i < len; i += 1) {
linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_EXTENSIONUPDATE_UPTODATE');
}
// No updates
update('success', Joomla.Text._('PLG_QUICKICON_EXTENSIONUPDATE_UPTODATE'));
} else {
const messages = {
warning: [
`<div class="message-alert">${Joomla.JText._('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_MESSAGE').replace('%s', `<span class="badge badge-pill badge-danger">${updateInfoList.length}</span>`)}<button class="btn btn-sm btn-primary" onclick="document.location='${options.url}'">${Joomla.JText._('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_BUTTON')}</button>`,
`<div class="message-alert">
${Joomla.Text._('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_MESSAGE').replace('%s', `<span class="badge badge-pill badge-danger">${updateInfoList.length}</span>`)}
<button type="button" class="btn btn-sm btn-primary" onclick="document.location=${options.url}">
${Joomla.Text._('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_BUTTON')}
</button>
</div>`,
],
};

Expand All @@ -41,27 +56,16 @@
// Scroll to page top
window.scrollTo(0, 0);

link.classList.add('warning');
for (let i = 0, len = linkSpan.length; i < len; i += 1) {
linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND').replace('%s', `<span class="badge badge-light">${updateInfoList.length}</span>`);
}
update('warning', Joomla.Text._('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND').replace('%s', `<span class="badge badge-light">${updateInfoList.length}</span>`));
}
} else {
// An error occurred
link.classList.add('danger');
for (let i = 0, len = linkSpan.length; i < len; i += 1) {
linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_EXTENSIONUPDATE_ERROR');
}
update('danger', Joomla.Text._('PLG_QUICKICON_EXTENSIONUPDATE_ERROR'));
}
},
onError: () => {
// An error occurred
const link = document.getElementById('plg_quickicon_extensionupdate');
const linkSpan = link.querySelectorAll('span.j-links-link');
link.classList.add('danger');
for (let i = 0, len = linkSpan.length; i < len; i += 1) {
linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_EXTENSIONUPDATE_ERROR');
}
// An error occurred
update('danger', Joomla.Text._('PLG_QUICKICON_EXTENSIONUPDATE_ERROR'));
},
});
}
Expand Down
116 changes: 60 additions & 56 deletions build/media_src/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
View file
Expand Up @@ -9,74 +9,78 @@
'use strict';

const checkForJoomlaUpdates = () => {
const options = Joomla.getOptions('js-joomla-update');
const link = document.getElementById('plg_quickicon_joomlaupdate');
const linkSpans = [].slice.call(link.querySelectorAll('span.j-links-link'));
if (Joomla.getOptions('js-extensions-update')) {
const options = Joomla.getOptions('js-joomla-update');

Joomla.request({
url: `${options.ajaxUrl}&eid=700&cache_timeout=3600`,
method: 'GET',
data: '',
perform: true,
onSuccess: (response) => {
const updateInfoList = JSON.parse(response);
const update = (type, text) => {
const link = document.getElementById('plg_quickicon_joomlaupdate');
const linkSpans = [].slice.call(link.querySelectorAll('span.j-links-link'));
if (link) {
link.classList.add(type);
}

if (updateInfoList instanceof Array) {
if (updateInfoList.length === 0) {
// No updates
link.classList.add('success');
linkSpans.forEach((span) => {
span.innerHTML = Joomla.JText._('PLG_QUICKICON_JOOMLAUPDATE_UPTODATE');
});
} else {
const updateInfo = updateInfoList.shift();
if (linkSpans.length) {
linkSpans.forEach((span) => {
span.innerHTML = text;
});
}
};

if (updateInfo.version !== options.version) {
const messages = {
warning: [
`<div class="message-alert">${Joomla.JText._('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_MESSAGE').replace('%s', `<span class="badge badge-danger"> \u200E ${updateInfo.version}</span>`)}`
+ `<button class="btn btn-sm btn-primary" onclick="document.location='${options.url}'">`
+ `${Joomla.JText._('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_BUTTON')}</button>`,
],
};
Joomla.request({
url: `${options.ajaxUrl}&eid=700&cache_timeout=3600`,
method: 'GET',
data: '',
perform: true,
onSuccess: (response) => {
const updateInfoList = JSON.parse(response);

// Render the message
Joomla.renderMessages(messages);
if (Array.isArray(updateInfoList)) {
if (updateInfoList.length === 0) {
// No updates
update('success', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_UPTODATE'));
} else {
const updateInfo = updateInfoList.shift();

// Scroll to page top
window.scrollTo(0, 0);
if (updateInfo.version !== options.version) {
const messages = {
warning: [
`<div class="message-alert">
${Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_MESSAGE').replace('%s', `<span class="badge badge-danger"> \u200E ${updateInfo.version}</span>`)}
<button type="button" class="btn btn-sm btn-primary" onclick="document.location='${options.url}'">
${Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_BUTTON')}
</button>
</div>`,
],
};

link.classList.add('warning');
linkSpans.forEach((span) => {
span.innerHTML = Joomla.JText._('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND').replace('%s', `<span class="badge badge-light"> \u200E ${updateInfo.version}</span>`);
});
} else {
link.classList.add('success');
linkSpans.forEach((span) => {
span.innerHTML = Joomla.JText._('PLG_QUICKICON_JOOMLAUPDATE_UPTODATE');
});
// Render the message
Joomla.renderMessages(messages);

// Scroll to page top
window.scrollTo(0, 0);

update('warning', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND').replace('%s', `<span class="badge badge-light"> \u200E ${updateInfo.version}</span>`));
} else {
update('success', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_UPTODATE'));
}
}
} else {
// An error occurred
update('danger', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_ERROR'));
}
} else {
},
onError: () => {
// An error occurred
link.classList.add('danger');
linkSpans.forEach((span) => {
span.innerHTML = Joomla.JText._('PLG_QUICKICON_JOOMLAUPDATE_ERROR');
});
}
},
onError: () => {
// An error occurred
link.classList.add('danger');
linkSpans.forEach((span) => {
span.innerHTML = Joomla.JText._('PLG_QUICKICON_JOOMLAUPDATE_ERROR');
});
},
});
update('danger', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_ERROR'));
},
});
}
};

const onBoot = () => {
if (!Joomla || typeof Joomla.getOptions !== 'function' || !Joomla.getOptions('js-joomla-update')) {
if (!Joomla
|| typeof Joomla.getOptions !== 'function'
|| !Joomla.getOptions('js-joomla-update')) {
throw new Error('Script is not properly initialised');
}

Expand Down
51 changes: 24 additions & 27 deletions build/media_src/plg_quickicon_overridecheck/js/overridecheck.es6.js
View file
Expand Up @@ -8,60 +8,57 @@
'use strict';

// Add a listener on content loaded to initiate the check.

document.addEventListener('DOMContentLoaded', () => {
if (Joomla.getOptions('js-override-check')) {
const options = Joomla.getOptions('js-override-check');
const update = (type, text, linkHref) => {
const link = document.getElementById('plg_quickicon_overridecheck');
const linkSpans = link.querySelectorAll('span.j-links-link');
if (link) {
link.classList.add(type);

if (linkHref) {
link.setAttribute('href', linkHref);
}
}

if (linkSpans.length) {
linkSpans.forEach((span) => {
span.innerHTML = text;
});
}
};

Joomla.request({
url: options.ajaxUrl,
method: 'GET',
data: '',
perform: true,
onSuccess: (response) => {
const link = document.getElementById('plg_quickicon_overridecheck');
const linkSpan = link.querySelectorAll('span.j-links-link');
const updateInfoList = JSON.parse(response);

if (updateInfoList.installerOverride !== 'disabled') {
if (updateInfoList instanceof Array) {
if (Array.isArray(updateInfoList)) {
if (updateInfoList.length === 0) {
// No overrides found
link.classList.add('success');
for (let i = 0, len = linkSpan.length; i < len; i += 1) {
linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_UPTODATE');
}
update('success', Joomla.Text._('PLG_QUICKICON_OVERRIDECHECK_UPTODATE'), '');
} else {
// Scroll to page top
window.scrollTo(0, 0);

link.classList.add('danger');
for (let i = 0, len = linkSpan.length; i < len; i += 1) {
linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND').replace('%s', `<span class="badge badge-light">${updateInfoList.length}</span>`);
}
update('danger', Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND').replace('%s', `<span class="badge badge-light">${updateInfoList.length}</span>`), '');
}
} else {
// An error occurred
link.classList.add('danger');
for (let i = 0, len = linkSpan.length; i < len; i += 1) {
linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR');
}
update('danger', Joomla.Text._('PLG_QUICKICON_OVERRIDECHECK_ERROR'), '');
}
} else {
link.classList.add('danger');
link.setAttribute('href', `index.php?option=com_plugins&task=plugin.edit&extension_id=${options.pluginId}`);
for (let i = 0, len = linkSpan.length; i < len; i += 1) {
linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE');
}
update('danger', Joomla.Text._('PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE'), `index.php?option=com_plugins&task=plugin.edit&extension_id=${options.pluginId}`);
}
},
onError: () => {
// An error occurred
const link = document.getElementById('plg_quickicon_overridecheck');
const linkSpan = link.querySelectorAll('span.j-links-link');
link.classList.add('danger');
for (let i = 0, len = linkSpan.length; i < len; i += 1) {
linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR');
}
update('danger', Joomla.Text._('PLG_QUICKICON_OVERRIDECHECK_ERROR'), '');
},
});
}
Expand Down

0 comments on commit ccbdbb2

Please sign in to comment.