From 5d3d6423ed06fc9172f5c626819c7a9277de893b Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Tue, 19 Jan 2021 22:04:33 +0100 Subject: [PATCH] fix ysf images; remove obsolete code --- htdocs/css/openwebrx.css | 3 ++- htdocs/lib/MetaPanel.js | 26 ++------------------------ 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css index a232c62..a2da8fe 100644 --- a/htdocs/css/openwebrx.css +++ b/htdocs/css/openwebrx.css @@ -979,7 +979,8 @@ img.openwebrx-mirror-img background-repeat: no-repeat; } -.openwebrx-meta-slot.active .openwebrx-meta-user-image { +.openwebrx-meta-slot.active.direct .openwebrx-meta-user-image, +#openwebrx-panel-metadata-ysf .openwebrx-meta-slot.active .openwebrx-meta-user-image { background-image: url("../gfx/openwebrx-directcall.png"); } diff --git a/htdocs/lib/MetaPanel.js b/htdocs/lib/MetaPanel.js index 6ee9a8d..a0a745a 100644 --- a/htdocs/lib/MetaPanel.js +++ b/htdocs/lib/MetaPanel.js @@ -45,6 +45,8 @@ DmrMetaSlot.prototype.setName = function(name) { }; DmrMetaSlot.prototype.setMode = function(mode) { + if (this.mode === mode) return; + this.mode = mode; var classes = ['group', 'direct'].filter(function(c){ return c !== mode; }); @@ -57,30 +59,6 @@ DmrMetaSlot.prototype.setTarget = function(target) { this.el.find('.openwebrx-dmr-target').text(target || ''); } -DmrMetaSlot.prototype.setTalkgroup = function(talkgroup) { - if (this.talkgroup === talkgroup && this.targetMode === 'talkgroup') return; - this.talkgroup = talkgroup; - this.targetMode = 'talkgroup'; - var text = ''; - if (talkgroup && talkgroup != '') { - text = 'Talkgroup: ' + talkgroup; - } - this.el.find('.openwebrx-dmr-target').text(text); - this.el.find(".openwebrx-meta-user-image").addClass("group"); -}; - -DmrMetaSlot.prototype.setDirect = function(call) { - if (this.call === call && this.targetMode === 'direct') return; - this.call = call; - this.targetMode = 'direct'; - var text = ''; - if (call && call != '') { - text = 'Direct: ' + call; - } - this.el.find('.openwebrx-dmr-target').text(text); - this.el.find(".openwebrx-meta-user-image").removeClass("group"); -}; - DmrMetaSlot.prototype.clear = function() { this.setId(); this.setName();