anticensority/runet-censorship-bypass
1
1
Fork 0
mirror of https://github.com/anticensority/runet-censorship-bypass.git synced 2024-11-24 02:13:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make news error non-critical, make it more verbose

Browse Source
This commit is contained in:
Ilya Ig. Petrov 2017-06-03 21:54:34 +05:00
parent 7344c018be
commit d02e532186
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/App.js
View File

@ -96,7 +96,8 @@ export default function getApp(theState) {
]), ]),
(err) => { (err) => {
this.showErrors({message: 'Не удалось достать новости: что-то не так с сетью.', wrapped: err}); const ifCritical = null;
this.showErrors(ifCritical, {message: 'Не удалось достать новости: что-то не так с сетью.', wrapped: err});
return [err, false, false]; return [err, false, false];
} }
@ -177,18 +178,11 @@ export default function getApp(theState) {
: () => {}; : () => {};
const warns = args; const warns = args;
const warningHtml = warns const errToHtmlMessage = (error) => {
.map(
(w) => w && w.message || ''
)
.filter( (m) => m )
.map( (m) => '✘ ' + m )
.join('<br/>');
let messageHtml = ''; let messageHtml = '';
if (err) { let wrapped = error.wrapped;
let wrapped = err.wrapped; messageHtml = error.message || '';
messageHtml = err.message || '';
while( wrapped ) { while( wrapped ) {
const deeperMsg = wrapped && wrapped.message; const deeperMsg = wrapped && wrapped.message;
@ -197,7 +191,20 @@ export default function getApp(theState) {
} }
wrapped = wrapped.wrapped; wrapped = wrapped.wrapped;
} }
} return messageHtml;
};
let messageHtml = err ? errToHtmlMessage(err) : '';
const warningHtml = warns
.filter((w) => w)
.map(
(w) => errToHtmlMessage(w)
)
.map( (m) => '✘ ' + m )
.join('<br/>');
messageHtml = messageHtml.trim(); messageHtml = messageHtml.trim();
if (warningHtml) { if (warningHtml) {
messageHtml = messageHtml ? messageHtml + '<br/>' + warningHtml : warningHtml; messageHtml = messageHtml ? messageHtml + '<br/>' + warningHtml : warningHtml;