From 814295e6e143ec14632984316fbc6e9d32fe6382 Mon Sep 17 00:00:00 2001 From: Victor Savinov Date: Fri, 16 Oct 2020 00:32:18 +0300 Subject: [PATCH] v1.80 --- _locales/en/messages.json | 12 +-- _locales/ru/messages.json | 12 +-- assets/fonts/LICENSE.txt | 202 -------------------------------------- background.js | 125 +++++++++++------------ config.json | 3 +- content-scripts.js | 72 +++++++++----- index.html | 6 +- manifest.json | 10 +- options.html | 4 +- popup.css | 5 + popup.js | 135 +++++++++++++++---------- src/css/main.css | 5 + src/js/function.js | 14 --- src/js/header.js | 7 +- src/js/index.js | 62 ++++++++---- src/js/main.js | 51 +++++++--- 16 files changed, 305 insertions(+), 420 deletions(-) delete mode 100644 assets/fonts/LICENSE.txt delete mode 100644 src/js/function.js diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 70dc859..af8da73 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -29,9 +29,6 @@ "cores": { "message": "Cores" }, - "current": { - "message": "Current" - }, "dateAndTime": { "message": "Date & time" }, @@ -68,6 +65,9 @@ "grayscale": { "message": "Grayscale" }, + "hideMadeWithLove": { + "message": "Hide \"Made with ❤...\"" + }, "importSettings": { "message": "Import settings" }, @@ -128,9 +128,6 @@ "settings": { "message": "Settings" }, - "somethingWentWrongPleaseTryReloadTheWebsite": { - "message": "Something went wrong. Please try reload the website." - }, "styles": { "message": "Styles" }, @@ -152,6 +149,9 @@ "theme": { "message": "Theme" }, + "thePageHOSTNAMEisProtectedByBrowser": { + "message": "The page HOSTNAME is protected by browser." + }, "thisWillResetAllSettings": { "message": "This will reset all settings" }, diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json index 2b48c65..e70911e 100644 --- a/_locales/ru/messages.json +++ b/_locales/ru/messages.json @@ -29,9 +29,6 @@ "cores": { "message": "Ядра" }, - "current": { - "message": "Текущий" - }, "dateAndTime": { "message": "Дата и время" }, @@ -68,6 +65,9 @@ "grayscale": { "message": "Насыщенность" }, + "hideMadeWithLove": { + "message": "Скрыть \"Made with ❤...\"" + }, "importSettings": { "message": "Импорт настроек" }, @@ -137,9 +137,6 @@ "settings": { "message": "Настройки" }, - "somethingWentWrongPleaseTryReloadTheWebsite": { - "message": "Что-то пошло не так. Попробуйте перезагрузить веб-сайт." - }, "styles": { "message": "Стили" }, @@ -155,6 +152,9 @@ "theListIsEmpty": { "message": "Список пуст" }, + "thePageHOSTNAMEisProtectedByBrowser": { + "message": "Страница HOSTNAME защищна браузером." + }, "thisWillResetAllSettings": { "message": "This will reset all settings" }, diff --git a/assets/fonts/LICENSE.txt b/assets/fonts/LICENSE.txt deleted file mode 100644 index 75b5248..0000000 --- a/assets/fonts/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/background.js b/background.js index 13ef597..653d457 100644 --- a/background.js +++ b/background.js @@ -1,71 +1,16 @@ -/*----------------------------------------------------------------------------- +/*--------------------------------------------------------------- >>> BACKGROUND -------------------------------------------------------------------------------- -1.0 Storage change listener -2.0 Initialization -3.0 Export -4.0 Google Analytics ------------------------------------------------------------------------------*/ +----------------------------------------------------------------- +1.0 Google Analytics +2.0 Storage change listener +3.0 On installed +---------------------------------------------------------------*/ -/*----------------------------------------------------------------------------- -1.0 STORAGE CHANGE LISTENER ------------------------------------------------------------------------------*/ +/*--------------------------------------------------------------- +1.0 GOOGLE ANALYTICS +---------------------------------------------------------------*/ -chrome.storage.onChanged.addListener(function(changes) { - _gaq.push(['_trackPageview', '/night-mode-' + chrome.runtime.getManifest().version + '/background', 'page-loaded']); -}); - - -/*----------------------------------------------------------------------------- -2.0 INITIALIZATION ------------------------------------------------------------------------------*/ - -chrome.storage.local.get(function(items) { - _gaq.push(['_trackPageview', '/night-mode-' + chrome.runtime.getManifest().version + '/background', 'page-loaded']); -}); - -/*----------------------------------------------------------------------------- -3.0 EXPORT ------------------------------------------------------------------------------*/ - -chrome.runtime.onMessage.addListener(function(request, sender) { - if (request.name === 'download') { - chrome.permissions.request({ - permissions: ['downloads'] - }, function(granted) { - if (granted) { - try { - let blob = new Blob([JSON.stringify(request.value)], { - type: 'application/json;charset=utf-8' - }); - - chrome.downloads.download({ - url: URL.createObjectURL(blob), - filename: request.filename + '.json', - saveAs: true - }); - } catch (err) { - chrome.runtime.sendMessage({ - name: 'dialog-error', - value: err - }); - } - } else { - chrome.runtime.sendMessage({ - name: 'dialog-error', - value: 'permissionIsNotGranted' - }); - } - }); - } -}); - - -/*----------------------------------------------------------------------------- -4.0 GOOGLE ANALYTICS ------------------------------------------------------------------------------*/ - -var _gaq = _gaq || []; +var _gaq = []; (function() { var ga = document.createElement('script'), @@ -78,4 +23,52 @@ var _gaq = _gaq || []; ga.async = true; ga.src = 'https://ssl.google-analytics.com/ga.js'; s.parentNode.insertBefore(ga, s); -})(); \ No newline at end of file +})(); + +_gaq.push(['_trackPageview', '/night-mode-' + chrome.runtime.getManifest().version, 'page-loaded']); + + +/*--------------------------------------------------------------- +2.0 STORAGE CHANGE LISTENER +---------------------------------------------------------------*/ + +chrome.storage.onChanged.addListener(function(changes) { + _gaq.push(['_trackPageview', '/night-mode-' + chrome.runtime.getManifest().version, 'page-loaded']); +}); + + +/*--------------------------------------------------------------- +3.0 ON INSTALLED +---------------------------------------------------------------*/ + +chrome.runtime.onInstalled.addListener(function() { + chrome.tabs.query({}, function(tabs) { + for (var i = 0, l = tabs.length; i < l; i++) { + var tab = tabs[i], + url = tab.url; + + if (url.includes('?')) { + url = url.substring(0, url.lastIndexOf('?')); + } + if (url.includes('#')) { + url = url.substring(0, url.lastIndexOf('#')); + } + + if ( + !url.startsWith('about:') && + !url.startsWith('chrome') && + !url.startsWith('edge') && + !url.startsWith('https://addons.mozilla.org') && + !url.startsWith('https://chrome.google.com/webstore') && + !url.startsWith('https://microsoftedge.microsoft.com/addons') && + !url.startsWith('moz') && + !url.startsWith('view-source:') && + !url.endsWith('.pdf') + ) { + chrome.tabs.executeScript(tab.id, { + file: 'content-scripts.js' + }); + } + } + }); +}); diff --git a/config.json b/config.json index 17b260c..724ce73 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,5 @@ { "popup.js": [ - "src/js/function.js", "src/js/header.js", "src/js/main.js", "src/js/index.js" @@ -11,4 +10,4 @@ "src/css/header.css", "src/css/main.css" ] -} \ No newline at end of file +} diff --git a/content-scripts.js b/content-scripts.js index 3300b10..6c6485b 100644 --- a/content-scripts.js +++ b/content-scripts.js @@ -4,7 +4,8 @@ var settings = {}, function getFilters(settings) { var string = '', html_filter = '', - body_filter = ''; + body_filter = '', + body_child_filter = ''; if (settings.bluelight > 0) { var bluelight = document.getElementById('night-mode-bluelight') || document.createElement('div'); @@ -13,14 +14,32 @@ function getFilters(settings) { bluelight.style.position = 'absolute'; bluelight.style.visibility = 'hidden'; bluelight.style.pointerEvents = 'none'; - bluelight.innerHTML = ''; + bluelight.innerHTML = ''; document.documentElement.appendChild(bluelight); html_filter += 'url(#bluelight-filter)'; if (settings.invert_colors === true || settings.invert_colors === undefined) { - string += 'html,body{background:#000 0 0 !important}body > *{-webkit-filter:invert(1)!important;filter:invert(1)!important}'; + string += 'html,body{background:#000 0 0 !important}'; + + body_child_filter += 'invert(1)'; + } + + if (typeof settings.brightness === 'number' && settings.brightness < 100) { + body_child_filter += ' brightness(' + settings.brightness + '%)'; + } + + if (typeof settings.contrast === 'number' && settings.contrast < 100) { + body_child_filter += ' contrast(' + settings.contrast + '%)'; + } + + if (typeof settings.grayscale === 'number' && settings.grayscale > 0) { + body_child_filter += ' grayscale(' + settings.grayscale + '%)'; + } + + if (typeof settings.sepia === 'number' && settings.sepia > 0) { + body_child_filter += ' sepia(' + settings.sepia + '%)'; } } else if (document.getElementById('night-mode-bluelight')) { document.getElementById('night-mode-bluelight').remove(); @@ -34,29 +53,36 @@ function getFilters(settings) { html_filter += ' invert(1)'; } } + + if (!(settings.bluelight > 0)) { + if (typeof settings.brightness === 'number' && settings.brightness < 100) { + html_filter += ' brightness(' + settings.brightness + '%)'; + } - if (typeof settings.brightness === 'number') { - body_filter += ' brightness(' + settings.brightness + '%)'; - } + if (typeof settings.contrast === 'number' && settings.contrast < 100) { + html_filter += ' contrast(' + settings.contrast + '%)'; + } - if (typeof settings.contrast === 'number') { - body_filter += ' contrast(' + settings.contrast + '%)'; - } + if (typeof settings.grayscale === 'number' && settings.grayscale > 0) { + html_filter += ' grayscale(' + settings.grayscale + '%)'; + } - if (typeof settings.grayscale === 'number') { - body_filter += ' grayscale(' + settings.grayscale + '%)'; + if (typeof settings.sepia === 'number' && settings.sepia > 0) { + html_filter += ' sepia(' + settings.sepia + '%)'; + } } - - if (typeof settings.sepia === 'number') { - body_filter += ' sepia(' + settings.sepia + '%)'; + + if (html_filter.length > 0) { + string += 'html{-webkit-filter:' + html_filter + ';filter:' + html_filter + '}'; } - - if (typeof settings.saturate === 'number') { - body_filter += ' saturate(' + settings.saturate + '%)'; + + if (body_filter.length > 0) { + string += 'body{-webkit-filter:' + body_filter + ';filter:' + body_filter + '}'; + } + + if (body_child_filter.length > 0) { + string += 'body > *{-webkit-filter:' + body_child_filter + ';filter:' + body_child_filter + '}'; } - - string += 'html{-webkit-filter:' + html_filter + ';filter:' + html_filter + '}'; - string += 'body{-webkit-filter:' + body_filter + ';filter:' + body_filter + '}'; return string; } @@ -200,9 +226,3 @@ chrome.storage.onChanged.addListener(function(changes) { update(); }); - -chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) { - if (window.self === window.top && request === 'requestTabUrl') { - sendResponse(location.href); - } -}); diff --git a/index.html b/index.html index 59ba2e8..ef96380 100644 --- a/index.html +++ b/index.html @@ -1,8 +1,8 @@ - - + + Dark Mode @@ -15,4 +15,4 @@
- \ No newline at end of file + diff --git a/manifest.json b/manifest.json index 8453ea7..f1ebd64 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Dark Mode", - "version": "1.60", + "version": "1.80", "description": "Dark Mode, read at night. Blue Light Filter for Every Website. Relax your eyes at night and day.", "default_locale": "en", @@ -14,7 +14,6 @@ }, "background": { - "persistent": false, "scripts": [ "background.js" ] @@ -26,8 +25,7 @@ "content-scripts.js" ], "matches": [ - "http://*/*", - "https://*/*" + "" ], "run_at": "document_start" }], @@ -44,8 +42,8 @@ "permissions": [ "storage", - "http://*/*", - "https://*/*" + "tabs", + "" ], "update_url": "https://clients2.google.com/service/update2/crx", diff --git a/options.html b/options.html index d3d0d04..485574e 100644 --- a/options.html +++ b/options.html @@ -1,8 +1,8 @@ - - + + Dark Mode diff --git a/popup.css b/popup.css index 87f9880..b54b8d6 100644 --- a/popup.css +++ b/popup.css @@ -564,6 +564,11 @@ body[data-website-text-editor="true"] .websites-textfield justify-content: center; } +html[data-hide-made-with-love=true] .made-with-love +{ + display: none +} + .made-with-love svg { position: relative; diff --git a/popup.js b/popup.js index 1e20d54..2c9d068 100644 --- a/popup.js +++ b/popup.js @@ -1,23 +1,7 @@ -function update(container) { - var self = (this === window ? document.querySelector('.satus-main') : this), - item = self.history[self.history.length - 1], - id = item.appearanceKey; - - if (!Satus.isset(container)) { - container = document.querySelector('.satus-main__container'); - } - - document.querySelector('.satus-text--title').innerText = Satus.locale.getMessage(this.history[this.history.length - 1].label) || 'Dark Mode'; - - document.body.dataset.appearance = id; - container.dataset.appearance = id; -} - /*----------------------------------------------------------------------------- ->>> «HEADER» TEMPLATE +>>> HEADER -----------------------------------------------------------------------------*/ - var HOSTNAME; var Menu = { @@ -91,7 +75,7 @@ var Menu = { this.dataset.value = this.querySelector('input').checked; } }, - + button_vert: { type: 'button', class: 'satus-dialog--vertical-menu-button', @@ -99,7 +83,7 @@ var Menu = { onclick: { type: 'dialog', class: 'satus-dialog--vertical-menu', - + websiteTextEditor: { type: 'switch', label: 'textEditorMode', @@ -117,7 +101,20 @@ Menu.main = { type: 'main', appearanceKey: 'home', on: { - change: update + change: function(container) { + var self = (this === window ? document.querySelector('.satus-main') : this), + item = self.history[self.history.length - 1], + id = item.appearanceKey; + + if (!Satus.isset(container)) { + container = document.querySelector('.satus-main__container'); + } + + document.querySelector('.satus-text--title').innerText = Satus.locale.getMessage(this.history[this.history.length - 1].label) || 'Dark Mode'; + + document.body.dataset.appearance = id; + container.dataset.appearance = id; + } }, toolbar: { @@ -139,11 +136,11 @@ Menu.main = { tabs: { type: 'tabs', - + global: { type: 'tab', label: 'global', - + section: { type: 'section', @@ -183,8 +180,8 @@ Menu.main = { }, current: { type: 'tab', - label: 'current', - + label: '', + section: { type: 'section', @@ -231,11 +228,11 @@ Menu.main = { tabs: { type: 'tabs', - + global: { type: 'tab', label: 'global', - + textfield: { type: 'text-field', placeholder: 'html, body { ... }', @@ -257,8 +254,8 @@ Menu.main = { }, current: { type: 'tab', - label: 'current', - + label: '', + textfield: { type: 'text-field', placeholder: 'html, body { ... }', @@ -287,7 +284,7 @@ Menu.main = { before: '', section: {}, - + textfield: { type: 'text-field', class: 'websites-textfield', @@ -303,20 +300,20 @@ Menu.main = { regex = /^\s*(\S+).*:\s*(\S+)[\s\n]*$/gm, match, url; - + while (match = regex.exec(this.value)) { if (/invert_colors|bluelight|brightness|contrast|grayscale|sepia/.test(match[1]) === true) { websites[url].filters[match[1]] = match[1] === 'invert_colors' ? match[2] === 'false' ? false : true : Number(match[2]); } else { url = match[1]; - + websites[url] = { enabled: match[2] === 'false' ? false : true, filters: {} }; } } - + satus.storage.set('websites', websites); } } @@ -505,6 +502,18 @@ Menu.main = { before: '', label: 'settings', parent: '.satus-main__container', + + section_01: { + type: 'section', + + hide_made_with_love: { + type: 'switch', + label: 'hideMadeWithLove', + onchange: function() { + document.documentElement.dataset.hideMadeWithLove = satus.storage.get('hide_made_with_love'); + } + } + }, section: { type: 'section', @@ -836,10 +845,10 @@ Menu.main = { /*--------------------------------------------------------------- 1.0 ---------------------------------------------------------------*/ - var HOSTNAME; function updateWebsites() { + Menu.main.section.filters.tabs.current.label = HOSTNAME.length > 12 ? HOSTNAME.substring(0, 12) + '...' : HOSTNAME; Menu.main.section.filters.tabs.current.section.invert_colors.storage_key = 'websites/' + HOSTNAME + '/filters/invert_colors'; Menu.main.section.filters.tabs.current.section.bluelight.storage_key = 'websites/' + HOSTNAME + '/filters/bluelight'; Menu.main.section.filters.tabs.current.section.brightness.storage_key = 'websites/' + HOSTNAME + '/filters/brightness'; @@ -847,12 +856,14 @@ function updateWebsites() { Menu.main.section.filters.tabs.current.section.grayscale.storage_key = 'websites/' + HOSTNAME + '/filters/grayscale'; Menu.main.section.filters.tabs.current.section.sepia.storage_key = 'websites/' + HOSTNAME + '/filters/sepia'; - document.body.dataset.websiteTextEditor = satus.storage.get('websiteTextEditor'); + Menu.main.section.styles.tabs.current.label = HOSTNAME.length > 12 ? HOSTNAME.substring(0, 12) + '...' : HOSTNAME; + document.body.dataset.websiteTextEditor = satus.storage.get('websiteTextEditor'); + var websites = satus.storage.get('websites') || {}, text = '', count = 0; - + Menu.main.section.websites.section = { type: 'section', class: 'websites-list' @@ -861,14 +872,14 @@ function updateWebsites() { for (var key in websites) { if (key !== '') { count++; - + text += key + ': ' + (satus.storage.get('websites/' + key + '/enabled') || true) + - '\n invert_colors: ' + (satus.storage.get('websites/' + key + '/filters/invert_colors') || true) + - '\n bluelight: ' + (satus.storage.get('websites/' + key + '/filters/bluelight') || 0) + - '\n brightness: ' + (satus.storage.get('websites/' + key + '/filters/brightness') || 100) + - '\n contrast: ' + (satus.storage.get('websites/' + key + '/filters/contrast') || 100) + - '\n grayscale: ' + (satus.storage.get('websites/' + key + '/filters/grayscale') || 0) + - '\n sepia: ' + (satus.storage.get('websites/' + key + '/filters/sepia') || 0) + '\n\n'; + '\n invert_colors: ' + (satus.storage.get('websites/' + key + '/filters/invert_colors') || true) + + '\n bluelight: ' + (satus.storage.get('websites/' + key + '/filters/bluelight') || 0) + + '\n brightness: ' + (satus.storage.get('websites/' + key + '/filters/brightness') || 100) + + '\n contrast: ' + (satus.storage.get('websites/' + key + '/filters/contrast') || 100) + + '\n grayscale: ' + (satus.storage.get('websites/' + key + '/filters/grayscale') || 0) + + '\n sepia: ' + (satus.storage.get('websites/' + key + '/filters/sepia') || 0) + '\n\n'; Menu.main.section.websites.section[key] = { type: 'section', @@ -979,25 +990,27 @@ function updateWebsites() { satus.render(Menu, document.querySelector('.satus__wrapper')); } -function init(response) { - var TAB_URL = response ? new URL(response) : ''; +function init(url, access) { + url = new URL(url); - HOSTNAME = TAB_URL.hostname || ''; + HOSTNAME = url.hostname; satus.storage.import(function() { var language = satus.storage.get('language') || 'en'; - + if (!satus.isset(satus.storage.get('mode')) || satus.storage.get('mode') === true) { document.querySelector('.satus').classList.add('dark'); } + + document.documentElement.dataset.hideMadeWithLove = satus.storage.get('hide_made_with_love'); satus.locale.import(language, function() { satus.modules.updateStorageKeys(Menu, function() { - if (HOSTNAME === '') { + if (access === false) { Menu.main.toolbar.enable.type = 'text'; delete Menu.main.toolbar.enable.onrender; delete Menu.main.toolbar.enable.onclick; - Menu.main.toolbar.enable.label = 'somethingWentWrongPleaseTryReloadTheWebsite'; + Menu.main.toolbar.enable.label = satus.locale.getMessage('thePageHOSTNAMEisProtectedByBrowser').replace('HOSTNAME', '"' + HOSTNAME + '"'); Menu.main.toolbar.enable.value = ''; Menu.main.toolbar.enable.style = { lineHeight: '20px' @@ -1017,9 +1030,29 @@ chrome.tabs.query({ currentWindow: true, active: true }, function(tabs) { - if (tabs[0].hasOwnProperty('url')) { - chrome.tabs.sendMessage(tabs[0].id, 'requestTabUrl', init); + var tab = tabs[0], + url = tab.url; + + if (url.includes('?')) { + url = url.substring(0, url.lastIndexOf('?')); + } + if (url.includes('#')) { + url = url.substring(0, url.lastIndexOf('#')); + } + + if ( + !url.startsWith('about:') && + !url.startsWith('chrome') && + !url.startsWith('edge') && + !url.startsWith('https://addons.mozilla.org') && + !url.startsWith('https://chrome.google.com/webstore') && + !url.startsWith('https://microsoftedge.microsoft.com/addons') && + !url.startsWith('moz') && + !url.startsWith('view-source:') && + !url.endsWith('.pdf') + ) { + init(url, true); } else { - init(); + init(url, false); } }); diff --git a/src/css/main.css b/src/css/main.css index 226eba0..6bbd931 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -268,6 +268,11 @@ body[data-website-text-editor="true"] .websites-textfield justify-content: center; } +html[data-hide-made-with-love=true] .made-with-love +{ + display: none +} + .made-with-love svg { position: relative; diff --git a/src/js/function.js b/src/js/function.js deleted file mode 100644 index ac0a82e..0000000 --- a/src/js/function.js +++ /dev/null @@ -1,14 +0,0 @@ -function update(container) { - var self = (this === window ? document.querySelector('.satus-main') : this), - item = self.history[self.history.length - 1], - id = item.appearanceKey; - - if (!Satus.isset(container)) { - container = document.querySelector('.satus-main__container'); - } - - document.querySelector('.satus-text--title').innerText = Satus.locale.getMessage(this.history[this.history.length - 1].label) || 'Dark Mode'; - - document.body.dataset.appearance = id; - container.dataset.appearance = id; -} diff --git a/src/js/header.js b/src/js/header.js index 93ccd36..2c86540 100644 --- a/src/js/header.js +++ b/src/js/header.js @@ -1,7 +1,6 @@ /*----------------------------------------------------------------------------- ->>> «HEADER» TEMPLATE +>>> HEADER -----------------------------------------------------------------------------*/ - var HOSTNAME; var Menu = { @@ -75,7 +74,7 @@ var Menu = { this.dataset.value = this.querySelector('input').checked; } }, - + button_vert: { type: 'button', class: 'satus-dialog--vertical-menu-button', @@ -83,7 +82,7 @@ var Menu = { onclick: { type: 'dialog', class: 'satus-dialog--vertical-menu', - + websiteTextEditor: { type: 'switch', label: 'textEditorMode', diff --git a/src/js/index.js b/src/js/index.js index 5bde8ab..f17d7d5 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -7,10 +7,10 @@ /*--------------------------------------------------------------- 1.0 ---------------------------------------------------------------*/ - var HOSTNAME; function updateWebsites() { + Menu.main.section.filters.tabs.current.label = HOSTNAME.length > 12 ? HOSTNAME.substring(0, 12) + '...' : HOSTNAME; Menu.main.section.filters.tabs.current.section.invert_colors.storage_key = 'websites/' + HOSTNAME + '/filters/invert_colors'; Menu.main.section.filters.tabs.current.section.bluelight.storage_key = 'websites/' + HOSTNAME + '/filters/bluelight'; Menu.main.section.filters.tabs.current.section.brightness.storage_key = 'websites/' + HOSTNAME + '/filters/brightness'; @@ -18,12 +18,14 @@ function updateWebsites() { Menu.main.section.filters.tabs.current.section.grayscale.storage_key = 'websites/' + HOSTNAME + '/filters/grayscale'; Menu.main.section.filters.tabs.current.section.sepia.storage_key = 'websites/' + HOSTNAME + '/filters/sepia'; - document.body.dataset.websiteTextEditor = satus.storage.get('websiteTextEditor'); + Menu.main.section.styles.tabs.current.label = HOSTNAME.length > 12 ? HOSTNAME.substring(0, 12) + '...' : HOSTNAME; + document.body.dataset.websiteTextEditor = satus.storage.get('websiteTextEditor'); + var websites = satus.storage.get('websites') || {}, text = '', count = 0; - + Menu.main.section.websites.section = { type: 'section', class: 'websites-list' @@ -32,14 +34,14 @@ function updateWebsites() { for (var key in websites) { if (key !== '') { count++; - + text += key + ': ' + (satus.storage.get('websites/' + key + '/enabled') || true) + - '\n invert_colors: ' + (satus.storage.get('websites/' + key + '/filters/invert_colors') || true) + - '\n bluelight: ' + (satus.storage.get('websites/' + key + '/filters/bluelight') || 0) + - '\n brightness: ' + (satus.storage.get('websites/' + key + '/filters/brightness') || 100) + - '\n contrast: ' + (satus.storage.get('websites/' + key + '/filters/contrast') || 100) + - '\n grayscale: ' + (satus.storage.get('websites/' + key + '/filters/grayscale') || 0) + - '\n sepia: ' + (satus.storage.get('websites/' + key + '/filters/sepia') || 0) + '\n\n'; + '\n invert_colors: ' + (satus.storage.get('websites/' + key + '/filters/invert_colors') || true) + + '\n bluelight: ' + (satus.storage.get('websites/' + key + '/filters/bluelight') || 0) + + '\n brightness: ' + (satus.storage.get('websites/' + key + '/filters/brightness') || 100) + + '\n contrast: ' + (satus.storage.get('websites/' + key + '/filters/contrast') || 100) + + '\n grayscale: ' + (satus.storage.get('websites/' + key + '/filters/grayscale') || 0) + + '\n sepia: ' + (satus.storage.get('websites/' + key + '/filters/sepia') || 0) + '\n\n'; Menu.main.section.websites.section[key] = { type: 'section', @@ -150,25 +152,27 @@ function updateWebsites() { satus.render(Menu, document.querySelector('.satus__wrapper')); } -function init(response) { - var TAB_URL = response ? new URL(response) : ''; +function init(url, access) { + url = new URL(url); - HOSTNAME = TAB_URL.hostname || ''; + HOSTNAME = url.hostname; satus.storage.import(function() { var language = satus.storage.get('language') || 'en'; - + if (!satus.isset(satus.storage.get('mode')) || satus.storage.get('mode') === true) { document.querySelector('.satus').classList.add('dark'); } + + document.documentElement.dataset.hideMadeWithLove = satus.storage.get('hide_made_with_love'); satus.locale.import(language, function() { satus.modules.updateStorageKeys(Menu, function() { - if (HOSTNAME === '') { + if (access === false) { Menu.main.toolbar.enable.type = 'text'; delete Menu.main.toolbar.enable.onrender; delete Menu.main.toolbar.enable.onclick; - Menu.main.toolbar.enable.label = 'somethingWentWrongPleaseTryReloadTheWebsite'; + Menu.main.toolbar.enable.label = satus.locale.getMessage('thePageHOSTNAMEisProtectedByBrowser').replace('HOSTNAME', '"' + HOSTNAME + '"'); Menu.main.toolbar.enable.value = ''; Menu.main.toolbar.enable.style = { lineHeight: '20px' @@ -188,9 +192,29 @@ chrome.tabs.query({ currentWindow: true, active: true }, function(tabs) { - if (tabs[0].hasOwnProperty('url')) { - chrome.tabs.sendMessage(tabs[0].id, 'requestTabUrl', init); + var tab = tabs[0], + url = tab.url; + + if (url.includes('?')) { + url = url.substring(0, url.lastIndexOf('?')); + } + if (url.includes('#')) { + url = url.substring(0, url.lastIndexOf('#')); + } + + if ( + !url.startsWith('about:') && + !url.startsWith('chrome') && + !url.startsWith('edge') && + !url.startsWith('https://addons.mozilla.org') && + !url.startsWith('https://chrome.google.com/webstore') && + !url.startsWith('https://microsoftedge.microsoft.com/addons') && + !url.startsWith('moz') && + !url.startsWith('view-source:') && + !url.endsWith('.pdf') + ) { + init(url, true); } else { - init(); + init(url, false); } }); diff --git a/src/js/main.js b/src/js/main.js index 68e033f..8425678 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -2,7 +2,20 @@ Menu.main = { type: 'main', appearanceKey: 'home', on: { - change: update + change: function(container) { + var self = (this === window ? document.querySelector('.satus-main') : this), + item = self.history[self.history.length - 1], + id = item.appearanceKey; + + if (!Satus.isset(container)) { + container = document.querySelector('.satus-main__container'); + } + + document.querySelector('.satus-text--title').innerText = Satus.locale.getMessage(this.history[this.history.length - 1].label) || 'Dark Mode'; + + document.body.dataset.appearance = id; + container.dataset.appearance = id; + } }, toolbar: { @@ -24,11 +37,11 @@ Menu.main = { tabs: { type: 'tabs', - + global: { type: 'tab', label: 'global', - + section: { type: 'section', @@ -68,8 +81,8 @@ Menu.main = { }, current: { type: 'tab', - label: 'current', - + label: '', + section: { type: 'section', @@ -116,11 +129,11 @@ Menu.main = { tabs: { type: 'tabs', - + global: { type: 'tab', label: 'global', - + textfield: { type: 'text-field', placeholder: 'html, body { ... }', @@ -142,8 +155,8 @@ Menu.main = { }, current: { type: 'tab', - label: 'current', - + label: '', + textfield: { type: 'text-field', placeholder: 'html, body { ... }', @@ -172,7 +185,7 @@ Menu.main = { before: '', section: {}, - + textfield: { type: 'text-field', class: 'websites-textfield', @@ -188,20 +201,20 @@ Menu.main = { regex = /^\s*(\S+).*:\s*(\S+)[\s\n]*$/gm, match, url; - + while (match = regex.exec(this.value)) { if (/invert_colors|bluelight|brightness|contrast|grayscale|sepia/.test(match[1]) === true) { websites[url].filters[match[1]] = match[1] === 'invert_colors' ? match[2] === 'false' ? false : true : Number(match[2]); } else { url = match[1]; - + websites[url] = { enabled: match[2] === 'false' ? false : true, filters: {} }; } } - + satus.storage.set('websites', websites); } } @@ -390,6 +403,18 @@ Menu.main = { before: '', label: 'settings', parent: '.satus-main__container', + + section_01: { + type: 'section', + + hide_made_with_love: { + type: 'switch', + label: 'hideMadeWithLove', + onchange: function() { + document.documentElement.dataset.hideMadeWithLove = satus.storage.get('hide_made_with_love'); + } + } + }, section: { type: 'section',