From a86b9f6a0e145d8179dc6f03147dd5445b08ab83 Mon Sep 17 00:00:00 2001 From: "Ilya Ig. Petrov" Date: Wed, 29 Nov 2017 13:36:02 +0500 Subject: [PATCH] PAC kitchen prettier output --- .../src/extension-common/11-error-handlers-api.js | 2 +- .../src/extension-common/35-pac-kitchen-api.js | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js index 379ced1..9090c55 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js +++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js @@ -272,7 +272,7 @@ console.warn('PAC ERROR', details); // TOOD: add "view pac script at this line" button. handlers.mayNotify('pac-error', 'Ошибка PAC!', - details.error + '\n' + details.details, + (details.error || details.message /* Firefox */) + '\n' + details.details, {icon: 'pac-error-128.png'} ); diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js index 69bf4cb..1d0ad68 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js +++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js @@ -451,15 +451,15 @@ ${ pacMods.filteredCustomsString }() } - }; +/******/ }; - if (global) { -/******/ global.FindProxyForURL = tmp; - } else { -/******/ FindProxyForURL = tmp; - } +/******/ if (global) { +/******/ global.FindProxyForURL = tmp; +/******/ } else { +/******/ FindProxyForURL = tmp; +/******/ } -})(this);`; +/*****/})(this);`; },