' +
+ };
+ req2.setRequestHeader('Content-Type', 'application/json');
+ req2.send(JSON.stringify({
+ _csrf: context.csrf,
+ noCommit: 0,
+ }));
+ return;
+ }
+ // Progress bar
+ const feeds_count = json.feeds.length;
+ document.body.insertAdjacentHTML('beforeend', '
' +
json.feedback_actualize + '
/
0 / ' +
feeds_count + '
');
- for (let i = 10; i > 0; i--) {
- updateFeed(json.feeds, feeds_count);
- }
- };
+ for (let i = 10; i > 0; i--) {
+ updateFeed(json.feeds, feeds_count);
+ }
+ };
req.setRequestHeader('Content-Type', 'application/json');
req.send(JSON.stringify({
- _csrf: context.csrf,
- }));
+ _csrf: context.csrf,
+ }));
return false;
};
@@ -1286,9 +1291,9 @@ function init_actualize() {
//
//
-var notification = null,
- notification_interval = null,
- notification_working = false;
+let notification = null;
+let notification_interval = null;
+let notification_working = false;
function openNotification(msg, status) {
if (notification_working === true) {
@@ -1312,9 +1317,9 @@ function init_notifications() {
notification = document.getElementById('notification');
notification.querySelector('a.close').onclick = function () {
- closeNotification();
- return false;
- };
+ closeNotification();
+ return false;
+ };
if (notification.querySelector('.msg').innerHTML.length > 0) {
notification_working = true;
@@ -1324,12 +1329,14 @@ function init_notifications() {
//
//
-let popup = null,
- popup_iframe_container = null,
- popup_iframe = null,
- popup_txt = null,
- popup_working = false;
+let popup = null;
+let popup_iframe_container = null;
+let popup_iframe = null;
+let popup_txt = null;
+let popup_working = false;
+/* eslint-disable no-unused-vars */
+// TODO: Re-enable no-unused-vars
function openPopupWithMessage(msg) {
if (popup_working === true) {
return false;
@@ -1355,6 +1362,7 @@ function openPopupWithSource(source) {
popup_iframe_container.style.display = 'table-row';
popup.style.display = 'block';
}
+/* eslint-enable no-unused-vars */
function closePopup() {
popup.style.display = 'none';
@@ -1367,7 +1375,7 @@ function closePopup() {
}
function init_popup() {
- //Fetch elements.
+ // Fetch elements.
popup = document.getElementById('popup');
popup_iframe_container = document.getElementById('popup-iframe-container');
@@ -1375,12 +1383,12 @@ function init_popup() {
popup_txt = document.getElementById('popup-txt');
- //Configure close button.
+ // Configure close button.
document.getElementById('popup-close').addEventListener('click', function (ev) {
closePopup();
});
- //Configure close-on-click.
+ // Configure close-on-click.
window.addEventListener('click', function (ev) {
if (ev.target == popup) {
closePopup();
@@ -1390,7 +1398,7 @@ function init_popup() {
//
//
-var notifs_html5_permission = 'denied';
+let notifs_html5_permission = 'denied';
function notifs_html5_is_supported() {
return window.Notification !== undefined;
@@ -1414,12 +1422,12 @@ function notifs_html5_show(nb) {
});
notification.onclick = function () {
- delayedFunction(function() {
- location.reload();
- window.focus();
- notification.close();
- });
- };
+ delayedFunction(function () {
+ location.reload();
+ window.focus();
+ notification.close();
+ });
+ };
if (context.html5_notif_timeout !== 0) {
setTimeout(function () {
@@ -1442,61 +1450,61 @@ function refreshUnreads() {
req.open('GET', './?c=javascript&a=nbUnreadsPerFeed', true);
req.responseType = 'json';
req.onload = function (e) {
- const json = xmlHttpRequestJson(this);
- if (!json) {
- return badAjax(false);
- }
- const isAll = document.querySelector('.category.all.active');
- let new_articles = false;
+ const json = xmlHttpRequestJson(this);
+ if (!json) {
+ return badAjax(false);
+ }
+ const isAll = document.querySelector('.category.all.active');
+ let new_articles = false;
- Object.keys(json.feeds).forEach(function (feed_id) {
- const nbUnreads = json.feeds[feed_id];
- feed_id = 'f_' + feed_id;
- const elem = document.getElementById(feed_id),
- feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
+ Object.keys(json.feeds).forEach(function (feed_id) {
+ const nbUnreads = json.feeds[feed_id];
+ feed_id = 'f_' + feed_id;
+ const elem = document.getElementById(feed_id);
+ const feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
- if ((incUnreadsFeed(null, feed_id, nbUnreads - feed_unreads) || isAll) && //Update of current view?
+ if ((incUnreadsFeed(null, feed_id, nbUnreads - feed_unreads) || isAll) && // Update of current view?
(nbUnreads - feed_unreads > 0)) {
- const newArticle = document.getElementById('new-article');
- newArticle.setAttribute('aria-hidden', 'false');
- newArticle.style.display = 'block';
- new_articles = true;
- }
- });
-
- let nbUnreadTags = 0;
-
- Object.keys(json.tags).forEach(function (tag_id) {
- const nbUnreads = json.tags[tag_id];
- nbUnreadTags += nbUnreads;
- const tag = document.getElementById('t_' + tag_id);
- if (tag) {
- tag.setAttribute('data-unread', nbUnreads);
- tag.querySelector('.item-title').setAttribute('data-unread', numberFormat(nbUnreads));
- }
- });
-
- const tags = document.querySelector('.category.tags');
- if (tags) {
- tags.setAttribute('data-unread', nbUnreadTags);
- tags.querySelector('.title').setAttribute('data-unread', numberFormat(nbUnreadTags));
+ const newArticle = document.getElementById('new-article');
+ newArticle.setAttribute('aria-hidden', 'false');
+ newArticle.style.display = 'block';
+ new_articles = true;
}
+ });
- const title = document.querySelector('.category.all .title'),
- nb_unreads = title ? str2int(title.getAttribute('data-unread')) : 0;
+ let nbUnreadTags = 0;
- if (nb_unreads > 0 && new_articles) {
- faviconNbUnread(nb_unreads);
- notifs_html5_show(nb_unreads);
+ Object.keys(json.tags).forEach(function (tag_id) {
+ const nbUnreads = json.tags[tag_id];
+ nbUnreadTags += nbUnreads;
+ const tag = document.getElementById('t_' + tag_id);
+ if (tag) {
+ tag.setAttribute('data-unread', nbUnreads);
+ tag.querySelector('.item-title').setAttribute('data-unread', numberFormat(nbUnreads));
}
- };
+ });
+
+ const tags = document.querySelector('.category.tags');
+ if (tags) {
+ tags.setAttribute('data-unread', nbUnreadTags);
+ tags.querySelector('.title').setAttribute('data-unread', numberFormat(nbUnreadTags));
+ }
+
+ const title = document.querySelector('.category.all .title');
+ const nb_unreads = title ? str2int(title.getAttribute('data-unread')) : 0;
+
+ if (nb_unreads > 0 && new_articles) {
+ faviconNbUnread(nb_unreads);
+ notifs_html5_show(nb_unreads);
+ }
+ };
req.send();
}
-//
-var url_load_more = '',
- load_more = false,
- box_load_more = null;
+//
+let url_load_more = '';
+let load_more = false;
+let box_load_more = null;
function load_more_posts() {
if (load_more || !url_load_more || !box_load_more) {
@@ -1509,50 +1517,50 @@ function load_more_posts() {
req.open('GET', url_load_more, true);
req.responseType = 'document';
req.onload = function (e) {
- const html = this.response,
- formPagination = document.getElementById('mark-read-pagination');
+ const html = this.response;
+ const formPagination = document.getElementById('mark-read-pagination');
- const streamAdopted = document.adoptNode(html.getElementById('stream'));
- streamAdopted.querySelectorAll('.flux, .day').forEach(function (div) {
- box_load_more.insertBefore(div, formPagination);
- });
+ const streamAdopted = document.adoptNode(html.getElementById('stream'));
+ streamAdopted.querySelectorAll('.flux, .day').forEach(function (div) {
+ box_load_more.insertBefore(div, formPagination);
+ });
- const paginationOld = formPagination.querySelector('.pagination'),
- paginationNew = streamAdopted.querySelector('.pagination');
- formPagination.replaceChild(paginationNew, paginationOld);
+ const paginationOld = formPagination.querySelector('.pagination');
+ const paginationNew = streamAdopted.querySelector('.pagination');
+ formPagination.replaceChild(paginationNew, paginationOld);
- const bigMarkAsRead = document.getElementById('bigMarkAsRead');
- if (bigMarkAsRead) {
- if (context.display_order === 'ASC') {
- document.querySelector('#nav_menu_read_all .read_all').formAction = bigMarkAsRead.formAction;
- } else {
- bigMarkAsRead.formAction = document.querySelector('#nav_menu_read_all .read_all').formAction;
- }
+ const bigMarkAsRead = document.getElementById('bigMarkAsRead');
+ if (bigMarkAsRead) {
+ if (context.display_order === 'ASC') {
+ document.querySelector('#nav_menu_read_all .read_all').formAction = bigMarkAsRead.formAction;
+ } else {
+ bigMarkAsRead.formAction = document.querySelector('#nav_menu_read_all .read_all').formAction;
}
+ }
- document.querySelectorAll('[id^=day_]').forEach(function (div) {
- const ids = document.querySelectorAll('[id="' + div.id + '"]');
- for (let i = ids.length - 1; i > 0; i--) { //Keep only the first
- ids[i].remove();
- }
- });
-
- init_load_more(box_load_more);
-
- const div_load_more = document.getElementById('load_more');
- if (bigMarkAsRead) {
- bigMarkAsRead.removeAttribute('disabled');
- }
- if (div_load_more) {
- div_load_more.classList.remove('loading');
+ document.querySelectorAll('[id^=day_]').forEach(function (div) {
+ const ids = document.querySelectorAll('[id="' + div.id + '"]');
+ for (let i = ids.length - 1; i > 0; i--) { // Keep only the first
+ ids[i].remove();
}
+ });
- load_more = false;
- };
+ init_load_more(box_load_more);
+
+ const div_load_more = document.getElementById('load_more');
+ if (bigMarkAsRead) {
+ bigMarkAsRead.removeAttribute('disabled');
+ }
+ if (div_load_more) {
+ div_load_more.classList.remove('loading');
+ }
+
+ load_more = false;
+ };
req.send();
}
-var freshrssLoadMoreEvent = document.createEvent('Event');
+const freshrssLoadMoreEvent = document.createEvent('Event');
freshrssLoadMoreEvent.initEvent('freshrss:load-more', true, true);
function init_load_more(box) {
@@ -1569,23 +1577,23 @@ function init_load_more(box) {
url_load_more = next_link.href;
next_link.onclick = function (e) {
- load_more_posts();
- return false;
- };
+ load_more_posts();
+ return false;
+ };
}
-//
+//
function init_confirm_action() {
document.body.onclick = function (ev) {
- const b = ev.target.closest('.confirm');
- if (b) {
- let str_confirmation = this.getAttribute('data-str-confirm');
- if (!str_confirmation) {
- str_confirmation = context.i18n.confirmation_default;
- }
- return confirm(str_confirmation);
+ const b = ev.target.closest('.confirm');
+ if (b) {
+ let str_confirmation = this.getAttribute('data-str-confirm');
+ if (!str_confirmation) {
+ str_confirmation = context.i18n.confirmation_default;
}
- };
+ return confirm(str_confirmation);
+ }
+ };
document.querySelectorAll('button.confirm').forEach(function (b) { b.disabled = false; });
}
@@ -1594,10 +1602,10 @@ function faviconNbUnread(n) {
const t = document.querySelector('.category.all .title');
n = t ? str2int(t.getAttribute('data-unread')) : 0;
}
- //http://remysharp.com/2010/08/24/dynamic-favicons/
- const canvas = document.createElement('canvas'),
- link = document.getElementById('favicon').cloneNode(true),
- ratio = window.devicePixelRatio;
+ // http://remysharp.com/2010/08/24/dynamic-favicons/
+ const canvas = document.createElement('canvas');
+ const link = document.getElementById('favicon').cloneNode(true);
+ const ratio = window.devicePixelRatio;
if (canvas.getContext && link) {
canvas.height = canvas.width = 16 * ratio;
const img = document.createElement('img');
@@ -1651,7 +1659,7 @@ function init_normal() {
window.onbeforeunload = function (e) {
const sidebar = document.getElementById('sidebar');
- if (sidebar) { //Save sidebar scroll position
+ if (sidebar) { // Save sidebar scroll position
sessionStorage.setItem('FreshRSS_sidebar_scrollTop', sidebar.scrollTop);
}
if (mark_read_queue && mark_read_queue.length > 0) {
@@ -1687,7 +1695,7 @@ function init_afterDOM() {
}
}
-init_beforeDOM(); //Can be called before DOM is fully loaded
+init_beforeDOM(); // Can be called before DOM is fully loaded
if (document.readyState && document.readyState !== 'loading') {
init_afterDOM();
diff --git a/p/scripts/preview.js b/p/scripts/preview.js
index d52657a5a..48675d42c 100644
--- a/p/scripts/preview.js
+++ b/p/scripts/preview.js
@@ -1,12 +1,10 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-3.0
-"use strict";
-/* jshint esversion:6, strict:global */
-
-let rendered_node = null,
- rendered_view = null,
- raw_node = null,
- raw_view = null;
+'use strict';
+let rendered_node = null;
+let rendered_view = null;
+let raw_node = null;
+let raw_view = null;
function update_ui() {
if (rendered_node.checked && !raw_node.checked) {
@@ -29,7 +27,6 @@ function init_afterDOM() {
raw_node.addEventListener('click', update_ui);
}
-
if (document.readyState && document.readyState !== 'loading') {
init_afterDOM();
} else {
diff --git a/p/scripts/statsWithChartjs.js b/p/scripts/statsWithChartjs.js
index 0ca511132..2f5c39ce8 100644
--- a/p/scripts/statsWithChartjs.js
+++ b/p/scripts/statsWithChartjs.js
@@ -1,7 +1,6 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-3.0
-"use strict";
+'use strict';
/* globals Chart */
-/* jshint esversion:6, strict:global */
function initCharts() {
if (!window.Chart) {
@@ -14,13 +13,13 @@ function initCharts() {
const jsonData = document.getElementsByClassName('jsonData-stats');
- var jsonDataParsed;
- var chartConfig;
+ let jsonDataParsed;
+ let chartConfig;
- for (var i = 0; i < jsonData.length; i++) {
+ for (let i = 0; i < jsonData.length; i++) {
jsonDataParsed = JSON.parse(jsonData[i].innerHTML);
- switch(jsonDataParsed.charttype) {
+ switch (jsonDataParsed.charttype) {
case 'bar':
chartConfig = jsonChartBar(jsonDataParsed.label, jsonDataParsed.data, jsonDataParsed.xAxisLabels);
break;
@@ -28,13 +27,13 @@ function initCharts() {
chartConfig = jsonChartDoughnut(jsonDataParsed.labels, jsonDataParsed.data);
break;
case 'barWithAverage':
- chartConfig = jsonChartBarWithAvarage(jsonDataParsed.labelBarChart, jsonDataParsed.dataBarChart, jsonDataParsed.labelAverage, jsonDataParsed.dataAverage, jsonDataParsed.xAxisLabels);
+ chartConfig = jsonChartBarWithAvarage(jsonDataParsed.labelBarChart, jsonDataParsed.dataBarChart,
+ jsonDataParsed.labelAverage, jsonDataParsed.dataAverage, jsonDataParsed.xAxisLabels);
}
- new Chart(
- document.getElementById(jsonDataParsed.canvasID),
- chartConfig
- );
+ /* eslint-disable no-new */
+ new Chart(document.getElementById(jsonDataParsed.canvasID), chartConfig);
+ /* eslint-enable no-new */
}
if (window.console) {
@@ -55,25 +54,25 @@ function jsonChartBar(label, data, xAxisLabels = '') {
barPercentage: 1.0,
categoryPercentage: 1.0,
order: 2,
- }]
+ }],
},
options: {
scales: {
y: {
- beginAtZero: true
+ beginAtZero: true,
},
x: {
grid: {
display: false,
- }
- }
+ },
+ },
},
plugins: {
legend: {
display: false,
- }
- }
- }
+ },
+ },
+ },
};
}
@@ -84,22 +83,22 @@ function jsonChartDoughnut(labels, data) {
labels: labels,
datasets: [{
backgroundColor: [
- '#0b84a5', //petrol
+ '#0b84a5', // petrol
'#f6c85f', // sand
- '#6f4e7c', //purple
- '#9dd866', //green
- '#ca472f', //red
- '#ffa056', //orange
+ '#6f4e7c', // purple
+ '#9dd866', // green
+ '#ca472f', // red
+ '#ffa056', // orange
'#8dddd0', // turkis
'#f6c85f', // sand
- '#6f4e7c', //purple
- '#9dd866', //green
- '#ca472f', //red
- '#ffa056', //orange
+ '#6f4e7c', // purple
+ '#9dd866', // green
+ '#ca472f', // red
+ '#ffa056', // orange
'#8dddd0', // turkis
],
data: data,
- }]
+ }],
},
options: {
layout: {
@@ -109,9 +108,9 @@ function jsonChartDoughnut(labels, data) {
legend: {
position: 'bottom',
align: 'start',
- }
- }
- }
+ },
+ },
+ },
};
}
@@ -133,15 +132,15 @@ function jsonChartBarWithAvarage(labelBarChart, dataBarChart, labelAverage, data
{
// average line chart
type: 'line',
- label: labelAverage, // Todo: i18n
+ label: labelAverage, // Todo: i18n
borderColor: 'rgb(192,216,0)',
data: {
- '-30' : dataAverage,
- '-1' : dataAverage,
+ '-30': dataAverage,
+ '-1': dataAverage,
},
order: 1,
- }
- ]
+ },
+ ],
},
options: {
@@ -151,41 +150,41 @@ function jsonChartBarWithAvarage(labelBarChart, dataBarChart, labelAverage, data
},
x: {
ticks: {
- callback: function(val){
+ callback: function (val) {
if (xAxisLabels.length > 0) {
return xAxisLabels[val];
} else {
return val;
}
- }
+ },
},
grid: {
display: false,
- }
- }
+ },
+ },
},
elements: {
point: {
radius: 0,
- }
+ },
},
plugins: {
tooltip: {
callbacks: {
- title: function(tooltipitem) {
+ title: function (tooltipitem) {
if (xAxisLabels.length > 0) {
return xAxisLabels[tooltipitem[0].dataIndex];
} else {
return tooltipitem[0].label;
}
- }
- }
+ },
+ },
},
legend: {
display: false,
- }
- }
- }
+ },
+ },
+ },
};
}
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 2ec7dea34..6d3279bcd 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -879,7 +879,7 @@ input[type="search"] {
}
.subtitle > div:not(:first-of-type)::before {
- content: ' · ';
+ content: ' · ';
}
br {
diff --git a/p/themes/base-theme/template.rtl.css b/p/themes/base-theme/template.rtl.css
index d6f0d0168..f74b9f9da 100644
--- a/p/themes/base-theme/template.rtl.css
+++ b/p/themes/base-theme/template.rtl.css
@@ -465,7 +465,7 @@ a.btn {
/*=== Boxes */
.box {
- margin: 20px 10px;
+ margin: 20px 0 20px 20px;
display: inline-block;
max-width: 95%;
width: 20rem;
@@ -473,6 +473,11 @@ a.btn {
vertical-align: top;
}
+.box.visible-semi {
+ border-style: dashed;
+ opacity: 0.5;
+}
+
.box .box-title {
position: relative;
font-size: 1.2rem;
@@ -874,7 +879,7 @@ input[type="search"] {
}
.subtitle > div:not(:first-of-type)::before {
- content: ' · ';
+ content: ' · ';
}
br {
@@ -1114,7 +1119,7 @@ br {
display: none;
position: fixed;
top: 2%; bottom: 2%;
- left: 3%; right: 3%;
+ right: 3%; left: 3%;
overflow: auto;
}
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..4ae01c19a
--- /dev/null
+++ b/package.json
@@ -0,0 +1,42 @@
+{
+ "name": "freshrss",
+ "description": "A free, self-hostable aggregator",
+ "homepage": "https://freshrss.org/",
+ "readmeFilename": "README.md",
+ "bugs": {
+ "url": "https://github.com/FreshRSS/FreshRSS/issues"
+ },
+ "keywords": [
+ "news",
+ "aggregator",
+ "RSS",
+ "Atom",
+ "WebSub"
+ ],
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/FreshRSS/FreshRSS.git"
+ },
+ "license": "AGPL-3.0",
+ "scripts": {
+ "eslint": "eslint --ext .js .",
+ "eslint_fix": "eslint --fix --ext .js .",
+ "rtlcss": "rtlcss -d p/themes && find . -type f -name '*.rtl.rtl.css' -delete",
+ "stylelint": "stylelint '**/*.css' && stylelint --syntax scss '**/*.scss'",
+ "stylelint_fix": "stylelint --fix '**/*.css' && stylelint --fix --syntax scss '**/*.scss'",
+ "test": "npm run eslint && npm run stylelint",
+ "fix": "npm run rtlcss && npm run stylelint_fix && npm run eslint_fix"
+ },
+ "devDependencies": {
+ "eslint": "^7.32.0",
+ "eslint-config-standard": "^16.0.3",
+ "eslint-plugin-import": "^2.24.2",
+ "eslint-plugin-node": "^11.1.0",
+ "eslint-plugin-promise": "^5.1.0",
+ "rtlcss": "^3.4.0",
+ "stylelint": "^13.13.1",
+ "stylelint-config-recommended-scss": "^4.3.0",
+ "stylelint-order": "^4.1.0",
+ "stylelint-scss": "^3.21.0"
+ }
+}