diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index 85feee0f..9814fe24 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -166,7 +166,7 @@ DemodulatorPanel.prototype.updatePanels = function() {
toggle_panel("openwebrx-panel-js8-message", modulation == "js8");
toggle_panel("openwebrx-panel-packet-message", ["packet", "ais"].indexOf(modulation) >= 0);
toggle_panel("openwebrx-panel-pocsag-message", modulation === "pocsag");
- toggle_panel("openwebrx-panel-flex-message", modulation === "flex");
+ toggle_panel("openwebrx-panel-page-message", modulation === "page");
toggle_panel("openwebrx-panel-sstv-message", modulation === "sstv");
toggle_panel("openwebrx-panel-fax-message", modulation === "fax");
diff --git a/htdocs/lib/MessagePanel.js b/htdocs/lib/MessagePanel.js
index 04aac284..5ca2e2dd 100644
--- a/htdocs/lib/MessagePanel.js
+++ b/htdocs/lib/MessagePanel.js
@@ -270,29 +270,30 @@ $.fn.pocsagMessagePanel = function() {
return this.data('panel');
};
-FlexMessagePanel = function(el) {
+PageMessagePanel = function(el) {
MessagePanel.call(this, el);
this.initClearTimer();
+ this.modes = ['FLEX', 'POCSAG'];
}
-FlexMessagePanel.prototype = new MessagePanel();
+PageMessagePanel.prototype = new MessagePanel();
-FlexMessagePanel.prototype.supportsMessage = function(message) {
- return message['mode'] === 'FLEX';
+PageMessagePanel.prototype.supportsMessage = function(message) {
+ return this.modes.indexOf(message['mode']) >= 0;
};
-FlexMessagePanel.prototype.render = function() {
+PageMessagePanel.prototype.render = function() {
$(this.el).append($(
'
' +
'' +
- '| FLEX | ' +
+ 'Paging | ' +
'
' +
'' +
'
'
));
};
-FlexMessagePanel.prototype.pushMessage = function(msg) {
+PageMessagePanel.prototype.pushMessage = function(msg) {
var html_escape = function(input) {
return $('
').text(input).html()
};
@@ -300,14 +301,15 @@ FlexMessagePanel.prototype.pushMessage = function(msg) {
var $b = $(this.el).find('tbody');
$b.append($(
'
' +
- '| ' + msg.capcode + ' | ' +
+ '' + msg.address + ' | ' +
+ '' + msg.mode + msg.baud + ' | ' +
'' + msg.timestamp + ' | ' +
'
'
));
if (msg.hasOwnProperty('message')) {
$b.append($(
- '
| ' +
+ ' |
| ' +
html_escape(msg.message) +
' |
'
));
@@ -315,9 +317,9 @@ FlexMessagePanel.prototype.pushMessage = function(msg) {
$b.scrollTop($b[0].scrollHeight);
};
-$.fn.flexMessagePanel = function() {
+$.fn.pageMessagePanel = function() {
if (!this.data('panel')) {
- this.data('panel', new FlexMessagePanel(this));
+ this.data('panel', new PageMessagePanel(this));
}
return this.data('panel');
};
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index b55aca09..3246d4f7 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1169,7 +1169,7 @@ function on_ws_recv(evt) {
$("#openwebrx-panel-wsjt-message").wsjtMessagePanel(),
$('#openwebrx-panel-packet-message').packetMessagePanel(),
$('#openwebrx-panel-pocsag-message').pocsagMessagePanel(),
- $('#openwebrx-panel-flex-message').flexMessagePanel(),
+ $('#openwebrx-panel-page-message').pageMessagePanel(),
$('#openwebrx-panel-sstv-message').sstvMessagePanel(),
$('#openwebrx-panel-fax-message').faxMessagePanel(),
$("#openwebrx-panel-js8-message").js8()
@@ -1844,7 +1844,7 @@ function secondary_demod_init() {
$('#openwebrx-panel-wsjt-message').wsjtMessagePanel();
$('#openwebrx-panel-packet-message').packetMessagePanel();
$('#openwebrx-panel-pocsag-message').pocsagMessagePanel();
- $('#openwebrx-panel-flex-message').flexMessagePanel();
+ $('#openwebrx-panel-page-message').pageMessagePanel();
$('#openwebrx-panel-sstv-message').sstvMessagePanel();
$('#openwebrx-panel-fax-message').faxMessagePanel();
$('#openwebrx-panel-js8-message').js8();