Fix rendering VTX frames, fix setting cf to null when navigating away from a frame with fields

This commit is contained in:
Deon George 2022-12-05 22:36:03 +11:00
parent 717902d8e7
commit b3ef9e35e7
3 changed files with 6 additions and 3 deletions

View File

@ -110,7 +110,7 @@ function PageFrame() {
Object.defineProperty(this,'pageownerlogo', { Object.defineProperty(this,'pageownerlogo', {
get: function() { get: function() {
return base64_decode(pageOwner(this.frame).logoans); return base64_decode(this.settings.ext === 'tex' ? pageOwner(this.frame).logoans : pageOwner(this.frame).logovtx);
} }
}) })
} }

View File

@ -2,10 +2,10 @@ var FRAME_VIEWDATA = (1<<2);
var VIEWDATA_LEFT = ascii(0x08); var VIEWDATA_LEFT = ascii(0x08);
var VIEWDATA_RIGHT = ascii(0x09); var VIEWDATA_RIGHT = ascii(0x09);
var VIEWDATA_DOWN = ascii(0x0a); var VIEWDATA_DOWN = ascii(0x0a); // \n
var VIEWDATA_UP = ascii(0x0b); var VIEWDATA_UP = ascii(0x0b);
var VIEWDATA_CLS = ascii(0x0c); var VIEWDATA_CLS = ascii(0x0c);
var VIEWDATA_CR = ascii(0x0d); var VIEWDATA_CR = ascii(0x0d); // \r
var VIEWDATA_CON = ascii(0x11); var VIEWDATA_CON = ascii(0x11);
var VIEWDATA_COFF = ascii(0x14); var VIEWDATA_COFF = ascii(0x14);
var VIEWDATA_HOME = ascii(0x1e); var VIEWDATA_HOME = ascii(0x1e);

View File

@ -1048,6 +1048,9 @@ while(bbs.online) {
// Load frame // Load frame
case ACTION_RELOAD: case ACTION_RELOAD:
// Clear our current field
cf = null;
log(LOG_DEBUG,'- ACTION_RELOAD: ['+(next_page ? pageStr(next_page) : '')+']'); log(LOG_DEBUG,'- ACTION_RELOAD: ['+(next_page ? pageStr(next_page) : '')+']');
console.line_counter = 0; // @todo fix to suppress a pause that is occurring before clear() console.line_counter = 0; // @todo fix to suppress a pause that is occurring before clear()