diff options
Diffstat (limited to 'p/scripts')
| -rw-r--r-- | p/scripts/install.js | 4 | ||||
| -rw-r--r-- | p/scripts/integration.js | 62 | ||||
| -rw-r--r-- | p/scripts/main.js | 11 | ||||
| -rw-r--r-- | p/scripts/stats.js | 12 |
4 files changed, 48 insertions, 41 deletions
diff --git a/p/scripts/install.js b/p/scripts/install.js index ca1a2d7af..448f70b56 100644 --- a/p/scripts/install.js +++ b/p/scripts/install.js @@ -17,7 +17,7 @@ function hide_password(ev) { return false; } const toggles = document.getElementsByClassName('toggle-password'); -for (let i = 0 ; i < toggles.length ; i++) { +for (let i = 0; i < toggles.length; i++) { toggles[i].addEventListener('mousedown', show_password); toggles[i].addEventListener('mouseup', hide_password); } @@ -68,7 +68,7 @@ function ask_confirmation(ev) { } } const confirms = document.getElementsByClassName('confirm'); -for (let i = 0 ; i < confirms.length ; i++) { +for (let i = 0; i < confirms.length; i++) { confirms[i].addEventListener('click', ask_confirmation); } // @license-end diff --git a/p/scripts/integration.js b/p/scripts/integration.js index 076f379ec..bf9ac1ca6 100644 --- a/p/scripts/integration.js +++ b/p/scripts/integration.js @@ -9,41 +9,41 @@ const init_integration = function() { } setTimeout(init_integration, 50); return; - } + } - let shares = document.querySelectorAll('.group-share').length; - document.querySelector('.share.add').addEventListener('click', event => { - const shareTypes = event.target.closest('.group-controls').querySelector('select'); - const shareType = shareTypes.options[shareTypes.selectedIndex]; - let newShare = event.target.closest('form').getAttribute(`data-${shareType.getAttribute('data-form')}`); - newShare = newShare.replace(/##label##/g, shareType.text); - newShare = newShare.replace(/##type##/g, shareType.value); - newShare = newShare.replace(/##help##/g, shareType.getAttribute('data-help')); - newShare = newShare.replace(/##key##/g, shares); - newShare = newShare.replace(/##method##/g, shareType.getAttribute('data-method')); - newShare = newShare.replace(/##field##/g, shareType.getAttribute('data-field')); - event.target.closest('.form-group').insertAdjacentHTML('beforebegin', newShare); - shares++; - }); + let shares = document.querySelectorAll('.group-share').length; + document.querySelector('.share.add').addEventListener('click', event => { + const shareTypes = event.target.closest('.group-controls').querySelector('select'); + const shareType = shareTypes.options[shareTypes.selectedIndex]; + let newShare = event.target.closest('form').getAttribute('data-' + shareType.getAttribute('data-form')); + newShare = newShare.replace(/##label##/g, shareType.text); + newShare = newShare.replace(/##type##/g, shareType.value); + newShare = newShare.replace(/##help##/g, shareType.getAttribute('data-help')); + newShare = newShare.replace(/##key##/g, shares); + newShare = newShare.replace(/##method##/g, shareType.getAttribute('data-method')); + newShare = newShare.replace(/##field##/g, shareType.getAttribute('data-field')); + event.target.closest('.form-group').insertAdjacentHTML('beforebegin', newShare); + shares++; + }); - document.querySelector('.post').addEventListener('click', event => { - if (!event.target || !event.target.closest) { - return; - } + document.querySelector('.post').addEventListener('click', event => { + if (!event.target || !event.target.closest) { + return; + } - const deleteButton = event.target.closest('a.remove'); - if (null === deleteButton || !deleteButton.closest) { - return; - } + const deleteButton = event.target.closest('a.remove'); + if (null === deleteButton || !deleteButton.closest) { + return; + } - const share = deleteButton.closest('.group-share'); - const form = deleteButton.closest('form'); - if (!share.remove || !form.submit) { - return; - } - share.remove(); - form.submit(); - }); + const share = deleteButton.closest('.group-share'); + const form = deleteButton.closest('form'); + if (!share.remove || !form.submit) { + return; + } + share.remove(); + form.submit(); + }); }; if (document.readyState && document.readyState !== 'loading') { diff --git a/p/scripts/main.js b/p/scripts/main.js index 0dbae3913..61a6d7239 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -21,8 +21,11 @@ if (!Element.prototype.remove) Element.prototype.remove = function () { if (this function xmlHttpRequestJson(req) { let json = req.response; if (req.responseType !== 'json') { //IE11 - try { json = JSON.parse(req.responseText); } - catch (ex) { json = null; } + try { + json = JSON.parse(req.responseText); + } catch (ex) { + json = null; + } } return json; } @@ -81,7 +84,7 @@ function numberFormat(nStr) { rgx = /(\d+)(\d{3})/; let x1 = x[0]; while (rgx.test(x1)) { - x1 = x1.replace(rgx, '$1' + ' ' + '$2'); + x1 = x1.replace(rgx, '$1 $2'); } return x1 + x2; } @@ -908,7 +911,7 @@ function init_shortcuts() { if (k === s.reading_view) { delayedClick(document.querySelector('#nav_menu_views .view-reader')); return false; } if (k === s.global_view) { delayedClick(document.querySelector('#nav_menu_views .view-global')); return false; } if (k === s.rss_view) { delayedClick(document.querySelector('#nav_menu_views .view-rss')); return false; } - if (k === s.toggle_media) { toggle_media(); return false;} + if (k === s.toggle_media) { toggle_media(); return false; } return true; }; } diff --git a/p/scripts/stats.js b/p/scripts/stats.js index 54ea0e4de..6ca598784 100644 --- a/p/scripts/stats.js +++ b/p/scripts/stats.js @@ -32,7 +32,7 @@ function initStats() { grid: {verticalLines: false}, xaxis: {noTicks: 6, showLabels: false, tickDecimals: 0, min: -30.75, max: -0.25}, yaxis: {min: 0}, - mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}} + mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function (obj) { return numberFormat(obj.y); }}, }); // Feed per category Flotr.draw(document.getElementById('statsFeedPerCategory'), @@ -42,7 +42,9 @@ function initStats() { pie: {explode: 10, show: true, labelFormatter: function(){return '';}}, xaxis: {showLabels: false}, yaxis: {showLabels: false}, - mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}}, + mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function (obj) { + return obj.series.label + ' - ' + numberFormat(obj.y) + ' (' + (obj.fraction * 100).toFixed(1) + '%)'; + }}, legend: {container: document.getElementById('statsFeedPerCategoryLegend'), noColumns: 3} }); // Entry per category @@ -50,10 +52,12 @@ function initStats() { stats.entryByCategory, { grid: {verticalLines: false, horizontalLines: false}, - pie: {explode: 10, show: true, labelFormatter: function(){return '';}}, + pie: {explode: 10, show: true, labelFormatter: function () { return ''; }}, xaxis: {showLabels: false}, yaxis: {showLabels: false}, - mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}}, + mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function (obj) { + return obj.series.label + ' - ' + numberFormat(obj.y) + ' (' + (obj.fraction * 100).toFixed(1) + '%)'; + }}, legend: {container: document.getElementById('statsEntryPerCategoryLegend'), noColumns: 3} }); } |
