From 4c93689c73cbeff7ff3e4fbeda2740b9507dacda Mon Sep 17 00:00:00 2001 From: nobody42 <5514211-nobody42@users.noreply.gitlab.com> Date: Sun, 5 Apr 2020 09:36:27 +0200 Subject: [PATCH 1/9] Prepared version 2.1.11 --- manifest.json | 2 +- pages/updates/updates.css | 13 +++++++ pages/updates/updates.html | 73 ++++++++++++++++++-------------------- 3 files changed, 48 insertions(+), 40 deletions(-) diff --git a/manifest.json b/manifest.json index 231e8245..69a988ad 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "LocalCDN (fork from Decentraleyes)", - "version": "2.1.10", + "version": "2.1.11", "browser_specific_settings": { "gecko": { "id": "{b86e4813-687a-43e6-ab65-0bde4ab75758}", diff --git a/pages/updates/updates.css b/pages/updates/updates.css index 0372ebf8..725379d5 100644 --- a/pages/updates/updates.css +++ b/pages/updates/updates.css @@ -1,3 +1,16 @@ +/** + * Titles + */ + +.release-date { + font-weight: bold; +} + +ul { + border-bottom: 1px solid #ccc; + padding-bottom: 20px; +} + /** * Controls */ diff --git a/pages/updates/updates.html b/pages/updates/updates.html index 770dc21a..ad3ad5d6 100644 --- a/pages/updates/updates.html +++ b/pages/updates/updates.html @@ -23,11 +23,7 @@ New in LocalCDN:
Please update your uBlock/uMatrix rules @@ -44,7 +40,15 @@

History

-

2020-03-29 (v2.1.9)


+

2020-04-05 (v2.1.10)

+ +

2020-03-29 (v2.1.9)

-

2020-03-25 (v2.1.7)


+

2020-03-25 (v2.1.7)

-

2020-03-25 (v2.1.7)


+

2020-03-25 (v2.1.7)

-

2020-03-22 (v2.1.6)


+
  • Added lozad v1.14.0
  • +
  • Added Findify v6.9.15
  • +
  • Added detection of framework-bundles (e.g. Findify)
  • +
  • Fixed Moment.js (File extension and detection of resource name)
  • +
  • Added Vue.js v1.0.28 and page.js v1.7.1
  • +
  • Fixed file extensions to prevent warnigns of Mozillas validation tests
  • +
  • Added new endpoint for webfont
  • +
  • Added new endpoint for bootstrap-slider
  • +
  • Added "ajax.cloudflare.com" and "Rocket Loader" ("#24")
  • +
  • Added Font Awesome v3.2.1
  • + +

    2020-03-22 (v2.1.6)

    -

    2020-03-17 (v2.1.5)


    +

    2020-03-17 (v2.1.5)

    -

    2020-03-13 (v2.1.4)
    +

    2020-03-13 (v2.1.4)

    -

    -

    2020-03-12 (v2.1.3)
    +

    2020-03-12 (v2.1.3)

    -

    -

    2020-03-12 (v2.1.2)
    +

    2020-03-12 (v2.1.2)

    -

    -

    2020-03-08 (v2.1.1)
    +

    2020-03-08 (v2.1.1)

    -

    -

    2020-03-03 (v2.0.24)
    +

    2020-03-03 (v2.0.24)

    -

    -

    2020-03-01 (v2.0.22)
    +

    2020-03-01 (v2.0.22)

    -

    -

    2020-02-29 (v2.0.20)
    +

    2020-02-29 (v2.0.20)

    -

    -

    2020-02-28 (v2.0.19)
    +

    2020-02-28 (v2.0.19)

    -

    -

    2020-02-28 (v2.0.17)
    +

    2020-02-28 (v2.0.17)

    -

    From e9078c2649e90a553fe37b9d179bf8cc82ba361b Mon Sep 17 00:00:00 2001 From: nobody42 <5514211-nobody42@users.noreply.gitlab.com> Date: Sun, 5 Apr 2020 20:55:19 +0200 Subject: [PATCH 2/9] Fixed #28 and #44 --- core/files.js | 26 +++++++++---------- core/request-analyzer.js | 2 +- core/resources.js | 16 ++++++------ modules/internal/helpers.js | 18 ++++++------- pages/updates/updates.html | 2 +- .../{animate.min.cssm => animate.min.css} | 0 ...ider.min.cssm => bootstrap-slider.min.css} | 0 ...otstrap-theme.cssm => bootstrap-theme.css} | 0 ...theme.min.cssm => bootstrap-theme.min.css} | 0 .../3.3.7/{bootstrap.cssm => bootstrap.css} | 0 .../{bootstrap.min.cssm => bootstrap.min.css} | 0 ...bootstrap-grid.cssm => bootstrap-grid.css} | 0 ...p-grid.min.cssm => bootstrap-grid.min.css} | 0 ...strap-reboot.cssm => bootstrap-reboot.css} | 0 ...boot.min.cssm => bootstrap-reboot.min.css} | 0 .../4.4.1/{bootstrap.cssm => bootstrap.css} | 0 .../{bootstrap.min.cssm => bootstrap.min.css} | 0 .../6.9.15/{raw.cssm => raw.css} | 0 .../6.9.15/{styles.cssm => styles.css} | 0 ...-awesome-ie7.cssm => font-awesome-ie7.css} | 0 ...-ie7.min.cssm => font-awesome-ie7.min.css} | 0 .../{font-awesome.cssm => font-awesome.css} | 0 ...-awesome.min.cssm => font-awesome.min.css} | 0 .../{font-awesome.cssm => font-awesome.css} | 0 ...-awesome.min.cssm => font-awesome.min.css} | 0 .../5.7.2/css/{all.cssm => all.css} | 0 .../5.7.2/css/{all.min.cssm => all.min.css} | 0 .../5.7.2/css/{brands.cssm => brands.css} | 0 .../css/{brands.min.cssm => brands.min.css} | 0 .../css/{fontawesome.cssm => fontawesome.css} | 0 ...ntawesome.min.cssm => fontawesome.min.css} | 0 .../5.7.2/css/{regular.cssm => regular.css} | 0 .../css/{regular.min.cssm => regular.min.css} | 0 .../5.7.2/css/{solid.cssm => solid.css} | 0 .../css/{solid.min.cssm => solid.min.css} | 0 .../css/{svg-with-js.cssm => svg-with-js.css} | 0 ...g-with-js.min.cssm => svg-with-js.min.css} | 0 .../5.7.2/css/{v4-shims.cssm => v4-shims.css} | 0 .../{v4-shims.min.cssm => v4-shims.min.css} | 0 .../{rickshaw.min.cssm => rickshaw.min.css} | 0 .../{select2.min.cssm => select2.min.css} | 0 .../2.1.4/{toastr.min.cssm => toastr.min.css} | 0 42 files changed, 32 insertions(+), 32 deletions(-) rename resources/animate.css/3.7.2/{animate.min.cssm => animate.min.css} (100%) rename resources/bootstrap-slider/10.6.2/{bootstrap-slider.min.cssm => bootstrap-slider.min.css} (100%) rename resources/bootstrap.css/3.3.7/{bootstrap-theme.cssm => bootstrap-theme.css} (100%) rename resources/bootstrap.css/3.3.7/{bootstrap-theme.min.cssm => bootstrap-theme.min.css} (100%) rename resources/bootstrap.css/3.3.7/{bootstrap.cssm => bootstrap.css} (100%) rename resources/bootstrap.css/3.3.7/{bootstrap.min.cssm => bootstrap.min.css} (100%) rename resources/bootstrap.css/4.4.1/{bootstrap-grid.cssm => bootstrap-grid.css} (100%) rename resources/bootstrap.css/4.4.1/{bootstrap-grid.min.cssm => bootstrap-grid.min.css} (100%) rename resources/bootstrap.css/4.4.1/{bootstrap-reboot.cssm => bootstrap-reboot.css} (100%) rename resources/bootstrap.css/4.4.1/{bootstrap-reboot.min.cssm => bootstrap-reboot.min.css} (100%) rename resources/bootstrap.css/4.4.1/{bootstrap.cssm => bootstrap.css} (100%) rename resources/bootstrap.css/4.4.1/{bootstrap.min.cssm => bootstrap.min.css} (100%) rename resources/findify-bundle/6.9.15/{raw.cssm => raw.css} (100%) rename resources/findify-bundle/6.9.15/{styles.cssm => styles.css} (100%) rename resources/fontawesome/3.2.1/css/{font-awesome-ie7.cssm => font-awesome-ie7.css} (100%) rename resources/fontawesome/3.2.1/css/{font-awesome-ie7.min.cssm => font-awesome-ie7.min.css} (100%) rename resources/fontawesome/3.2.1/css/{font-awesome.cssm => font-awesome.css} (100%) rename resources/fontawesome/3.2.1/css/{font-awesome.min.cssm => font-awesome.min.css} (100%) rename resources/fontawesome/4.7.0/css/{font-awesome.cssm => font-awesome.css} (100%) rename resources/fontawesome/4.7.0/css/{font-awesome.min.cssm => font-awesome.min.css} (100%) rename resources/fontawesome/5.7.2/css/{all.cssm => all.css} (100%) rename resources/fontawesome/5.7.2/css/{all.min.cssm => all.min.css} (100%) rename resources/fontawesome/5.7.2/css/{brands.cssm => brands.css} (100%) rename resources/fontawesome/5.7.2/css/{brands.min.cssm => brands.min.css} (100%) rename resources/fontawesome/5.7.2/css/{fontawesome.cssm => fontawesome.css} (100%) rename resources/fontawesome/5.7.2/css/{fontawesome.min.cssm => fontawesome.min.css} (100%) rename resources/fontawesome/5.7.2/css/{regular.cssm => regular.css} (100%) rename resources/fontawesome/5.7.2/css/{regular.min.cssm => regular.min.css} (100%) rename resources/fontawesome/5.7.2/css/{solid.cssm => solid.css} (100%) rename resources/fontawesome/5.7.2/css/{solid.min.cssm => solid.min.css} (100%) rename resources/fontawesome/5.7.2/css/{svg-with-js.cssm => svg-with-js.css} (100%) rename resources/fontawesome/5.7.2/css/{svg-with-js.min.cssm => svg-with-js.min.css} (100%) rename resources/fontawesome/5.7.2/css/{v4-shims.cssm => v4-shims.css} (100%) rename resources/fontawesome/5.7.2/css/{v4-shims.min.cssm => v4-shims.min.css} (100%) rename resources/rickshaw/1.6.6/{rickshaw.min.cssm => rickshaw.min.css} (100%) rename resources/select2/4.0.12/{select2.min.cssm => select2.min.css} (100%) rename resources/toastr.js/2.1.4/{toastr.min.cssm => toastr.min.css} (100%) diff --git a/core/files.js b/core/files.js index 493c90d9..d8bedd8a 100644 --- a/core/files.js +++ b/core/files.js @@ -30,7 +30,7 @@ var files = { 'resources/angularjs/1.7.9/angular-touch.min.jsm': true, // Animate CSS - 'resources/animate.css/3.7.2/animate.min.cssm': true, + 'resources/animate.css/3.7.2/animate.min.css': true, // Backbone.js 'resources/backbone.js/0.9.10/backbone-min.jsm': true, @@ -41,11 +41,11 @@ var files = { 'resources/bootstrap.js/4.4.1/bootstrap.min.jsm': true, // Bootstrap.css - 'resources/bootstrap.css/3.3.7/bootstrap.min.cssm': true, - 'resources/bootstrap.css/4.4.1/bootstrap.min.cssm': true, + 'resources/bootstrap.css/3.3.7/bootstrap.min.css': true, + 'resources/bootstrap.css/4.4.1/bootstrap.min.css': true, // bootstrap-slider - 'resources/bootstrap-slider/10.6.2/bootstrap-slider.min.cssm': true, + 'resources/bootstrap-slider/10.6.2/bootstrap-slider.min.css': true, 'resources/bootstrap-slider/10.6.2/bootstrap-slider.min.jsm': true, // clipboard.js @@ -79,12 +79,12 @@ var files = { 'resources/flv.js/1.5.0/flv.min.jsm': true, // Font Awesome - 'resources/fontawesome/3.2.1/css/font-awesome.min.cssm': true, - 'resources/fontawesome/3.2.1/css/font-awesome.cssm': true, - 'resources/fontawesome/3.2.1/css/font-awesome-ie7.cssm': true, - 'resources/fontawesome/3.2.1/css/font-awesome-ie7.min.cssm': true, - 'resources/fontawesome/4.7.0/css/font-awesome.min.cssm': true, - 'resources/fontawesome/5.7.2/css/all.cssm': true, + 'resources/fontawesome/3.2.1/css/font-awesome.min.css': true, + 'resources/fontawesome/3.2.1/css/font-awesome.css': true, + 'resources/fontawesome/3.2.1/css/font-awesome-ie7.css': true, + 'resources/fontawesome/3.2.1/css/font-awesome-ie7.min.css': true, + 'resources/fontawesome/4.7.0/css/font-awesome.min.css': true, + 'resources/fontawesome/5.7.2/css/all.css': true, // hls.js 'resources/hls.js/0.13.2/hls.min.jsm': true, @@ -145,7 +145,7 @@ var files = { // rickshaw 'resources/rickshaw/1.6.6/rickshaw.min.jsm': true, - 'resources/rickshaw/1.6.6/rickshaw.min.cssm': true, + 'resources/rickshaw/1.6.6/rickshaw.min.css': true, // Cloudflare Rocket Loader 'resources/rocket-loader/latest/rocket-loader.min.jsm': true, @@ -155,7 +155,7 @@ var files = { // Select2 'resources/select2/4.0.12/select2.full.min.jsm': true, - 'resources/select2/4.0.12/select2.min.cssm': true, + 'resources/select2/4.0.12/select2.min.css': true, // spin.js 'resources/spin.js/2.3.2/spin.min.jsm': true, @@ -167,7 +167,7 @@ var files = { 'resources/swfobject/2.2/swfobject.jsm': true, // toastr.js - 'resources/toastr.js/2.1.4/toastr.min.cssm': true, + 'resources/toastr.js/2.1.4/toastr.min.css': true, 'resources/toastr.js/2.1.4/toastr.min.jsm': true, // Twitter Bootstrap diff --git a/core/request-analyzer.js b/core/request-analyzer.js index 682506ca..3441be6a 100644 --- a/core/request-analyzer.js +++ b/core/request-analyzer.js @@ -149,7 +149,7 @@ requestAnalyzer._findLocalTarget = function (resourceMappings, basePath, channel let bundle = helpers.determineBundle(channelPath); if(bundle !== '') { filename = channelPath.split('/').pop(); - targetPath = targetPath + filename + 'm'; + targetPath = ( RegExp('.*\.css$').test(filename) ) ? targetPath + filename : targetPath + filename + 'm'; } if (requestAnalyzer.logging) { diff --git a/core/resources.js b/core/resources.js index 4bc0f5a9..1f0f5e37 100644 --- a/core/resources.js +++ b/core/resources.js @@ -42,7 +42,7 @@ var resources = { }, // Animate CSS 'animateCSS': { - 'path': 'resources/animate.css/{version}/animate.min.cssm', + 'path': 'resources/animate.css/{version}/animate.min.css', 'type': 'text/css' }, // Backbone.js @@ -57,12 +57,12 @@ var resources = { }, // Bootstrap.css 'bootstrapCSS': { - 'path': 'resources/bootstrap.css/{version}/bootstrap.min.cssm', + 'path': 'resources/bootstrap.css/{version}/bootstrap.min.css', 'type': 'text/css' }, // bootstrap-slider (Slider for Bootstrap 3) 'bootstrapSliderCSS': { - 'path': 'resources/bootstrap-slider/{version}/bootstrap-slider.min.cssm', + 'path': 'resources/bootstrap-slider/{version}/bootstrap-slider.min.css', 'type': 'text/css' }, 'bootstrapSliderJS': { @@ -107,12 +107,12 @@ var resources = { // Font Awesome 'fontawesome': { - 'path': 'resources/fontawesome/{version}/css/font-awesome.min.cssm', + 'path': 'resources/fontawesome/{version}/css/font-awesome.min.css', 'type': 'text/css' }, // Font Awesome 'fontawesome5': { - 'path': 'resources/fontawesome/{version}/css/all.cssm', + 'path': 'resources/fontawesome/{version}/css/all.css', 'type': 'text/css' }, // hls.js @@ -206,7 +206,7 @@ var resources = { 'type': 'application/javascript' }, 'rickshawCSS': { - 'path': 'resources/rickshaw/{version}/rickshaw.min.cssm', + 'path': 'resources/rickshaw/{version}/rickshaw.min.css', 'type': 'text/css' }, // Cloudflare Rocket Loader @@ -221,7 +221,7 @@ var resources = { }, // Select2 'select2css': { - 'path': 'resources/select2/{version}/select2.min.cssm', + 'path': 'resources/select2/{version}/select2.min.css', 'type': 'text/css' }, 'select2js': { @@ -257,7 +257,7 @@ var resources = { }, // toastr.js 'toastrCSS': { - 'path': 'resources/toastr.js/{version}/toastr.min.cssm', + 'path': 'resources/toastr.js/{version}/toastr.min.css', 'type': 'text/css' }, // toastr.js diff --git a/modules/internal/helpers.js b/modules/internal/helpers.js index 6c31f53c..16d1bfe4 100644 --- a/modules/internal/helpers.js +++ b/modules/internal/helpers.js @@ -215,11 +215,11 @@ helpers.determineResourceName = function (filename) { return 'AngularJS Sanitize'; case 'angular-touch.min.jsm': return 'AngularJS Touch'; - case 'animate.min.cssm': + case 'animate.min.css': return 'Animate CSS' case 'backbone-min.jsm': return 'Backbone.js'; - case 'bootstrap.min.cssm': + case 'bootstrap.min.css': return 'Bootstrap CSS'; case 'bootstrap.min.css': return 'Bootstrap CSS'; @@ -227,7 +227,7 @@ helpers.determineResourceName = function (filename) { return 'Bootstrap JS'; case 'bootstrap-slider.min.jsm': return 'bootstrap-slider JS'; - case 'bootstrap-slider.min.cssm': + case 'bootstrap-slider.min.css': return 'bootstrap-slider CSS'; case 'clipboard.min.jsm': return 'clipboard.js'; @@ -241,9 +241,9 @@ helpers.determineResourceName = function (filename) { return 'Ext Core'; case 'flv.min.jsm': return 'flv.js'; - case 'font-awesome.min.cssm': + case 'font-awesome.min.css': return 'Font Awesome'; - case 'all.cssm': + case 'all.css': return 'Font Awesome'; case 'hls.min.jsm': return 'hls.js'; @@ -275,7 +275,7 @@ helpers.determineResourceName = function (filename) { return 'P2P Media Loader Core'; case 'page.min.jsm': return 'page.js'; - case 'plyr.min.cssm': + case 'plyr.min.css': return 'plyr CSS'; case 'prototype.jsm': return 'Prototype'; @@ -283,11 +283,11 @@ helpers.determineResourceName = function (filename) { return 'Rocket Loader'; case 'rickshaw.min.jsm': return 'rickshaw JS'; - case 'rickshaw.min.cssm': + case 'rickshaw.min.css': return 'rickshaw CSS'; case 'scriptaculous.jsm': return 'Scriptaculous'; - case 'select2.min.cssm': + case 'select2.min.css': return 'Select2 CSS'; case 'select2.full.min.jsm': return 'Select2 JS'; @@ -297,7 +297,7 @@ helpers.determineResourceName = function (filename) { return 'Store.js'; case 'swfobject.jsm': return 'SWFObject'; - case 'toastr.min.cssm': + case 'toastr.min.css': return 'toastr.js'; case 'toastr.min.jsm': return 'toastr.js'; diff --git a/pages/updates/updates.html b/pages/updates/updates.html index ad3ad5d6..e327ce49 100644 --- a/pages/updates/updates.html +++ b/pages/updates/updates.html @@ -23,7 +23,7 @@ New in LocalCDN:
    Please update your uBlock/uMatrix rules diff --git a/resources/animate.css/3.7.2/animate.min.cssm b/resources/animate.css/3.7.2/animate.min.css similarity index 100% rename from resources/animate.css/3.7.2/animate.min.cssm rename to resources/animate.css/3.7.2/animate.min.css diff --git a/resources/bootstrap-slider/10.6.2/bootstrap-slider.min.cssm b/resources/bootstrap-slider/10.6.2/bootstrap-slider.min.css similarity index 100% rename from resources/bootstrap-slider/10.6.2/bootstrap-slider.min.cssm rename to resources/bootstrap-slider/10.6.2/bootstrap-slider.min.css diff --git a/resources/bootstrap.css/3.3.7/bootstrap-theme.cssm b/resources/bootstrap.css/3.3.7/bootstrap-theme.css similarity index 100% rename from resources/bootstrap.css/3.3.7/bootstrap-theme.cssm rename to resources/bootstrap.css/3.3.7/bootstrap-theme.css diff --git a/resources/bootstrap.css/3.3.7/bootstrap-theme.min.cssm b/resources/bootstrap.css/3.3.7/bootstrap-theme.min.css similarity index 100% rename from resources/bootstrap.css/3.3.7/bootstrap-theme.min.cssm rename to resources/bootstrap.css/3.3.7/bootstrap-theme.min.css diff --git a/resources/bootstrap.css/3.3.7/bootstrap.cssm b/resources/bootstrap.css/3.3.7/bootstrap.css similarity index 100% rename from resources/bootstrap.css/3.3.7/bootstrap.cssm rename to resources/bootstrap.css/3.3.7/bootstrap.css diff --git a/resources/bootstrap.css/3.3.7/bootstrap.min.cssm b/resources/bootstrap.css/3.3.7/bootstrap.min.css similarity index 100% rename from resources/bootstrap.css/3.3.7/bootstrap.min.cssm rename to resources/bootstrap.css/3.3.7/bootstrap.min.css diff --git a/resources/bootstrap.css/4.4.1/bootstrap-grid.cssm b/resources/bootstrap.css/4.4.1/bootstrap-grid.css similarity index 100% rename from resources/bootstrap.css/4.4.1/bootstrap-grid.cssm rename to resources/bootstrap.css/4.4.1/bootstrap-grid.css diff --git a/resources/bootstrap.css/4.4.1/bootstrap-grid.min.cssm b/resources/bootstrap.css/4.4.1/bootstrap-grid.min.css similarity index 100% rename from resources/bootstrap.css/4.4.1/bootstrap-grid.min.cssm rename to resources/bootstrap.css/4.4.1/bootstrap-grid.min.css diff --git a/resources/bootstrap.css/4.4.1/bootstrap-reboot.cssm b/resources/bootstrap.css/4.4.1/bootstrap-reboot.css similarity index 100% rename from resources/bootstrap.css/4.4.1/bootstrap-reboot.cssm rename to resources/bootstrap.css/4.4.1/bootstrap-reboot.css diff --git a/resources/bootstrap.css/4.4.1/bootstrap-reboot.min.cssm b/resources/bootstrap.css/4.4.1/bootstrap-reboot.min.css similarity index 100% rename from resources/bootstrap.css/4.4.1/bootstrap-reboot.min.cssm rename to resources/bootstrap.css/4.4.1/bootstrap-reboot.min.css diff --git a/resources/bootstrap.css/4.4.1/bootstrap.cssm b/resources/bootstrap.css/4.4.1/bootstrap.css similarity index 100% rename from resources/bootstrap.css/4.4.1/bootstrap.cssm rename to resources/bootstrap.css/4.4.1/bootstrap.css diff --git a/resources/bootstrap.css/4.4.1/bootstrap.min.cssm b/resources/bootstrap.css/4.4.1/bootstrap.min.css similarity index 100% rename from resources/bootstrap.css/4.4.1/bootstrap.min.cssm rename to resources/bootstrap.css/4.4.1/bootstrap.min.css diff --git a/resources/findify-bundle/6.9.15/raw.cssm b/resources/findify-bundle/6.9.15/raw.css similarity index 100% rename from resources/findify-bundle/6.9.15/raw.cssm rename to resources/findify-bundle/6.9.15/raw.css diff --git a/resources/findify-bundle/6.9.15/styles.cssm b/resources/findify-bundle/6.9.15/styles.css similarity index 100% rename from resources/findify-bundle/6.9.15/styles.cssm rename to resources/findify-bundle/6.9.15/styles.css diff --git a/resources/fontawesome/3.2.1/css/font-awesome-ie7.cssm b/resources/fontawesome/3.2.1/css/font-awesome-ie7.css similarity index 100% rename from resources/fontawesome/3.2.1/css/font-awesome-ie7.cssm rename to resources/fontawesome/3.2.1/css/font-awesome-ie7.css diff --git a/resources/fontawesome/3.2.1/css/font-awesome-ie7.min.cssm b/resources/fontawesome/3.2.1/css/font-awesome-ie7.min.css similarity index 100% rename from resources/fontawesome/3.2.1/css/font-awesome-ie7.min.cssm rename to resources/fontawesome/3.2.1/css/font-awesome-ie7.min.css diff --git a/resources/fontawesome/3.2.1/css/font-awesome.cssm b/resources/fontawesome/3.2.1/css/font-awesome.css similarity index 100% rename from resources/fontawesome/3.2.1/css/font-awesome.cssm rename to resources/fontawesome/3.2.1/css/font-awesome.css diff --git a/resources/fontawesome/3.2.1/css/font-awesome.min.cssm b/resources/fontawesome/3.2.1/css/font-awesome.min.css similarity index 100% rename from resources/fontawesome/3.2.1/css/font-awesome.min.cssm rename to resources/fontawesome/3.2.1/css/font-awesome.min.css diff --git a/resources/fontawesome/4.7.0/css/font-awesome.cssm b/resources/fontawesome/4.7.0/css/font-awesome.css similarity index 100% rename from resources/fontawesome/4.7.0/css/font-awesome.cssm rename to resources/fontawesome/4.7.0/css/font-awesome.css diff --git a/resources/fontawesome/4.7.0/css/font-awesome.min.cssm b/resources/fontawesome/4.7.0/css/font-awesome.min.css similarity index 100% rename from resources/fontawesome/4.7.0/css/font-awesome.min.cssm rename to resources/fontawesome/4.7.0/css/font-awesome.min.css diff --git a/resources/fontawesome/5.7.2/css/all.cssm b/resources/fontawesome/5.7.2/css/all.css similarity index 100% rename from resources/fontawesome/5.7.2/css/all.cssm rename to resources/fontawesome/5.7.2/css/all.css diff --git a/resources/fontawesome/5.7.2/css/all.min.cssm b/resources/fontawesome/5.7.2/css/all.min.css similarity index 100% rename from resources/fontawesome/5.7.2/css/all.min.cssm rename to resources/fontawesome/5.7.2/css/all.min.css diff --git a/resources/fontawesome/5.7.2/css/brands.cssm b/resources/fontawesome/5.7.2/css/brands.css similarity index 100% rename from resources/fontawesome/5.7.2/css/brands.cssm rename to resources/fontawesome/5.7.2/css/brands.css diff --git a/resources/fontawesome/5.7.2/css/brands.min.cssm b/resources/fontawesome/5.7.2/css/brands.min.css similarity index 100% rename from resources/fontawesome/5.7.2/css/brands.min.cssm rename to resources/fontawesome/5.7.2/css/brands.min.css diff --git a/resources/fontawesome/5.7.2/css/fontawesome.cssm b/resources/fontawesome/5.7.2/css/fontawesome.css similarity index 100% rename from resources/fontawesome/5.7.2/css/fontawesome.cssm rename to resources/fontawesome/5.7.2/css/fontawesome.css diff --git a/resources/fontawesome/5.7.2/css/fontawesome.min.cssm b/resources/fontawesome/5.7.2/css/fontawesome.min.css similarity index 100% rename from resources/fontawesome/5.7.2/css/fontawesome.min.cssm rename to resources/fontawesome/5.7.2/css/fontawesome.min.css diff --git a/resources/fontawesome/5.7.2/css/regular.cssm b/resources/fontawesome/5.7.2/css/regular.css similarity index 100% rename from resources/fontawesome/5.7.2/css/regular.cssm rename to resources/fontawesome/5.7.2/css/regular.css diff --git a/resources/fontawesome/5.7.2/css/regular.min.cssm b/resources/fontawesome/5.7.2/css/regular.min.css similarity index 100% rename from resources/fontawesome/5.7.2/css/regular.min.cssm rename to resources/fontawesome/5.7.2/css/regular.min.css diff --git a/resources/fontawesome/5.7.2/css/solid.cssm b/resources/fontawesome/5.7.2/css/solid.css similarity index 100% rename from resources/fontawesome/5.7.2/css/solid.cssm rename to resources/fontawesome/5.7.2/css/solid.css diff --git a/resources/fontawesome/5.7.2/css/solid.min.cssm b/resources/fontawesome/5.7.2/css/solid.min.css similarity index 100% rename from resources/fontawesome/5.7.2/css/solid.min.cssm rename to resources/fontawesome/5.7.2/css/solid.min.css diff --git a/resources/fontawesome/5.7.2/css/svg-with-js.cssm b/resources/fontawesome/5.7.2/css/svg-with-js.css similarity index 100% rename from resources/fontawesome/5.7.2/css/svg-with-js.cssm rename to resources/fontawesome/5.7.2/css/svg-with-js.css diff --git a/resources/fontawesome/5.7.2/css/svg-with-js.min.cssm b/resources/fontawesome/5.7.2/css/svg-with-js.min.css similarity index 100% rename from resources/fontawesome/5.7.2/css/svg-with-js.min.cssm rename to resources/fontawesome/5.7.2/css/svg-with-js.min.css diff --git a/resources/fontawesome/5.7.2/css/v4-shims.cssm b/resources/fontawesome/5.7.2/css/v4-shims.css similarity index 100% rename from resources/fontawesome/5.7.2/css/v4-shims.cssm rename to resources/fontawesome/5.7.2/css/v4-shims.css diff --git a/resources/fontawesome/5.7.2/css/v4-shims.min.cssm b/resources/fontawesome/5.7.2/css/v4-shims.min.css similarity index 100% rename from resources/fontawesome/5.7.2/css/v4-shims.min.cssm rename to resources/fontawesome/5.7.2/css/v4-shims.min.css diff --git a/resources/rickshaw/1.6.6/rickshaw.min.cssm b/resources/rickshaw/1.6.6/rickshaw.min.css similarity index 100% rename from resources/rickshaw/1.6.6/rickshaw.min.cssm rename to resources/rickshaw/1.6.6/rickshaw.min.css diff --git a/resources/select2/4.0.12/select2.min.cssm b/resources/select2/4.0.12/select2.min.css similarity index 100% rename from resources/select2/4.0.12/select2.min.cssm rename to resources/select2/4.0.12/select2.min.css diff --git a/resources/toastr.js/2.1.4/toastr.min.cssm b/resources/toastr.js/2.1.4/toastr.min.css similarity index 100% rename from resources/toastr.js/2.1.4/toastr.min.cssm rename to resources/toastr.js/2.1.4/toastr.min.css From 27eb0d8c17614d708e8dad8e7f2e1e3043398615 Mon Sep 17 00:00:00 2001 From: nobody42 <5514211-nobody42@users.noreply.gitlab.com> Date: Mon, 6 Apr 2020 18:04:39 +0200 Subject: [PATCH 3/9] Added jQuery v1.7.1 and branching of versions improved (Fixed #49) --- core/files.js | 1 + modules/internal/helpers.js | 6 +++++- resources/jquery/1.7.1/jquery.min.jsm | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 resources/jquery/1.7.1/jquery.min.jsm diff --git a/core/files.js b/core/files.js index d8bedd8a..51546453 100644 --- a/core/files.js +++ b/core/files.js @@ -90,6 +90,7 @@ var files = { 'resources/hls.js/0.13.2/hls.min.jsm': true, // jQuery + 'resources/jquery/1.7.1/jquery.min.jsm': true, 'resources/jquery/1.8.3/jquery.min.jsm': true, 'resources/jquery/1.12.4/jquery.min.jsm': true, 'resources/jquery/2.2.4/jquery.min.jsm': true, diff --git a/modules/internal/helpers.js b/modules/internal/helpers.js index 16d1bfe4..b5021164 100644 --- a/modules/internal/helpers.js +++ b/modules/internal/helpers.js @@ -409,7 +409,11 @@ helpers.setLastVersion = function (type, version) { } else if (type.includes('/hls.js/')) { version = '0.13.2'; } else if (type.includes('/jquery/1.')) { - version = ( helpers.compareVersion('1.8.3', requestVersion )) ? '1.8.3' : '1.12.4'; + if (helpers.compareVersion('1.7.1', requestVersion)) version = '1.7.1'; // < v1.7.1 + else if (helpers.compareVersion('1.8.3', requestVersion)) version = '1.8.3'; // >= 1.7.2 to <= 1.8.3 + else version = '1.12.4'; // >= 1.8.4 + } else if (type.includes('/jquery/1.8.')) { + version = '1.8.3'; } else if (type.includes('/jquery/2.')) { version = '2.2.4'; } else if (type.includes('/jquery/3.')) { diff --git a/resources/jquery/1.7.1/jquery.min.jsm b/resources/jquery/1.7.1/jquery.min.jsm new file mode 100644 index 00000000..b1b47b81 --- /dev/null +++ b/resources/jquery/1.7.1/jquery.min.jsm @@ -0,0 +1,4 @@ +/*! jQuery v1.7.1 jquery.com | jquery.org/license */ +(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"":"")+""),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;g=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
    a",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="
    "+""+"
    ",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="
    t
    ",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="
    ",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; +f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&i.push({elem:this,matches:d.slice(e)});for(j=0;j0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

    ";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
    ";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"
    ","
    "],thead:[1,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],col:[2,"","
    "],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
    ","
    "]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() +{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
    ").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); From e9057f79182ed556132ae13dc87f8be01b6ab798 Mon Sep 17 00:00:00 2001 From: nobody42 <5514211-nobody42@users.noreply.gitlab.com> Date: Mon, 6 Apr 2020 18:04:53 +0200 Subject: [PATCH 4/9] Fixed bug in lastMappingUpdate and added hideReleaseNotes in settings --- _locales/de/messages.json | 16 +++++++++ _locales/en_US/messages.json | 10 +++++- core/constants.js | 2 +- core/main.js | 66 ++++++++++++++++++++++-------------- pages/options/options.html | 17 ++++++++++ pages/options/options.js | 3 ++ 6 files changed, 86 insertions(+), 28 deletions(-) diff --git a/_locales/de/messages.json b/_locales/de/messages.json index 1b0214c1..9ac911ff 100644 --- a/_locales/de/messages.json +++ b/_locales/de/messages.json @@ -70,5 +70,21 @@ "generateRuleSetTitle": { "message": "Generiere Regelsätze für uBlock oder uMatrix", "description": "Generate rule set title." + }, + "loggingTitle": { + "message": "Aktiviere das loggen in die Browser-Konsole", + "description": "Aktiviere das loggen in die Browser-Konsole." + }, + "loggingDescription": { + "message": "Öffne die \"Browser-Konsole\" ( STRG + UMSCHALT + J ) um fehlende Resourcen anzuzeigen.", + "description": "Öffne die \"Browser-Konsole\" ( STRG + UMSCHALT + J ) um fehlende Resourcen anzuzeigen." + }, + "hideReleaseNotesTitle": { + "message": "Versionshinweise deaktivieren", + "description": "Versionshinweise deaktivieren" + }, + "hideReleaseNotesDescription": { + "message": "Falls aktivert, erhälst du keine Hinweise über Neuerungen in LocalCDN. Dazu gehören auch Informationen über neue uBlock/uMatrix-Regeln.", + "description": "Falls aktivert, erhälst du keine Hinweise über Neuerungen in LocalCDN. Dazu gehören auch Informationen über neue uBlock/uMatrix-Regeln." } } diff --git a/_locales/en_US/messages.json b/_locales/en_US/messages.json index 06520775..07968a28 100644 --- a/_locales/en_US/messages.json +++ b/_locales/en_US/messages.json @@ -77,6 +77,14 @@ }, "loggingDescription": { "message": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources", - "description": "Generate rule set title." + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "Disable release notes", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules.", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." } } diff --git a/core/constants.js b/core/constants.js index 34ec3154..b65439a5 100644 --- a/core/constants.js +++ b/core/constants.js @@ -60,7 +60,7 @@ const Setting = { 'DISABLE_PREFETCH': 'disablePrefetch', 'ENFORCE_STAGING': 'enforceStaging', 'SHOW_ICON_BADGE': 'showIconBadge', - 'SHOW_RELEASE_NOTES': 'showReleaseNotes', + 'HIDE_RELEASE_NOTES': 'hideReleaseNotes', 'STRIP_METADATA': 'stripMetadata', 'LAST_MAPPING_UPDATE': 'lastMappingUpdate', 'WHITELISTED_DOMAINS': 'whitelistedDomains', diff --git a/core/main.js b/core/main.js index 441327d2..ecfd86e6 100644 --- a/core/main.js +++ b/core/main.js @@ -31,8 +31,8 @@ main._initializeSettings = function () { [Setting.BLOCK_MISSING]: false, [Setting.DISABLE_PREFETCH]: true, [Setting.ENFORCE_STAGING]: false, + [Setting.HIDE_RELEASE_NOTES]: false, [Setting.STRIP_METADATA]: true, - [Setting.LAST_MAPPING_UPDATE]: "2020-01-01", [Setting.WHITELISTED_DOMAINS]: {}, [Setting.LOGGING]: false }; @@ -69,41 +69,55 @@ main._showReleaseNotes = function (details) { if (details.reason === chrome.runtime.OnInstalledReason.INSTALL) { - previousVersion = details.previousVersion; + chrome.storage.local.set({ + [Setting.LAST_MAPPING_UPDATE]: lastMappingUpdate + }, function() { - if (previousVersion && previousVersion.charAt(0) === '2') { - return; // Do not show release notes after minor updates. - } + previousVersion = details.previousVersion; - if (details.temporary !== true) { + if (previousVersion && previousVersion.charAt(0) === '2') { + return; // Do not show release notes after minor updates. + } - chrome.storage.local.get({ - [Setting.SHOW_RELEASE_NOTES]: true - }, function (items) { + if (details.temporary !== true) { - if (items.showReleaseNotes === true) { + chrome.storage.local.get([Setting.HIDE_RELEASE_NOTES], function (items) { - chrome.tabs.create({ - 'url': location, - 'active': false - }); - } - }); - } - } else if (details.reason === chrome.runtime.OnInstalledReason.UPDATE) { - // If add-on update true, check last update of mappings.js - chrome.storage.local.get({[Setting.LAST_MAPPING_UPDATE]: lastMappingUpdate}, function (items) { - if (items.lastMappingUpdate !== lastMappingUpdate) { - // Updated mappings.js - chrome.tabs.create({ - 'url': updateAdBlockerRules, - 'active': true + if (items.hideReleaseNotes !== true) { + + chrome.tabs.create({ + 'url': location, + 'active': false + }); + } }); + } + }); + } else if (details.reason === chrome.runtime.OnInstalledReason.UPDATE) { + + let newValue = lastMappingUpdate; + let oldValue = ""; + + // If add-on update true, check last update of mappings.js + chrome.storage.local.get([Setting.LAST_MAPPING_UPDATE, Setting.HIDE_RELEASE_NOTES], function (items) { + + oldValue = items.lastMappingUpdate; + + if (oldValue !== newValue) { + // Updated mappings.js chrome.storage.local.set({ - [Setting.LAST_MAPPING_UPDATE]: lastMappingUpdate + [Setting.LAST_MAPPING_UPDATE]: newValue + }, function() { + if (!items.hideReleaseNotes) { + chrome.tabs.create({ + 'url': updateAdBlockerRules, + 'active': true + }); + } }); } else { // No mappings.js update + return; } }); } diff --git a/pages/options/options.html b/pages/options/options.html index 2a488bf4..ab09383b 100644 --- a/pages/options/options.html +++ b/pages/options/options.html @@ -138,6 +138,23 @@ +
    + +
    + + + +
    + +
    + +
    +
    diff --git a/pages/options/options.js b/pages/options/options.js index 21a18673..5cfeccc2 100644 --- a/pages/options/options.js +++ b/pages/options/options.js @@ -45,6 +45,7 @@ options._renderOptionsPanel = function () { elements.blockMissing.checked = options._optionValues.blockMissing; elements.disablePrefetch.checked = options._optionValues.disablePrefetch; elements.stripMetadata.checked = options._optionValues.stripMetadata; + elements.hideReleaseNotes.checked = options._optionValues.hideReleaseNotes; elements.enableLogging.checked = options._optionValues.enableLogging; elements.whitelistedDomains.value = domainWhitelist; @@ -87,6 +88,7 @@ options._registerOptionChangedEventListeners = function (elements) { elements.disablePrefetch.addEventListener('change', options._onOptionChanged); elements.stripMetadata.addEventListener('change', options._onOptionChanged); elements.enableLogging.addEventListener('change', options._onOptionChanged); + elements.hideReleaseNotes.addEventListener('change', options._onOptionChanged); elements.whitelistedDomains.addEventListener('keyup', options._onOptionChanged); let type = elements.ruleSets; for(let i = 0; i < type.length; i++) { @@ -134,6 +136,7 @@ options._getOptionElements = function () { [Setting.DISABLE_PREFETCH]: options._getOptionElement(Setting.DISABLE_PREFETCH), [Setting.STRIP_METADATA]: options._getOptionElement(Setting.STRIP_METADATA), [Setting.WHITELISTED_DOMAINS]: options._getOptionElement(Setting.WHITELISTED_DOMAINS), + [Setting.HIDE_RELEASE_NOTES]: options._getOptionElement(Setting.HIDE_RELEASE_NOTES), [Setting.LOGGING]: options._getOptionElement(Setting.LOGGING), ['ruleSets']: document.getElementsByName("rule-sets"), ['copyRuleSet']: document.getElementById("button-copy-rule-set") From 6f03e4fa1710f07dd73181c0e19cae50a53109c1 Mon Sep 17 00:00:00 2001 From: nobody42 <5514211-nobody42@users.noreply.gitlab.com> Date: Mon, 6 Apr 2020 18:29:06 +0200 Subject: [PATCH 5/9] Added release notes --- pages/updates/updates.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/updates/updates.html b/pages/updates/updates.html index e327ce49..fae957f0 100644 --- a/pages/updates/updates.html +++ b/pages/updates/updates.html @@ -24,6 +24,8 @@
    • Fixed #28 and #44
    • +
    • Fixed #49 (partly)
    • +
    • Fixed storage mechanism of lastMappingUpdate and added option to hide release notes
    Please update your uBlock/uMatrix rules From 0a058da9f3437be03823787e6e8f0556c75e1f30 Mon Sep 17 00:00:00 2001 From: nobody42 <5514211-nobody42@users.noreply.gitlab.com> Date: Mon, 6 Apr 2020 18:58:33 +0200 Subject: [PATCH 6/9] Updated i18n --- _locales/de/messages.json | 20 ++++++++++++++++---- _locales/en_US/messages.json | 12 ++++++++++++ modules/internal/helpers.js | 3 +++ pages/options/options.html | 10 +++++----- pages/options/options.js | 2 +- 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/_locales/de/messages.json b/_locales/de/messages.json index 9ac911ff..692d2f8d 100644 --- a/_locales/de/messages.json +++ b/_locales/de/messages.json @@ -67,24 +67,36 @@ "message": "Erweitert", "description": "Advanced label." }, + "lastUpdate": { + "message": "Letztes Update: ", + "description": "Last update." + }, "generateRuleSetTitle": { "message": "Generiere Regelsätze für uBlock oder uMatrix", "description": "Generate rule set title." }, + "generateRuleSetDescription": { + "message": "Falls du uBlock/uMatrix benutzt, kannst du dir hier die Regeln generieren lassen. Beachte, dass du diese manuell in uBlock/uMtrix eingefügt werden müssen.", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "copyRuleSet": { + "message": "Kopieren", + "description": "Text of button to copy ruleset." + }, "loggingTitle": { "message": "Aktiviere das loggen in die Browser-Konsole", - "description": "Aktiviere das loggen in die Browser-Konsole." + "description": "Enable logging in browser console." }, "loggingDescription": { "message": "Öffne die \"Browser-Konsole\" ( STRG + UMSCHALT + J ) um fehlende Resourcen anzuzeigen.", - "description": "Öffne die \"Browser-Konsole\" ( STRG + UMSCHALT + J ) um fehlende Resourcen anzuzeigen." + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." }, "hideReleaseNotesTitle": { "message": "Versionshinweise deaktivieren", - "description": "Versionshinweise deaktivieren" + "description": "Disable release notes" }, "hideReleaseNotesDescription": { "message": "Falls aktivert, erhälst du keine Hinweise über Neuerungen in LocalCDN. Dazu gehören auch Informationen über neue uBlock/uMatrix-Regeln.", - "description": "Falls aktivert, erhälst du keine Hinweise über Neuerungen in LocalCDN. Dazu gehören auch Informationen über neue uBlock/uMatrix-Regeln." + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." } } diff --git a/_locales/en_US/messages.json b/_locales/en_US/messages.json index 07968a28..0c16315c 100644 --- a/_locales/en_US/messages.json +++ b/_locales/en_US/messages.json @@ -67,10 +67,22 @@ "message": "Advanced", "description": "Advanced label." }, + "lastUpdate": { + "message": "Last update: ", + "description": "Last update." + }, "generateRuleSetTitle": { "message": "Generate rule sets for uBlock or uMatrix", "description": "Generate rule set title." }, + "generateRuleSetDescription": { + "message": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix.", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "copyRuleSet": { + "message": "Copy", + "description": "Text of button to copy ruleset." + }, "loggingTitle": { "message": "Enable logging in browser console", "description": "Enable logging in browser console." diff --git a/modules/internal/helpers.js b/modules/internal/helpers.js index b5021164..681e6296 100644 --- a/modules/internal/helpers.js +++ b/modules/internal/helpers.js @@ -35,6 +35,9 @@ helpers.insertI18nContentIntoDocument = function (document) { i18nElements.forEach(function (i18nElement) { let i18nMessageName = i18nElement.getAttribute('data-i18n-content'); + if (i18nElement.id === 'button-copy-rule-set') { + i18nElement.value = chrome.i18n.getMessage('copyRuleSet'); + } if(chrome.i18n.getMessage(i18nMessageName) === '') { // Select english if configured language is empty i18nElement.innerText = chrome.i18n.getMessage(i18nMessageName); diff --git a/pages/options/options.html b/pages/options/options.html index ab09383b..1f842053 100644 --- a/pages/options/options.html +++ b/pages/options/options.html @@ -38,7 +38,7 @@
    This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains.
    - +
    Disable
    @@ -165,8 +165,8 @@
    -

    In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix.

    -

    Last update:

    +

    +

    @@ -177,7 +177,7 @@
    - +
    - + Help Translate diff --git a/pages/options/options.js b/pages/options/options.js index 5cfeccc2..737f8979 100644 --- a/pages/options/options.js +++ b/pages/options/options.js @@ -60,7 +60,7 @@ options._renderOptionsPanel = function () { options._renderLocaleNotice(); } - document.getElementById('last-mapping-update').textContent = lastMappingUpdate; + document.getElementById('last-mapping-update').textContent += lastMappingUpdate; }; options._renderBlockMissingNotice = function () { From 380fccf39e6608c04c0efa7b4de93529d791aec3 Mon Sep 17 00:00:00 2001 From: nobody42 <5514211-nobody42@users.noreply.gitlab.com> Date: Tue, 7 Apr 2020 12:19:32 +0200 Subject: [PATCH 7/9] Updated i18n and settings page --- _locales/ar/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/bg/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/cs/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/da/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/de/messages.json | 18 +++++++++++++----- _locales/el/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/en_GB/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/en_US/messages.json | 16 ++++++++++++---- _locales/eo/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/es/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/et/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/fi/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/fr/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/he/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/hu/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/id/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/is/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/it/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/ja/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/ko/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/lb/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/nb_NO/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/nl/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/pl/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/pt_BR/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/pt_PT/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/ro/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/ru/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/sr/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/sv/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/tl/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/tr/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/zh_CN/messages.json | 36 ++++++++++++++++++++++++++++++++++++ _locales/zh_TW/messages.json | 36 ++++++++++++++++++++++++++++++++++++ modules/internal/helpers.js | 17 +++++++++-------- pages/options/options.css | 31 +++++++++++++++++++++---------- pages/options/options.html | 35 +++++++++++++++++++---------------- pages/options/options.js | 9 ++++++++- 38 files changed, 1234 insertions(+), 44 deletions(-) diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json index cae5c049..555a1453 100644 --- a/_locales/ar/messages.json +++ b/_locales/ar/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "قم بإنشاء مجموعات قواعد لـ uBlock أو uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/bg/messages.json b/_locales/bg/messages.json index 5a724323..497647d7 100644 --- a/_locales/bg/messages.json +++ b/_locales/bg/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Генерирайте набори от правила за uBlock или uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json index 3060725a..7c062d09 100644 --- a/_locales/cs/messages.json +++ b/_locales/cs/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Generujte sady pravidel pro uBlock nebo uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/da/messages.json b/_locales/da/messages.json index 1b36ac1e..3bcc77d7 100644 --- a/_locales/da/messages.json +++ b/_locales/da/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Generer regelsæt for uBlock eller uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/de/messages.json b/_locales/de/messages.json index 692d2f8d..842be13b 100644 --- a/_locales/de/messages.json +++ b/_locales/de/messages.json @@ -40,7 +40,7 @@ "description": "Block requests for missing resources description." }, "disablePrefetchTitle": { - "message": "Deaktiviere link prefetching", + "message": "Deaktiviere \"Link prefetching\"", "description": "Disable prefetch title." }, "disablePrefetchDescription": { @@ -67,10 +67,6 @@ "message": "Erweitert", "description": "Advanced label." }, - "lastUpdate": { - "message": "Letztes Update: ", - "description": "Last update." - }, "generateRuleSetTitle": { "message": "Generiere Regelsätze für uBlock oder uMatrix", "description": "Generate rule set title." @@ -79,6 +75,10 @@ "message": "Falls du uBlock/uMatrix benutzt, kannst du dir hier die Regeln generieren lassen. Beachte, dass du diese manuell in uBlock/uMtrix eingefügt werden müssen.", "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." }, + "lastUpdate": { + "message": "Letztes Update: ", + "description": "Last update." + }, "copyRuleSet": { "message": "Kopieren", "description": "Text of button to copy ruleset." @@ -98,5 +98,13 @@ "hideReleaseNotesDescription": { "message": "Falls aktivert, erhälst du keine Hinweise über Neuerungen in LocalCDN. Dazu gehören auch Informationen über neue uBlock/uMatrix-Regeln.", "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "Diese Funktion verursacht bei manchen Websites Fehler. Lassen Sie diese Funktion nicht aktiviert, es sei denn, Sie sind bereit, die betroffene Webseiten manuell auf die Whitelist zu setzen.", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "Deaktivieren", + "description": "Disable" } } diff --git a/_locales/el/messages.json b/_locales/el/messages.json index 0b26dafe..29732fd7 100644 --- a/_locales/el/messages.json +++ b/_locales/el/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Δημιουργία συνόλων κανόνων για uBlock ή uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/en_GB/messages.json b/_locales/en_GB/messages.json index e066d43f..660eb2ad 100644 --- a/_locales/en_GB/messages.json +++ b/_locales/en_GB/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Generate rule sets for uBlock or uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix.", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "Last update: ", + "description": "Last update." + }, + "copyRuleSet": { + "message": "Copy", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "Enable logging in browser console", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "Disable release notes", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules.", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/en_US/messages.json b/_locales/en_US/messages.json index 0c16315c..97e375da 100644 --- a/_locales/en_US/messages.json +++ b/_locales/en_US/messages.json @@ -67,10 +67,6 @@ "message": "Advanced", "description": "Advanced label." }, - "lastUpdate": { - "message": "Last update: ", - "description": "Last update." - }, "generateRuleSetTitle": { "message": "Generate rule sets for uBlock or uMatrix", "description": "Generate rule set title." @@ -79,6 +75,10 @@ "message": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix.", "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." }, + "lastUpdate": { + "message": "Last update: ", + "description": "Last update." + }, "copyRuleSet": { "message": "Copy", "description": "Text of button to copy ruleset." @@ -98,5 +98,13 @@ "hideReleaseNotesDescription": { "message": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules.", "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains.", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "Disable", + "description": "Disable" } } diff --git a/_locales/eo/messages.json b/_locales/eo/messages.json index d6e80141..ef2c52b6 100644 --- a/_locales/eo/messages.json +++ b/_locales/eo/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Generi regulojn por uBlock aŭ uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/es/messages.json b/_locales/es/messages.json index 46f80fee..f5aa5379 100644 --- a/_locales/es/messages.json +++ b/_locales/es/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Generar conjuntos de reglas para uBlock o uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/et/messages.json b/_locales/et/messages.json index 2a6c4f7d..443504c4 100644 --- a/_locales/et/messages.json +++ b/_locales/et/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Genereerige reeglite komplektid uBlockile või uMatrixile", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json index 53213da4..76e7dacd 100644 --- a/_locales/fi/messages.json +++ b/_locales/fi/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Luo sääntöjoukot uBlockille tai uMatrixille", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json index aa33077c..0cb100c5 100644 --- a/_locales/fr/messages.json +++ b/_locales/fr/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Générer des ensembles de règles pour uBlock ou uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/he/messages.json b/_locales/he/messages.json index 54892f6d..19c889a4 100644 --- a/_locales/he/messages.json +++ b/_locales/he/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "צור מערכי כללים עבור uBlock או uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/hu/messages.json b/_locales/hu/messages.json index cf05d817..6d30ee23 100644 --- a/_locales/hu/messages.json +++ b/_locales/hu/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Szabálykészleteket generálhat az uBlock vagy az uMatrix számára", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/id/messages.json b/_locales/id/messages.json index f7aa73bd..133cb419 100644 --- a/_locales/id/messages.json +++ b/_locales/id/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Buat set aturan untuk uBlock atau uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/is/messages.json b/_locales/is/messages.json index 9af5388a..eeddcaf4 100644 --- a/_locales/is/messages.json +++ b/_locales/is/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Búðu til reglusett fyrir uBlock eða uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/it/messages.json b/_locales/it/messages.json index 208ae4ba..3811d719 100644 --- a/_locales/it/messages.json +++ b/_locales/it/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Genera set di regole per uBlock o uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json index 8772d332..7530d671 100644 --- a/_locales/ja/messages.json +++ b/_locales/ja/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "uBlockまたはuMatrixのルールセットを生成する", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/ko/messages.json b/_locales/ko/messages.json index 995e026e..fba16fe6 100644 --- a/_locales/ko/messages.json +++ b/_locales/ko/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "uBlock 또는 uMatrix에 대한 규칙 세트 생성", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/lb/messages.json b/_locales/lb/messages.json index b0063770..cac9608b 100644 --- a/_locales/lb/messages.json +++ b/_locales/lb/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Generéiere Regel Sets fir uBlock oder uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/nb_NO/messages.json b/_locales/nb_NO/messages.json index 5bc28267..1e483f4c 100644 --- a/_locales/nb_NO/messages.json +++ b/_locales/nb_NO/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Generer regelsett for uBlock eller uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json index 8faca238..919e1b3a 100644 --- a/_locales/nl/messages.json +++ b/_locales/nl/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Genereer regelsets voor uBlock of uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json index 446fea79..a0cb0c46 100644 --- a/_locales/pl/messages.json +++ b/_locales/pl/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Generuj zestawy reguł dla uBlock lub uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json index dd7cc5e4..0bd90336 100644 --- a/_locales/pt_BR/messages.json +++ b/_locales/pt_BR/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Gere conjuntos de regras para uBlock ou uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/pt_PT/messages.json b/_locales/pt_PT/messages.json index 4703ea57..02653619 100644 --- a/_locales/pt_PT/messages.json +++ b/_locales/pt_PT/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Gere conjuntos de regras para uBlock ou uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/ro/messages.json b/_locales/ro/messages.json index 20ba1be8..df1f92eb 100644 --- a/_locales/ro/messages.json +++ b/_locales/ro/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Generați seturi de reguli pentru uBlock sau uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json index 4f6de6f4..316f0842 100644 --- a/_locales/ru/messages.json +++ b/_locales/ru/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Генерация наборов правил для uBlock или uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/sr/messages.json b/_locales/sr/messages.json index d345f451..cd0b87f5 100644 --- a/_locales/sr/messages.json +++ b/_locales/sr/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Генерисање скупова правила за Блок или Матрицу", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json index 2a703148..32bf404c 100644 --- a/_locales/sv/messages.json +++ b/_locales/sv/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Generera regeluppsättningar för uBlock eller uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/tl/messages.json b/_locales/tl/messages.json index ca5c97d3..553ab619 100644 --- a/_locales/tl/messages.json +++ b/_locales/tl/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "Bumuo ng mga set ng panuntunan para sa uBlock o uMatrix", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json index 276aff33..74e599d4 100644 --- a/_locales/tr/messages.json +++ b/_locales/tr/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "UBlock veya uMatrix için kural kümeleri oluşturma", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json index a7c8f71a..d0dfcf89 100644 --- a/_locales/zh_CN/messages.json +++ b/_locales/zh_CN/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "为uBlock或uMatrix生成规则集", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json index 4213ccd5..9ee5fa51 100644 --- a/_locales/zh_TW/messages.json +++ b/_locales/zh_TW/messages.json @@ -70,5 +70,41 @@ "generateRuleSetTitle": { "message": "为uBlock或uMatrix生成规则集", "description": "Generate rule set title." + }, + "generateRuleSetDescription": { + "message": "", + "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." + }, + "lastUpdate": { + "message": "", + "description": "Last update." + }, + "copyRuleSet": { + "message": "", + "description": "Text of button to copy ruleset." + }, + "loggingTitle": { + "message": "", + "description": "Enable logging in browser console." + }, + "loggingDescription": { + "message": "", + "description": "Open \"Browser Console\" ( CTRL + SHIFT + J ) to show missing resources." + }, + "hideReleaseNotesTitle": { + "message": "", + "description": "Disable release notes" + }, + "hideReleaseNotesDescription": { + "message": "", + "description": "If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules." + }, + "featureBreaksWebsitesDescription": { + "message": "", + "description": "This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains." + }, + "featureBreaksWebsitesButton": { + "message": "", + "description": "Disable" } } diff --git a/modules/internal/helpers.js b/modules/internal/helpers.js index 681e6296..7d6a605c 100644 --- a/modules/internal/helpers.js +++ b/modules/internal/helpers.js @@ -26,8 +26,9 @@ var helpers = {}; helpers.insertI18nContentIntoDocument = function (document) { - let scriptDirection, defaultScriptDirection, i18nElements; + let scriptDirection, defaultScriptDirection, i18nElements, translationComplete; + translationComplete = true; scriptDirection = helpers.determineScriptDirection(navigator.language); defaultScriptDirection = helpers.determineScriptDirection('en_US'); i18nElements = document.querySelectorAll('[data-i18n-content]'); @@ -35,19 +36,19 @@ helpers.insertI18nContentIntoDocument = function (document) { i18nElements.forEach(function (i18nElement) { let i18nMessageName = i18nElement.getAttribute('data-i18n-content'); - if (i18nElement.id === 'button-copy-rule-set') { + if (i18nElement.id === 'button-copy-rule-set' && chrome.i18n.getMessage(i18nMessageName) !== '') { i18nElement.value = chrome.i18n.getMessage('copyRuleSet'); } - if(chrome.i18n.getMessage(i18nMessageName) === '') { - // Select english if configured language is empty - i18nElement.innerText = chrome.i18n.getMessage(i18nMessageName); - i18nElement.setAttribute('dir', defaultScriptDirection); - } else { + if(chrome.i18n.getMessage(i18nMessageName) !== '') { i18nElement.innerText = chrome.i18n.getMessage(i18nMessageName); i18nElement.setAttribute('dir', scriptDirection); + } else { + translationComplete = false; } - }); + + return translationComplete; + }; helpers.insertI18nTitlesIntoDocument = function (document) { diff --git a/pages/options/options.css b/pages/options/options.css index 89d29b4d..d926dbda 100644 --- a/pages/options/options.css +++ b/pages/options/options.css @@ -34,6 +34,17 @@ body { color: #fff; } +#notice-locale { + background-color: #ffa500; + color: white; + font-weight: 600; +} + +.without-checkbox { + margin: 0px !important; + padding: 0px !important; +} + /** * Fonts */ @@ -82,14 +93,9 @@ body { } .input-text { - margin-left: 29px; max-width: 320px; } -input[type=radio] { - margin: 10px 10px 10px 0px; -} - /** * Icons */ @@ -150,7 +156,6 @@ input[type=radio] { #button-copy-rule-set { display: none; padding: 5px; - margin-left: 29px; font-size: 1.3em; } @@ -169,7 +174,7 @@ input[type=radio] { .description-option { color: #777; font-style: italic; - padding-left: 29px; + padding-left: 20px; } .badge { @@ -211,17 +216,23 @@ input[type=radio] { #generated-rules { display: none; - margin-left: 29px; } .ruleset-generator { display: flex; align-items: center; - margin-left: 29px; + padding: 5px 0px; } .last-update { - font-weight: bold; + font-weight: 600; + background-color: #ffa500; + border-radius: 3px; + color: #fff; + font-size: 12px; + padding: 3px 5px !important; + text-transform: uppercase; + font-style: normal; } /** diff --git a/pages/options/options.html b/pages/options/options.html index 1f842053..6fbf52c2 100644 --- a/pages/options/options.html +++ b/pages/options/options.html @@ -35,11 +35,11 @@
    -
    +
    This feature breaks websites. Do not leave it enabled, unless you are prepared to manually whitelist any affected domains.
    -
    +
    Disable
    @@ -128,13 +128,13 @@
    -
    +
    Open "Browser Console" ( CTRL + SHIFT + J ) to show missing resources
    @@ -145,28 +145,31 @@ + +
    -
    +
    If enabled, you wont receive any information about new features in LocalCDN. This includes information about new uBlock/uMatrix rules.
    - -
    - -
    +
    + +
    -
    -
    -

    -

    +
    +
    +

    +
    +
    +

    Last update:

    @@ -177,7 +180,7 @@
    - +
    - + Help Translate diff --git a/pages/options/options.js b/pages/options/options.js index 737f8979..20afd8d1 100644 --- a/pages/options/options.js +++ b/pages/options/options.js @@ -25,11 +25,18 @@ var options = {}; options._renderContents = function () { + let translationComplete = true; + document.body.setAttribute('dir', options._scriptDirection); - helpers.insertI18nContentIntoDocument(document); + translationComplete = helpers.insertI18nContentIntoDocument(document); options._determineOptionValues() .then(options._renderOptionsPanel); +// console.log(!translationComplete); + if (!translationComplete) { + options._renderLocaleNotice(); + } + }; options._renderOptionsPanel = function () { From 8d165695595441a945560d7bad08ef631d3ebf7d Mon Sep 17 00:00:00 2001 From: nobody42 <5514211-nobody42@users.noreply.gitlab.com> Date: Tue, 7 Apr 2020 16:51:11 +0200 Subject: [PATCH 8/9] Fixed typo in i18n --- _locales/de/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_locales/de/messages.json b/_locales/de/messages.json index 842be13b..f5f1d636 100644 --- a/_locales/de/messages.json +++ b/_locales/de/messages.json @@ -72,7 +72,7 @@ "description": "Generate rule set title." }, "generateRuleSetDescription": { - "message": "Falls du uBlock/uMatrix benutzt, kannst du dir hier die Regeln generieren lassen. Beachte, dass du diese manuell in uBlock/uMtrix eingefügt werden müssen.", + "message": "Falls du uBlock/uMatrix benutzt, kannst du dir hier die Regeln generieren lassen. Beachte, dass du diese manuell in uBlock/uMatrix eingefügt werden müssen.", "description": "In case you're using uBlock or uMatrix you can generate the rules here. You have to add these rules manually in uBlock or uMatrix." }, "lastUpdate": { From c25a05d71c181c89355634cae12949f1459d2c3f Mon Sep 17 00:00:00 2001 From: nobody42 <5514211-nobody42@users.noreply.gitlab.com> Date: Wed, 8 Apr 2020 06:46:48 +0200 Subject: [PATCH 9/9] Updated i18n and settings page --- pages/options/options.html | 3 +-- pages/updates/updates.html | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pages/options/options.html b/pages/options/options.html index 6fbf52c2..c98546dd 100644 --- a/pages/options/options.html +++ b/pages/options/options.html @@ -28,7 +28,6 @@
    -
    @@ -194,7 +193,7 @@ - + Help Translate diff --git a/pages/updates/updates.html b/pages/updates/updates.html index fae957f0..d93c7aad 100644 --- a/pages/updates/updates.html +++ b/pages/updates/updates.html @@ -26,6 +26,8 @@
  • Fixed #28 and #44
  • Fixed #49 (partly)
  • Fixed storage mechanism of lastMappingUpdate and added option to hide release notes
  • +
  • Updated: Translations
  • +
  • Fixed: Use default language if translation isn't available.
  • Please update your uBlock/uMatrix rules