From 2a23ae4b2504614f0871f70ace0fec3abdf86fc8 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Sat, 1 Feb 2020 13:48:56 +0000 Subject: [PATCH] Change ended show mark "[ ! ]" of view-show/"Change show" pull down because Chromium removed the CSS method. --- CHANGES.md | 7 ++++++- gui/slick/css/style.css | 3 --- gui/slick/js/livepanel.js | 19 +++++++++++++++++++ sickbeard/providers/newznab.py | 2 +- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ac80eb5..9a3d4ed 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,9 @@ -### 0.21.9 (2020-01-30 21:00:00 UTC) +### 0.21.11 (2020-01-31 00:00:00 UTC) + +* Change ended show mark "[ ! ]" of view-show/"Change show" pull down because Chromium removed the CSS method + + +### 0.21.10 (2020-01-30 21:00:00 UTC) * Fix init of custom newznab categories * Change improve clarity of custom newznab category selection with "+/-" and usage text diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index 4c97571..3d3afe3 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -1724,9 +1724,6 @@ body.back-art.avoid #livepanel #rate-art .icon-glyph:hover, font-weight:700; color:#888 } -#display-show.pro #pickShow .ended:before{ - content:"[ ! ] " -} #details-top{ height:70px diff --git a/gui/slick/js/livepanel.js b/gui/slick/js/livepanel.js index cee1f5b..45d7c09 100644 --- a/gui/slick/js/livepanel.js +++ b/gui/slick/js/livepanel.js @@ -288,6 +288,25 @@ $(document).ready(function() { : (isSet('pro') ? pTitle['viewmode1'] : pTitle['viewmode0']), refreshAll); + + // update pick show drop down + var reg = new RegExp(isSet('pro') ? '^(?!\\[\\s!\\s]).' : '^\\[\\s!\\s]'), + ended$ = $('#display-show').find('#pickShow').find('.ended') + .filter(function () { return reg.test(this.text);}); + if (ended$.length) { + var change; + if (isSet('pro')) { + change = function() { + this.prepend('[ ! ] '); + }; + } else { + reg = new RegExp('^\\[\\s!\\s]\\s'); + change = function() { + this.text = this.text.replace(reg, ''); + }; + } + ended$.each(change); + } } return result; } diff --git a/sickbeard/providers/newznab.py b/sickbeard/providers/newznab.py index 3f5cfc3..83650d3 100755 --- a/sickbeard/providers/newznab.py +++ b/sickbeard/providers/newznab.py @@ -1117,7 +1117,7 @@ class NewznabProvider(generic.NZBProvider): NewznabConstants.server_types.get(self.server_type, 'unknown'), ','.join(en[1] for en in ((self.enable_recentsearch, 'recent'), (self.enable_scheduled_backlog, 'backlog'), - (self.enable_scheduled_backlog, 'scheduled'))) or 'None') + (self.enable_scheduled_backlog, 'scheduled')) if en[0]) or 'None') def __repr__(self): return self.__str__()