Change Frame() to TextFrame() to avoid clash with SBBS's Frame()
This commit is contained in:
@@ -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
24
load/edit.js
@@ -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 '';
|
||||
}
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user