From a52bda670da067da76bf1030c4557f6a66620b9f Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Sun, 26 Jul 2020 09:34:45 +1000
Subject: [PATCH] Minor changes to edit

---
 load/edit.js | 60 +++++++++++++++++++++++-----------------------------
 1 file changed, 27 insertions(+), 33 deletions(-)

diff --git a/load/edit.js b/load/edit.js
index 61188c8..f0f08ea 100644
--- a/load/edit.js
+++ b/load/edit.js
@@ -6,13 +6,6 @@ load('scrollbar.js');
 load('event-timer.js');
 load('graphic.js');
 
-const sauce_lib = load({}, 'sauce_lib.js');
-if (bbs.mods.avatar_lib) {
-	avatar_lib = bbs.mods.avatar_lib;
-} else {
-	avatar_lib = load({}, 'avatar_lib.js');
-}
-
 var CONTROL_EDIT		= '1';
 
 function edit(fo) {
@@ -31,17 +24,12 @@ function edit(fo) {
 		}
 	});
 
-	const frames = {
-		parent : null,
-		container : null,
-		highlight : null,
-		scrollbar : null
-	};
-
 	log(LOG_DEBUG,'  - Owner: '+JSON.stringify(fo.owner));
+
 	const frame = new Frame(1,1,console.screen_columns,console.screen_rows,BG_BLACK|LIGHTGRAY);
 	frame.gotoxy(1,1);
-	header = '\1n'+fo.owner+' '.repeat(FRAME_HEADER-console.strlen(fo.owner))+'\1n '+
+
+	header = '\1n'+fo.pageownerlogo+' '.repeat(FRAME_HEADER-console.strlen(fo.pageownerlogo))+'\1n '+
 		'\1W\1H'+fo.page+' '.repeat(FRAME_PAGENUM-fo.page.length)+' '+
 		'\1G\1H'+'     Edit';
 	frame.putmsg(header);
@@ -59,13 +47,13 @@ function edit(fo) {
 	});
 
 	editor.open();
-	editor.menu.addItem('Save', _save);
-	editor.menu.addItem('Exit', on_exit);
-	editor.menu.addItem('Save & Exit', save_and_exit);
+	editor.menu.addItem('Properties',properties);
+	editor.menu.addItem('Exit',onexit);
+	editor.menu.addItem('Save & Exit',saveexit);
 
-	x = new Graphic;
-	x.ANSI = base64_decode(fo.content);
-	log(LOG_DEBUG,JSON.stringify(x));
+	var x = new Graphic;
+	x.ANSI = fo.parse(base64_decode(fo.content));
+	log(LOG_DEBUG,'  - Fields: '+JSON.stringify(fo.frame_fields));
 
 	const bin = x.BIN;
 	var o = 0; // offset into 'bin'
@@ -91,33 +79,39 @@ function edit(fo) {
 			editor.cycle();
 			frame.cycle();
 
+			if (! complete)
+				return '';
+
+		// Ignore esc
+		} else if (ascii(read) == 27) {
 			return '';
 		}
 
 		editor.close();
 		frame.close();
-		complete = true;
+
 		console.clear(LIGHTGRAY);
-		fo.content = base64_encode(editor.exportAnsi().join(''));
-		fo.save();
 		console.putmsg(fo.render());
+
 		return '';
 	}
 
-	function _save() {
-		log(LOG_DEBUG, '+ FrameEdit save()');
+	function properties() {
+		log(LOG_DEBUG, '+ FrameEdit properties()');
 	}
 
-	function on_exit() {
-		log(LOG_DEBUG, '+ FrameEdit on_exit()');
+	function save() {
+		fo.content = base64_encode(editor.exportAnsi().join(''));
+		fo.save();
+	}
+
+	function onexit() {
 		complete = true;
-		console.clear(LIGHTGRAY);
-		console.putmsg(fo.render());
 	}
 
-	function save_and_exit() {
-		_save();
-		on_exit();
+	function saveexit() {
+		save();
+		onexit();
 	}
 }