bbs/sbbs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change Frame() to TextFrame() to avoid clash with SBBS's Frame()

Browse Source
This commit is contained in:
Deon George 2020-07-17 22:05:33 +10:00
parent 0aab42f51b
commit bfa0853d75
6 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
load/defs.js
View File

@ -87,6 +87,8 @@ function TexFrame() {
// Dont show the page number on system login page
if (user.number || (this.type != FRAME_TYPE_LOGIN && NO_HISTORY_FRAMES.indexOf(this.page) == -1)) {
log(LOG_DEBUG,'- Owner: ['+JSON.stringify(owner)+']');
header = '\1n'+owner+' '.repeat(FRAME_HEADER-console.strlen(owner))+'\1n '+
'\1W\1H'+this.page+' '.repeat(FRAME_PAGENUM-this.page.length)+' '+
'\1G\1H'+' '.repeat(FRAME_COST-this.cost.toString().length)+this.cost+FRAME_COSTUNIT+

24
load/edit.js
View File

@ -1,4 +1,5 @@
load("ansiedit.js");
load('ansiedit.js');
load('frame.js');
load('tree.js');
load('scrollbar.js');
@ -47,7 +48,7 @@ function edit(fo) {
frame.putmsg(header);
frame.open();
var ansiEdit = new ANSIEdit({
var editor = new ANSIEdit({
x: 1,
y: 2,
width: 80,
@ -58,10 +59,10 @@ function edit(fo) {
parentFrame: frame,
});
ansiEdit.open();
ansiEdit.menu.addItem('Save', _save);
ansiEdit.menu.addItem('Exit', on_exit);
ansiEdit.menu.addItem('Save & Exit', save_and_exit);
editor.open();
editor.menu.addItem('Save', _save);
editor.menu.addItem('Exit', on_exit);
editor.menu.addItem('Save & Exit', save_and_exit);
x = new Graphic;
x.ANSI = fo.content;
@ -71,7 +72,7 @@ function edit(fo) {
var o = 0; // offset into 'bin'
for (var yy = 0; yy < 22; yy++) {
for (var xx = 0; xx < 80; xx++) {
ansiEdit.putChar({
editor.putChar({
x : xx,
y : yy,
ch : bin.substr(o, 1),
@ -81,23 +82,24 @@ function edit(fo) {
}
}
ansiEdit.cycle();
editor.cycle();
frame.cycle();
this.handle=function(read) {
if (! js.terminated && ascii(read) != 27) {
ansiEdit.getcmd(read);
ansiEdit.cycle();
editor.getcmd(read);
editor.cycle();
frame.cycle();
return '';
}
ansiEdit.close();
editor.close();
frame.close();
complete = true;
console.clear(LIGHTGRAY);
fo.content = editor.exportAnsi().join('');
console.putmsg(fo.render());
return '';
}

2
load/register.js
View File

@ -67,7 +67,7 @@ function register() {
var user = fo.fieldValue('UID');
var name = fo.fieldValue('FULLNAME');
log(LOG_DEBUG,'- VALIDATE EMAIL TO ('+system.matchuserdata(U_NETMAIL,email)+')');
log(LOG_DEBUG,'- VALIDATE EMAIL TO ('+JSON.stringify(system.matchuserdata(U_NETMAIL,email))+')');
// Validate Email hasnt been used
// Validate USER_ID hasnt been used

4
save.js
View File

@ -18,12 +18,12 @@ i = getArg('-i','No index specified with -i',true);
// File to convert
file = getArg('-f','No file specified with -f',false);
frame = new Frame();
frame = new TexFrame();
frame.load(pageStr({frame: p,index: i}));
if (! send || ! frame || file) {
if (frame.page == null) {
frame = new Frame();
frame = new TexFrame();
frame.frame = p;
frame.index = i;
}

2
text/11a.tex
View File

@ -1 +1 @@
{"version":1,"frame":11,"index":"a","owner":"AWgBUkEBR04BQlMBWUkBbgE3AWt0ZXgBbg==","cost":0,"content":"G1swbRtbMW3fG1swbdsbWzE7MzBt3xtbMG3fG1sxbdsbWzBtICDfICAgIBtbMTszMG3fG1swbdsgICAgICAgIBtbMW3bG1swbdwgIBtbMW3bG1swbSAgICAgICAg2yAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAbWzFtXxtbMG0NChtbMW0gG1swbdsbWzE7MzBt3BtbMG3cICAbWzFt3xtbMG3bICAg3BtbMTszMG3cG1swbdsgIBtbMW3cG1swbd8bWzE7MzBt3xtbMG3fG1sxbdwbWzBtIBtbMW3bG1swbSAbWzE7MzBt3xtbMG3cG1sxbdsbWzBtIBtbMW3cG1swbd8bWzE7MzBt3xtbMG3fG1sxbdwbWzBtIBtbMW3fG1swbdsbWzE7MzBt3xtbMG3fICAgICAgICAgICAgICAgICAgICAgICAgICAgIBtbMW0vICBcG1swbQ0KG1sxbSAbWzBt2xtbMTszMG0gICAgIBtbMG3bICAbWzFt2xtbMG0gINsgIBtbMW3bG1swbSAgIBtbMW3bG1swbSAbWzFt2xtbMG0gICAbWzFt2xtbMG0gG1sxbdsbWzBt3xtbMTszMG3fG1swbd8bWzFt3xtbMG0gINsbWzE7MzBtIBtbMG3cIBtbMW13b3JrcxtbMG0uICAgICAgICAgICAgICAgICAgICAbWzFtL3xvbyBcG1swbQ0KG1sxbd8bWzBt3xtbMTszMG3fG1swbSAgIBtbMW3fG1swbd8bWzE7MzBt3xtbMG0gIN8bWzE7MzBt3xtbMG0gG1sxbd8bWzBtICDfG1sxOzMwbd8bWzBt3yAgG1sxbd8bWzBtICAgG1sxbd8bWzBtICDfG1sxOzMwbd8bWzBt3yAgICAbWzE7MzBt3xtbMG0gICAgICAgICAgICAgICAgICAgICAgICAgICAbWzFtKF98ICAvXykbWzBtDQobWzMxbUZUTjogG1sxbUZpZG8gVGVjaG5vbG9neSBOZXR3b3JrcxtbMG0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAbWzMxbV8bWzE7MzdtYEAvG1swOzMxbV8bWzM3bSAbWzFtXCAgICBfG1swbQ0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIBtbMzFtfCAgICAgfBtbMzdtIBtbMW1cICAgXFwbWzBtDQogG1szMm0xG1sxbSAbWzM3bVByaXZhdGVOZXQgKEludGVybmFsIFRlc3QgTmV0d29yaykbWzBtIBtbMzJtKjEwMDEwIxtbMzdtICAgICAgICAgICAgICAgICAgIBtbMzFtfCAbWzE7MzBtKCopG1swbSAbWzMxbXwbWzM3bSAgG1sxbVwbWzBtICAgG1sxbSkpG1swbQ0KIBtbMTszMm0yIBtbMzdtZnN4TmV0IChGdW4gU2ltcGxlIEV4cGVyaW1lbnRhbCBOZXR3b3JrKRtbMG0gG1sxOzMybSoxMDAyMSMbWzBtICAgIBtbMTszMG1fX19fX18gICAbWzA7MzFtfF9fG1sxOzMwbVUbWzA7MzFtX198G1szN20gG1sxbS8gIFwvLxtbMG0NCiAbWzMybTMbWzE7MzdtIERPVkVuZXQbWzMybSAbWzA7MzJtKjEwNzIzIxtbMzdtICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgG1sxOzMwbS8gG1swbUZJRE8gG1sxOzMwbVwbWzBtICAgG1sxbV8vL3x8IF9cICAgLxtbMG0NCiAbWzMybTQbWzFtIBtbMzdtdHF3TmV0IChUaGUgUXVhbnRvbSBXb3Jtd2hvbGUpG1swbSAbWzMybSoxMTMzNyMbWzM3bSAgICAgICAgICAgIBtbMTszMG0oX19fX19fX18pG1swbSAbWzFtKF8vKF98KF9fX18vG1swbQ0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChqbSkNCiAbWzE7MzBtT3RoZXIgbmV0d29ya3Mgd2lsbCBiZSBhZGRlZCBpbiB0aW1lLi4uG1swbQ0K","isPublic":false,"isAccessible":true,"type":"i","key":[1,10010,10021,10723,11337,null,null,null,null,null],"frame_fields":[],"date":"2020-07-08T05:24:57.759Z"}
{"version":1,"frame":11,"index":"a","owner":"AWgBUkEBR04BQlMBWUkBbgE3AWt0ZXgBbg==","cost":0,"content":"G1swbRtbMW3fG1swbdsbWzE7MzBt3xtbMG3fG1sxbdsbWzBtICDfICAgIBtbMTszMG3fG1swbdsgICAgICAgIBtbMW3bG1swbdwgIBtbMW3bG1swbSAgICAgICAg2yAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAbWzFtXxtbMG0NChtbMW0gG1swbdsbWzE7MzBt3BtbMG3cICAbWzFt3xtbMG3bICAg3BtbMTszMG3cG1swbdsgIBtbMW3cG1swbd8bWzE7MzBt3xtbMG3fG1sxbdwbWzBtIBtbMW3bG1swbSAbWzE7MzBt3xtbMG3cG1sxbdsbWzBtIBtbMW3cG1swbd8bWzE7MzBt3xtbMG3fG1sxbdwbWzBtIBtbMW3fG1swbdsbWzE7MzBt3xtbMG3fICAgICAgICAgICAgICAgICAgICAgICAgICAgIBtbMW0vICBcG1swbQ0KG1sxbSAbWzBt2xtbMTszMG0gICAgIBtbMG3bICAbWzFt2xtbMG0gINsgIBtbMW3bG1swbSAgIBtbMW3bG1swbSAbWzFt2xtbMG0gICAbWzFt2xtbMG0gG1sxbdsbWzBt3xtbMTszMG3fG1swbd8bWzFt3xtbMG0gINsbWzE7MzBtIBtbMG3cIBtbMW13b3JrcxtbMG0uICAgICAgICAgICAgICAgICAgICAbWzFtL3xvbyBcG1swbQ0KG1sxbd8bWzBt3xtbMTszMG3fG1swbSAgIBtbMW3fG1swbd8bWzE7MzBt3xtbMG0gIN8bWzE7MzBt3xtbMG0gG1sxbd8bWzBtICDfG1sxOzMwbd8bWzBt3yAgG1sxbd8bWzBtICAgG1sxbd8bWzBtICDfG1sxOzMwbd8bWzBt3yAgICAbWzE7MzBt3xtbMG0gICAgICAgICAgICAgICAgICAgICAgICAgICAbWzFtKF98ICAvXykbWzBtDQobWzMxbUZUTjogG1sxbUZpZG8gVGVjaG5vbG9neSBOZXR3b3JrcxtbMG0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAbWzMxbV8bWzE7MzdtYEAvG1swOzMxbV8bWzM3bSAbWzFtXCAgICBfG1swbQ0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIBtbMzFtfCAgICAgfBtbMzdtIBtbMW1cICAgXFwbWzBtDQogICAbWzFtUHJpdmF0ZU5ldCAoSW50ZXJuYWwgVGVzdCBOZXR3b3JrKRtbMG0gG1szMm0qMTAwMTAjG1szN20gICAgICAgICAgICAgICAgICAgG1szMW18IBtbMTszMG0oKikbWzBtIBtbMzFtfBtbMzdtICAbWzFtXBtbMG0gICAbWzFtKSkbWzBtDQogG1sxOzMybTIgG1szN21mc3hOZXQgKEZ1biBTaW1wbGUgRXhwZXJpbWVudGFsIE5ldHdvcmspG1swbSAbWzE7MzJtKjEwMDIxIxtbMG0gICAgG1sxOzMwbV9fX19fXyAgIBtbMDszMW18X18bWzE7MzBtVRtbMDszMW1fX3wbWzM3bSAbWzFtLyAgXC8vG1swbQ0KIBtbMTszMm0zIBtbMzdtU3BvcnROZXQgG1szMm0qMTAwMjQjG1swbSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgG1sxOzMwbS8gG1swbUZJRE8gG1sxOzMwbVwbWzBtICAgG1sxbV8vL3x8IF9cICAgLxtbMG0NCiAgIBtbMW1ET1ZFbmV0G1szMm0gG1swOzMybSoxMDcyMyMbWzM3bSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgG1sxOzMwbShfX19fX19fXykbWzBtIBtbMW0oXy8oX3woX19fXy8bWzBtDQogICAbWzFtdHF3TmV0IChUaGUgUXVhbnRvbSBXb3Jtd2hvbGUpG1swbSAbWzMybSoxMTMzNyMbWzM3bSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGptKQ0KDQogG1sxOzMwbU90aGVyIG5ldHdvcmtzIHdpbGwgYmUgYWRkZWQgaW4gdGltZS4uLhtbMG0NCg==","isPublic":true,"isAccessible":true,"type":"i","key":[1,10010,10021,10024,10723,11337,null,null,null,null],"frame_fields":[],"date":"2020-07-16T12:29:55.383Z"}

2
text/99a.tex
View File

@ -1 +1 @@
{"version":1,"frame":99,"index":"a","owner":"AWgBUkEBR04BQlMBWUkBbgE3AWt0ZXgBbg==","cost":0,"content":"G1swbRtbMTszMG3ExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMQbWzBtICAgICAgICAgG1sxbdq/G1swbQ0KIBtbMTszMW3c3MTcG1szN20gG1szMm3c3MTcG1szN20gG1szNG3c3MTcG1szN20gG1szM23c3BtbMG0gG1szMDs0N20g3NwgICDc3MTcINzcINwgG1szNzs0MG0gICAbWzFtwr/av9q/2rTDv7/awr8bWzBtICAgICAgICAgICAgG1sxOzMwbUBEQVRFVElNRXxMMTVAG1swbQ0KIBtbMTszMW3c3MSxG1szN20gG1szMm2ysRtbMzdtIBtbMzJtsRtbMzdtIBtbMzRt39/E3BtbMzdtIBtbMzNt3NwbWzBtIBtbMzA7NDdtILKxxCAgsrHE3yDf38LfIBtbMzc7NDBtICAgs7Ozs7Ozs7Ozs7Ozw9kgICAgICAgICAgICAgICAgICAgG1sxOzMwbUBUSU1FfEw4QBtbMG0NCiAbWzE7MzFtsbAbWzBtIBtbMTszMW2wG1swbSAbWzE7MzJtsbAbWzBtIBtbMTszMm2wG1swbSAbWzE7MzRtsbAbWzBtIBtbMTszNG2wG1swbSAbWzE7MzNtsbAbWzBtIBtbMzA7NDdtILGwILAgsbAgsCCxsCCwIBtbMzc7NDBtICAgG1sxOzMwbcG0wNnA2cDZwNnAtMHZG1swbQ0KIBtbMTszMW3f38TfG1swbSAbWzE7MzJt398bWzBtIBtbMTszMm3fG1swbSAbWzE7MzRt39/E3xtbMG0gG1sxOzMzbd/fG1swbSAbWzMwOzQ3bSDf38TfIN/fxN8g398g3yAbWzM3OzQwbSAgIBtbMTszMG3E2RtbMzFtICAgICAgICAbWzMwbcTZG1swbQ0KG1sxOzMwbcTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExBtbMG0gICAgICAgICAgIBtbMTs1OzMybSowIxtbMDsxbSB0byBnZXQgYmFjayB0byB0aGUgTWFpbiBNZW51G1swbQ0KDQoNCiAgVGhhbmtzIGZvciB2aXNpdGluZyAbWzE7MzFtQRtbMzJtThtbMzRtUxtbMzNtSRtbMDszMDs0N210ZXgbWzM3OzQwbSAbWzFtQE1FTU8yLUwyMEAbWzBtDQogIFlvdSB3ZXJlIG9uIG5vZGUgG1sxbUBOT0RFLVoyQCAbWzBtb2YgG1sxbUBCQlMtTDEwQBtbMG0NCiAgd2l0aCAbWzFtQFNUQVRTLkxUT0RBWS1aMkAbWzBtIG90aGVycy4NCg0KICBZb3UgaGF2ZSAbWzFtQEJZVEVTTEVGVEAbWzBtIGNyZWRpdHMgbGVmdCBhbmQgG1sxbUBNQUlMV0AgG1swbW1lc3NhZ2VzIGluIHlvdXIgbWFpbGJveC4NCiAgVG9kYXkgeW91J3ZlIGJlZW4gb24gZm9yIBtbMW1AU1RBVFMuVFRPREFZLVoyQBtbMG0gbWludXRlcy4NCg0KICAbWzFtUHJlc3MbWzBtIBtbMTs1OzMybSMbWzA7MTszM20gG1szN210byBkaXNjb25uZWN0LhtbMG0NCg==","isPublic":true,"isAccessible":true,"type":"i","key":[1,null,null,null,null,null,null,null,null,null],"frame_fields":[],"date":"2020-07-08T01:38:40.536Z"}
{"version":1,"frame":99,"index":"a","owner":"AWgBUkEBR04BQlMBWUkBbgE3AWt0ZXgBbg==","cost":0,"content":"G1swbRtbMTszMG3ExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMQbWzBtICAgICAgICAgG1sxbdq/G1swbQ0KIBtbMTszMW3c3MTcG1szN20gG1szMm3c3MTcG1szN20gG1szNG3c3MTcG1szN20gG1szM23c3BtbMG0gG1szMDs0N20g3NwgICDc3MTcINzcINwgG1szNzs0MG0gICAbWzFtwr/av9q/2rTDv7/awr8bWzBtICAgICAgICAgICAgG1sxOzMwbUBEQVRFVElNRXxMMTVAG1swbQ0KIBtbMTszMW3c3MSxG1szN20gG1szMm2ysRtbMzdtIBtbMzJtsRtbMzdtIBtbMzRt39/E3BtbMzdtIBtbMzNt3NwbWzBtIBtbMzA7NDdtILKxxCAgsrHE3yDf38LfIBtbMzc7NDBtICAgs7Ozs7Ozs7Ozs7Ozw9kgICAgICAgICAgICAgICAgICAgG1sxOzMwbUBUSU1FfEw4QBtbMG0NCiAbWzE7MzFtsbAbWzBtIBtbMTszMW2wG1swbSAbWzE7MzJtsbAbWzBtIBtbMTszMm2wG1swbSAbWzE7MzRtsbAbWzBtIBtbMTszNG2wG1swbSAbWzE7MzNtsbAbWzBtIBtbMzA7NDdtILGwILAgsbAgsCCxsCCwIBtbMzc7NDBtICAgG1sxOzMwbcG0wNnA2cDZwNnAtMHZG1swbQ0KIBtbMTszMW3f38TfG1swbSAbWzE7MzJt398bWzBtIBtbMTszMm3fG1swbSAbWzE7MzRt39/E3xtbMG0gG1sxOzMzbd/fG1swbSAbWzMwOzQ3bSDf38TfIN/fxN8g398g3yAbWzM3OzQwbSAgIBtbMTszMG3E2RtbMzFtICAgICAgICAbWzMwbcTZG1swbQ0KG1sxOzMwbcTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExBtbMG0gICAgICAgICAgIBtbMTs1OzMybSowIxtbMDsxbSB0byBnZXQgYmFjayB0byB0aGUgTWFpbiBNZW51G1swbQ0KDQogIFRoYW5rcyBmb3IgdmlzaXRpbmcgG1sxOzMxbUEbWzMybU4bWzM0bVMbWzMzbUkbWzA7MzA7NDdtdGV4G1szNzs0MG0gG1sxbUBNRU1PMi1MMjBAG1swbQ0KICBZb3Ugd2VyZSBvbiBub2RlIBtbMW1ATk9ERS1aMkAgG1swbW9mIBtbMW1AQkJTLUwxMEAbWzBtDQogIHdpdGggG1sxbUBTVEFUUy5MVE9EQVktWjJAG1swbSBvdGhlcnMuDQoNCiAgWW91IGhhdmUgG1sxbUBCWVRFU0xFRlRAG1swbSBjcmVkaXRzIGxlZnQgYW5kIBtbMW1ATUFJTFdAIBtbMG1tZXNzYWdlcyBpbiB5b3VyIG1haWxib3guDQogIFRvZGF5IHlvdSd2ZSBiZWVuIG9uIGZvciAbWzFtQFNUQVRTLlRUT0RBWS1aMkAbWzBtIG1pbnV0ZXMuDQoNCiAgG1sxbVByZXNzG1swbSAbWzE7NTszMm0jG1swOzE7MzNtIBtbMzdtdG8gZGlzY29ubmVjdC4bWzBtDQo=","isPublic":true,"isAccessible":true,"type":"i","key":[1,null,null,null,null,null,null,null,null,null],"frame_fields":[],"date":"2020-07-15T12:15:47.742Z"}