Andromeda/jank-client-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

channel reordering fixes

Browse source
This commit is contained in:
MathMan05 2025-01-12 14:45:39 -06:00
parent 890eee4b8e
commit e148bf09c1
1 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/webpage/channel.ts
View file

@ -700,7 +700,7 @@ class Channel extends SnowFlake {
const that = Channel.dragged[0]; const that = Channel.dragged[0];
if (!that) return; if (!that) return;
event.preventDefault(); event.preventDefault();
if (container) { if (container && that.type !== 4) {
that.move_id = this.id; that.move_id = this.id;
if (that.parent) { if (that.parent) {
that.parent.children.splice(that.parent.children.indexOf(that), 1); that.parent.children.splice(that.parent.children.indexOf(that), 1);
@ -710,34 +710,53 @@ class Channel extends SnowFlake {
this.children.unshift(that); this.children.unshift(that);
} else { } else {
console.log(this, Channel.dragged); console.log(this, Channel.dragged);
that.move_id = this.parent_id; let thisy = this as Channel;
if (that.type === 4) {
console.log("check", this);
if (this.parent) {
thisy = this.parent;
console.log("overwrite :3", thisy);
}
}
that.move_id = thisy.parent_id;
if (that.parent) { if (that.parent) {
that.parent.children.splice(that.parent.children.indexOf(that), 1); that.parent.children.splice(that.parent.children.indexOf(that), 1);
} else { } else {
this.guild.headchannels.splice(this.guild.headchannels.indexOf(that), 1); thisy.guild.headchannels.splice(thisy.guild.headchannels.indexOf(that), 1);
} }
that.parent = this.parent; that.parent = thisy.parent;
if (that.parent) { if (that.parent) {
const build: Channel[] = []; const build: Channel[] = [];
for (let i = 0; i < that.parent.children.length; i++) { for (let i = 0; i < that.parent.children.length; i++) {
build.push(that.parent.children[i]); build.push(that.parent.children[i]);
if (that.parent.children[i] === this) { if (that.parent.children[i] === thisy) {
build.push(that); build.push(that);
} }
} }
that.parent.children = build; that.parent.children = build;
} else { } else {
const build: Channel[] = []; const build: Channel[] = [];
for (let i = 0; i < this.guild.headchannels.length; i++) { for (let i = 0; i < thisy.guild.headchannels.length; i++) {
build.push(this.guild.headchannels[i]); build.push(thisy.guild.headchannels[i]);
if (this.guild.headchannels[i] === this) { if (thisy.guild.headchannels[i] === thisy) {
build.push(that); build.push(that);
} }
} }
this.guild.headchannels = build; thisy.guild.headchannels = build;
} }
if (Channel.dragged[1]) { if (Channel.dragged[1]) {
div.after(Channel.dragged[1]); if (this === thisy && this.type !== 4) {
div.after(Channel.dragged[1]);
} else {
div = div.parentElement as HTMLDivElement;
if (!div) return;
div = div.parentElement as HTMLDivElement;
if (!div) return;
console.log(div);
Channel.dragged[1].remove();
div.after(Channel.dragged[1]);
}
} }
} }
this.guild.calculateReorder(); this.guild.calculateReorder();