From c2159598c9da6cfd3a388a955460e411797bade3 Mon Sep 17 00:00:00 2001 From: flashwave Date: Tue, 20 Feb 2024 21:56:51 +0000 Subject: [PATCH] Removed the domain transition notification from the compatibility client. --- src/ami.css/domaintrans.css | 136 -------------------------------- src/ami.css/main.css | 2 - src/ami.js/ctx.js | 2 - src/ami.js/main.js | 19 +---- src/ami.js/mami/domaintrans.jsx | 69 ---------------- src/ami.js/ts_chat.js | 5 -- 6 files changed, 2 insertions(+), 231 deletions(-) delete mode 100644 src/ami.css/domaintrans.css delete mode 100644 src/ami.js/mami/domaintrans.jsx diff --git a/src/ami.css/domaintrans.css b/src/ami.css/domaintrans.css deleted file mode 100644 index 6146073..0000000 --- a/src/ami.css/domaintrans.css +++ /dev/null @@ -1,136 +0,0 @@ -.domaintrans { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 9001; - - font-family: Verdana, Tahoma, Geneva, Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 20px; - - background-color: #222; - color: #ddd; - - text-shadow: 0 0 5px #000; - box-shadow: inset 0 0 1em #000; - overflow-y: auto; - overflow-x: hidden; -} - -.domaintrans-body { - max-width: 500px; - margin: 20px auto; -} - -.domaintrans-domain { - margin: 10px 0; - width: 100%; -} -.domaintrans-domain-main { - font-size: 1.2em; - line-height: 1.5em; -} -.domaintrans-domain-compat { - font-size: .8em; - line-height: 1.5em; - opacity: .8; -} - -.domaintrans-domain-header { - font-size: 1.4em; - line-height: 1.5em; - text-align: center; -} - -.domaintrans-domain-display { - width: 100%; - font-size: 1.2em; - line-height: 1.4em; - text-align: center; -} -.domaintrans-domain-display div { - margin: 2px; - display: block; -} - -.domaintrans-domain-text div { - display: inline-block; - border: 1px solid #444; - background: #333; - border-radius: 5px; - padding: 2px 5px; -} - -.domaintrans-text { - font-size: .8em; - line-height: 1.3em; - margin: 10px auto; -} -.domaintrans-text p { - margin: 1em 10px; -} - -.domaintrans-options { - text-align: center; -} -.domaintrans-options > div { - margin: 2px; - display: inline-block; - max-width: 300px; - width: 100%; -} - -.domaintrans-option { - display: block; - width: 100%; - color: #fff; - background: #333; - border-radius: 5px; - font-size: 16px; - text-shadow: initial; - text-align: left; - font-family: Verdana, Tahoma, Geneva, Arial, Helvetica, sans-serif; - padding: 7px 15px; - border: 1px solid #444; - box-sizing: border-box; - transition: background .2s; -} -.domaintrans-option .sprite { - margin: 2px; -} -.domaintrans-option-icon { - display: inline-block; - border: 2px solid #aaa; - border-radius: 100%; - vertical-align: middle; - transform: scale(1); - transition: transform .2s; -} -.domaintrans-option-text { - display: inline-block; - vertical-align: middle; - margin-left: 10px; -} - -.domaintrans-option:focus { - outline: 2px solid #9475b2; -} - -.domaintrans-option:hover, -.domaintrans-option:focus { - background: #3d3d3d; - text-decoration: none; -} -.domaintrans-option:hover .domaintrans-option-icon, -.domaintrans-option:focus .domaintrans-option-icon { - transform: scale(1.2); -} - -.domaintrans-option:active { - background: #383838; -} -.domaintrans-option:active .domaintrans-option-icon { - transform: scale(.9); -} diff --git a/src/ami.css/main.css b/src/ami.css/main.css index 5bcdb0d..a321634 100644 --- a/src/ami.css/main.css +++ b/src/ami.css/main.css @@ -518,8 +518,6 @@ body { @include colpick.css; -@include domaintrans.css; - @include themes/beige.css; @include themes/black.css; @include themes/blue.css; diff --git a/src/ami.js/ctx.js b/src/ami.js/ctx.js index be5cd13..be9a12c 100644 --- a/src/ami.js/ctx.js +++ b/src/ami.js/ctx.js @@ -49,8 +49,6 @@ var AmiContext = function(title, auth, loading) { settings.define('bbPersistSjis', 'boolean'); settings.define('bbPersistColour', 'string'); - settings.define('tmpSkipDomainPopUpThing', 'boolean', false); - settings.define('migrated', 'boolean', false); if(!settings.get('migrated')) { diff --git a/src/ami.js/main.js b/src/ami.js/main.js index 01ae8fb..f8ceff1 100644 --- a/src/ami.js/main.js +++ b/src/ami.js/main.js @@ -6,7 +6,6 @@ #include loadoverlay.js #include mszauth.js #include ts_chat.js -#include mami/domaintrans.jsx #include mami/settings.js (function() { @@ -36,26 +35,12 @@ var ami = new AmiContext(futami.get('title'), auth, loading); window.ami = ami; - const actuallyLoadChat = function() { + setInterval(refreshInfo, 600000); + refreshInfo(function() { Chat.Main(auth); ami.sockChat.open(); window.addEventListener('beforeunload', () => ami.sockChat.close()); - }; - - setInterval(refreshInfo, 600000); - refreshInfo(function() { - if(!ami.settings.get('tmpSkipDomainPopUpThing')) { - const adt = AmiDomainTransition( - MamiSettings.isSupported() ? () => MamiSettings.exportFile() : undefined, - () => { - ami.settings.set('tmpSkipDomainPopUpThing', true); - adt.remove(); - actuallyLoadChat(); - } - ); - adt.appendTo(document.body); - } else actuallyLoadChat(); }); }); })(); diff --git a/src/ami.js/mami/domaintrans.jsx b/src/ami.js/mami/domaintrans.jsx deleted file mode 100644 index 6b3426c..0000000 --- a/src/ami.js/mami/domaintrans.jsx +++ /dev/null @@ -1,69 +0,0 @@ -#include common.js -#include utility.js - -const AmiDomainTransition = function(onExport, onDismiss) { - if(typeof onDismiss !== 'function') - throw 'onDismiss must be a function'; - - let exportTidbit, modernButton, exportButton; - let arrowsTarget1, arrowsTarget2; - const html =
-
-
-
- Compatibility Chat -
-
-
sockchat.flashii.net/legacy
- {arrowsTarget1 =
} -
sockchat.flashii.net
-
-
-
-
- Flashii Chat -
-
-
sockchat.flashii.net
- {arrowsTarget2 =
} -
chat.flashii.net
-
-
-
-

At long last, modern chat is being moved back to its proper subdomain. This means the original client can have the sockchat subdomain all to itself like the AJAX Chat!

- {exportTidbit =

You can use this screen to export your settings for the modern client. Pressing "Export settings" will let you save your settings for the modern client, you can then import this file using the "Import settings" button within the modern client.

} -

This screen won't show up again after you press "Continue to chat".

-
-
- {modernButton =
-
-
Open modern client
-
} - {exportButton =
} -
-
-
-
; - - for(let i = 0; i < 5; ++i) - arrowsTarget1.appendChild(▼); - for(let i = 0; i < 5; ++i) - arrowsTarget2.appendChild(▼); - - if(typeof onExport !== 'function') { - $r(exportTidbit); - $r(modernButton); - $r(exportButton); - } - - return { - appendTo: parent => parent.appendChild(html), - remove: () => $r(html), - }; -}; diff --git a/src/ami.js/ts_chat.js b/src/ami.js/ts_chat.js index 5c43d05..63cf087 100644 --- a/src/ami.js/ts_chat.js +++ b/src/ami.js/ts_chat.js @@ -102,11 +102,6 @@ var Chat = (function () { name: 'bbAutoEmbedV1', type: "checkbox", }, - { - id: "skipdomainpopupthing", - name: 'tmpSkipDomainPopUpThing', - type: "checkbox", - }, ]; var userMenu = [