From 5fb1ecb53e798617fca40b8aa1162ba7ea873860 Mon Sep 17 00:00:00 2001
From: Michael Long <mlong@bizjournals.com>
Date: Mon, 4 Jan 2021 11:41:53 -0500
Subject: [PATCH] fix ftelnet size
---
webv4/pages/000-home.xjs | 50 ++++++++++++++++--------------
webv4/pages/003-games.xjs | 48 ++++++++++++++--------------
webv4/pages/099-xtrnmenu-games.xjs | 48 ++++++++++++++--------------
3 files changed, 76 insertions(+), 70 deletions(-)
diff --git a/webv4/pages/000-home.xjs b/webv4/pages/000-home.xjs
index 32b5353df8..53b5280a04 100644
--- a/webv4/pages/000-home.xjs
+++ b/webv4/pages/000-home.xjs
@@ -20,30 +20,32 @@
<script id="fTelnetScript" src="<?xjs write(get_url()); ?>"></script>
<script>
- var wsp = <?xjs write(settings.wsp || GetWebSocketServicePort()); ?>;
- var wssp = <?xjs write(settings.wssp || GetWebSocketServicePort(true)); ?>;
- var Options = new fTelnetOptions();
- Options.BareLFtoCRLF = false;
- Options.BitsPerSecond = 57600;
- Options.ButtonBarVisible = true;
- Options.ConnectionType = 'telnet';
- Options.Emulation = 'ansi-bbs';
- Options.Enter = '\r';
- Options.Font = 'CP437';
- Options.ForceWss = false;
- Options.Hostname = '<?xjs write(http_request.vhost); ?>';
- Options.LocalEcho = false;
- Options.Port = location.protocol == 'https:' ? wssp : wsp;
- Options.ScreenColumns = 80;
- Options.ScreenRows = 25;
- Options.SplashScreen = '<?xjs write(get_splash()); ?>';
- var fTelnet = new fTelnetClient('fTelnetContainer', Options);
- fTelnet.ButtonBarVisible = true;
- if ($('#ftelnet-connect').length) {
- $('#ftelnet-connect').click(function() {
- fTelnet.Connect();
- });
- }
+ window.addEventListener('load', (event) => {
+ var wsp = <?xjs write(settings.wsp || GetWebSocketServicePort()); ?>;
+ var wssp = <?xjs write(settings.wssp || GetWebSocketServicePort(true)); ?>;
+ var Options = new fTelnetOptions();
+ Options.BareLFtoCRLF = false;
+ Options.BitsPerSecond = 57600;
+ Options.ButtonBarVisible = true;
+ Options.ConnectionType = 'telnet';
+ Options.Emulation = 'ansi-bbs';
+ Options.Enter = '\r';
+ Options.Font = 'CP437';
+ Options.ForceWss = false;
+ Options.Hostname = '<?xjs write(http_request.vhost); ?>';
+ Options.LocalEcho = false;
+ Options.Port = location.protocol == 'https:' ? wssp : wsp;
+ Options.ScreenColumns = 80;
+ Options.ScreenRows = 25;
+ Options.SplashScreen = '<?xjs write(get_splash()); ?>';
+ var fTelnet = new fTelnetClient('fTelnetContainer', Options);
+ fTelnet.ButtonBarVisible = true;
+ if ($('#ftelnet-connect').length) {
+ $('#ftelnet-connect').click(function() {
+ fTelnet.Connect();
+ });
+ }
+ });
</script>
<?xjs } ?>
diff --git a/webv4/pages/003-games.xjs b/webv4/pages/003-games.xjs
index 7b7604d8bb..3ba487f995 100644
--- a/webv4/pages/003-games.xjs
+++ b/webv4/pages/003-games.xjs
@@ -43,29 +43,31 @@
<script id="fTelnetScript" src="<?xjs write(get_url()); ?>"></script>
<script type="text/javascript">
- var wsp = <?xjs write(settings.wsp || GetWebSocketServicePort()); ?>;
- var wssp = <?xjs write(settings.wssp || GetWebSocketServicePort(true)); ?>;
- var Options = new fTelnetOptions();
- Options.BareLFtoCRLF = false;
- Options.BitsPerSecond = 57600;
- Options.ConnectionType = 'rlogin';
- Options.Emulation = 'ansi-bbs';
- Options.Enter = '\r';
- Options.Font = 'CP437';
- Options.ForceWss = false;
- Options.Hostname = '<?xjs write(http_request.vhost); ?>';
- Options.LocalEcho = false;
- Options.Port = location.protocol == 'https:' ? wssp : wsp;
- Options.RLoginClientUsername = '<?xjs write(user.security.password); ?>';
- Options.RLoginServerUsername = '<?xjs write(user.alias); ?>';
- Options.ScreenColumns = 80;
- Options.ScreenRows = 25;
- Options.SplashScreen = Options.SplashScreen = '<?xjs write(get_splash()); ?>';
- Options.WebSocketUrlPath = '?Port=<?xjs write(GetRLoginPort()); ?>';
- var fTelnet = new fTelnetClient('fTelnetContainer', Options);
- fTelnet.OnConnectionClose = function () {
- window.location.reload();
- };
+ window.addEventListener('load', (event) => {
+ var wsp = <?xjs write(settings.wsp || GetWebSocketServicePort()); ?>;
+ var wssp = <?xjs write(settings.wssp || GetWebSocketServicePort(true)); ?>;
+ var Options = new fTelnetOptions();
+ Options.BareLFtoCRLF = false;
+ Options.BitsPerSecond = 57600;
+ Options.ConnectionType = 'rlogin';
+ Options.Emulation = 'ansi-bbs';
+ Options.Enter = '\r';
+ Options.Font = 'CP437';
+ Options.ForceWss = false;
+ Options.Hostname = '<?xjs write(http_request.vhost); ?>';
+ Options.LocalEcho = false;
+ Options.Port = location.protocol == 'https:' ? wssp : wsp;
+ Options.RLoginClientUsername = '<?xjs write(user.security.password); ?>';
+ Options.RLoginServerUsername = '<?xjs write(user.alias); ?>';
+ Options.ScreenColumns = 80;
+ Options.ScreenRows = 25;
+ Options.SplashScreen = Options.SplashScreen = '<?xjs write(get_splash()); ?>';
+ Options.WebSocketUrlPath = '?Port=<?xjs write(GetRLoginPort()); ?>';
+ var fTelnet = new fTelnetClient('fTelnetContainer', Options);
+ fTelnet.OnConnectionClose = function () {
+ window.location.reload();
+ };
+ });
async function launchXtrn(code) {
await v4_get('./api/system.ssjs?call=set-xtrn-intent&code=' + code);
diff --git a/webv4/pages/099-xtrnmenu-games.xjs b/webv4/pages/099-xtrnmenu-games.xjs
index c7106969f1..722bf2a658 100644
--- a/webv4/pages/099-xtrnmenu-games.xjs
+++ b/webv4/pages/099-xtrnmenu-games.xjs
@@ -69,29 +69,31 @@
<script id="fTelnetScript" src="<?xjs write(get_url()); ?>"></script>
<script type="text/javascript">
- var wsp = <?xjs write(settings.wsp || GetWebSocketServicePort()); ?>;
- var wssp = <?xjs write(settings.wssp || GetWebSocketServicePort(true)); ?>;
- var Options = new fTelnetOptions();
- Options.BareLFtoCRLF = false;
- Options.BitsPerSecond = 57600;
- Options.ConnectionType = 'rlogin';
- Options.Emulation = 'ansi-bbs';
- Options.Enter = '\r';
- Options.Font = 'CP437';
- Options.ForceWss = false;
- Options.Hostname = '<?xjs write(http_request.vhost); ?>';
- Options.LocalEcho = false;
- Options.Port = location.protocol == 'https:' ? wssp : wsp;
- Options.RLoginClientUsername = '<?xjs write(user.security.password); ?>';
- Options.RLoginServerUsername = '<?xjs write(user.alias); ?>';
- Options.ScreenColumns = 80;
- Options.ScreenRows = 25;
- Options.SplashScreen = Options.SplashScreen = '<?xjs write(get_splash()); ?>';
- Options.WebSocketUrlPath = '?Port=<?xjs write(GetRLoginPort()); ?>';
- var fTelnet = new fTelnetClient('fTelnetContainer', Options);
- fTelnet.OnConnectionClose = function () {
- window.location.reload();
- };
+ window.addEventListener('load', (event) => {
+ var wsp = <?xjs write(settings.wsp || GetWebSocketServicePort()); ?>;
+ var wssp = <?xjs write(settings.wssp || GetWebSocketServicePort(true)); ?>;
+ var Options = new fTelnetOptions();
+ Options.BareLFtoCRLF = false;
+ Options.BitsPerSecond = 57600;
+ Options.ConnectionType = 'rlogin';
+ Options.Emulation = 'ansi-bbs';
+ Options.Enter = '\r';
+ Options.Font = 'CP437';
+ Options.ForceWss = false;
+ Options.Hostname = '<?xjs write(http_request.vhost); ?>';
+ Options.LocalEcho = false;
+ Options.Port = location.protocol == 'https:' ? wssp : wsp;
+ Options.RLoginClientUsername = '<?xjs write(user.security.password); ?>';
+ Options.RLoginServerUsername = '<?xjs write(user.alias); ?>';
+ Options.ScreenColumns = 80;
+ Options.ScreenRows = 25;
+ Options.SplashScreen = Options.SplashScreen = '<?xjs write(get_splash()); ?>';
+ Options.WebSocketUrlPath = '?Port=<?xjs write(GetRLoginPort()); ?>';
+ var fTelnet = new fTelnetClient('fTelnetContainer', Options);
+ fTelnet.OnConnectionClose = function () {
+ window.location.reload();
+ };
+ });
async function launchXtrn() {
var code = event.srcElement.id;
--
GitLab