From 8d16bce7ece5133caa5f81817f353933fb181c42 Mon Sep 17 00:00:00 2001 From: MathMan05 Date: Sat, 20 Jul 2024 15:09:17 -0500 Subject: [PATCH] fixing errors and typos --- .dist/channel.js | 14 +++++++------- .dist/direct.js | 6 +++--- .dist/localuser.js | 2 +- webpage/channel.ts | 14 +++++++------- webpage/direct.ts | 6 +++--- webpage/localuser.ts | 2 +- webpage/style.css | 3 --- 7 files changed, 22 insertions(+), 25 deletions(-) diff --git a/.dist/channel.js b/.dist/channel.js index 361f57f..16635a2 100644 --- a/.dist/channel.js +++ b/.dist/channel.js @@ -35,7 +35,7 @@ class Channel { allthewayup; static contextmenu = new Contextmenu("channel menu"); replyingto; - infinate; + infinite; idToPrev = {}; idToNext = {}; static setupcontextmenu() { @@ -71,9 +71,9 @@ class Channel { return order; }); } - setUpInfinateScroller() { + setUpInfiniteScroller() { const ids = {}; - this.infinate = new InfiniteScroller(async function (id, offset) { + this.infinite = new InfiniteScroller(async function (id, offset) { if (offset === 1) { if (this.idToPrev[id]) { return this.idToPrev[id]; @@ -129,7 +129,7 @@ class Channel { this.position = JSON.position; this.lastreadmessageid = null; this.lastmessageid = JSON.last_message_id; - this.setUpInfinateScroller(); + this.setUpInfiniteScroller(); } isAdmin() { return this.guild.isAdmin(); @@ -517,7 +517,7 @@ class Channel { this.myhtml.classList.add("viewChannel"); this.guild.prevchannel = this; this.localuser.channelfocus = this; - const prom = this.infinate.delete(); + const prom = this.infinite.delete(); await this.putmessages(); await prom; if (id !== Channel.genid) { @@ -612,7 +612,7 @@ class Channel { buildmessages() { const messages = document.getElementById("channelw"); messages.innerHTML = ""; - messages.append(this.infinate.getDiv(this.lastmessageid)); + messages.append(this.infinite.getDiv(this.lastmessageid)); } updateChannel(JSON) { this.type = JSON.type; @@ -723,7 +723,7 @@ class Channel { } } this.guild.unreads(); - this.infinate.addedBottom(); + this.infinite.addedBottom(); if (messagez.author === this.localuser.user) { return; } diff --git a/.dist/direct.js b/.dist/direct.js index 3fe9902..e8a9620 100644 --- a/.dist/direct.js +++ b/.dist/direct.js @@ -82,7 +82,7 @@ class Group extends Channel { this.lastmessageid = JSON.last_message_id; this.lastmessageid ??= "0"; this.mentions = 0; - this.setUpInfinateScroller(); + this.setUpInfiniteScroller(); } createguildHTML() { const div = document.createElement("div"); @@ -104,7 +104,7 @@ class Group extends Channel { } this.guild.prevchannel = this; this.localuser.channelfocus = this; - const prom = this.infinate.delete(); + const prom = this.infinite.delete(); await this.putmessages(); await prom; if (id !== Channel.genid) { @@ -132,7 +132,7 @@ class Group extends Channel { } } this.unreads(); - this.infinate.addedBottom(); + this.infinite.addedBottom(); if (messagez.author === this.localuser.user) { return; } diff --git a/.dist/localuser.js b/.dist/localuser.js index ed50944..3df2641 100644 --- a/.dist/localuser.js +++ b/.dist/localuser.js @@ -84,7 +84,7 @@ class Localuser { outoffocus() { document.getElementById("servers").textContent = ""; document.getElementById("channels").textContent = ""; - this.channelfocus.infinate.delete(); + this.channelfocus.infinite.delete(); this.lookingguild = null; this.channelfocus = null; } diff --git a/webpage/channel.ts b/webpage/channel.ts index 15d177d..ab9e615 100644 --- a/webpage/channel.ts +++ b/webpage/channel.ts @@ -43,7 +43,7 @@ class Channel{ allthewayup:boolean; static contextmenu=new Contextmenu("channel menu"); replyingto:Message; - infinate:InfiniteScroller; + infinite:InfiniteScroller; idToPrev:{[key:string]:string}={}; idToNext:{[key:string]:string}={}; static setupcontextmenu(){ @@ -85,9 +85,9 @@ class Channel{ return order; }) } - setUpInfinateScroller(){ + setUpInfiniteScroller(){ const ids:{[key:string]:Function}={}; - this.infinate=new InfiniteScroller(async function(id:string,offset:number){ + this.infinite=new InfiniteScroller(async function(id:string,offset:number){ if(offset===1){ if(this.idToPrev[id]){ return this.idToPrev[id]; @@ -145,7 +145,7 @@ class Channel{ this.position=JSON.position; this.lastreadmessageid=null; this.lastmessageid=JSON.last_message_id; - this.setUpInfinateScroller(); + this.setUpInfiniteScroller(); } isAdmin(){ return this.guild.isAdmin(); @@ -528,7 +528,7 @@ class Channel{ this.myhtml.classList.add("viewChannel") this.guild.prevchannel=this; this.localuser.channelfocus=this; - const prom=this.infinate.delete(); + const prom=this.infinite.delete(); await this.putmessages(); await prom; if(id!==Channel.genid){ @@ -618,7 +618,7 @@ class Channel{ buildmessages(){ const messages=document.getElementById("channelw"); messages.innerHTML=""; - messages.append(this.infinate.getDiv(this.lastmessageid)); + messages.append(this.infinite.getDiv(this.lastmessageid)); } updateChannel(JSON){ this.type=JSON.type; @@ -722,7 +722,7 @@ class Channel{ } } this.guild.unreads(); - this.infinate.addedBottom(); + this.infinite.addedBottom(); if(messagez.author===this.localuser.user){ return; } diff --git a/webpage/direct.ts b/webpage/direct.ts index 8915f8e..3d4ad35 100644 --- a/webpage/direct.ts +++ b/webpage/direct.ts @@ -84,7 +84,7 @@ class Group extends Channel{ this.lastmessageid=JSON.last_message_id; this.lastmessageid??="0"; this.mentions=0; - this.setUpInfinateScroller(); + this.setUpInfiniteScroller(); } createguildHTML(){ const div=document.createElement("div") @@ -106,7 +106,7 @@ class Group extends Channel{ } this.guild.prevchannel=this; this.localuser.channelfocus=this; - const prom=this.infinate.delete(); + const prom=this.infinite.delete(); await this.putmessages(); await prom; if(id!==Channel.genid){ @@ -133,7 +133,7 @@ class Group extends Channel{ } } this.unreads(); - this.infinate.addedBottom(); + this.infinite.addedBottom(); if(messagez.author===this.localuser.user){ return; } diff --git a/webpage/localuser.ts b/webpage/localuser.ts index 76c8834..551a978 100644 --- a/webpage/localuser.ts +++ b/webpage/localuser.ts @@ -91,7 +91,7 @@ class Localuser{ outoffocus():void{ document.getElementById("servers").textContent=""; document.getElementById("channels").textContent=""; - this.channelfocus.infinate.delete(); + this.channelfocus.infinite.delete(); this.lookingguild=null; this.channelfocus=null; } diff --git a/webpage/style.css b/webpage/style.css index eb4a392..30513c5 100644 --- a/webpage/style.css +++ b/webpage/style.css @@ -1356,9 +1356,6 @@ span { flex-direction: column; max-height:100in; } -<<<<<<< Updated upstream -======= .sizeupdown{ height:4in; } ->>>>>>> Stashed changes