Fix indentation (consistent formatting CHALLENGE)
You people have a prettierrc yet never run prettier tabs or spaces. WHICH IS IT 2 width or 4 width WHICH IS IT (i'd make index.html 4 width tab but there's more that uses space there)
This commit is contained in:
parent
999bdd0809
commit
72d0cbb37b
22
Config.ts
22
Config.ts
|
|
@ -1,14 +1,14 @@
|
||||||
export const Config = {
|
export const Config = {
|
||||||
ChatSound: "//computernewb.com/collab-vm/notify.ogg",
|
ChatSound: '//computernewb.com/collab-vm/notify.ogg',
|
||||||
ServerAddresses: [
|
ServerAddresses: [
|
||||||
"wss://computernewb.com/collab-vm/vm0",
|
'wss://computernewb.com/collab-vm/vm0',
|
||||||
"wss://computernewb.com/collab-vm/vm1",
|
'wss://computernewb.com/collab-vm/vm1',
|
||||||
"wss://computernewb.com/collab-vm/vm2",
|
'wss://computernewb.com/collab-vm/vm2',
|
||||||
"wss://computernewb.com/collab-vm/vm3",
|
'wss://computernewb.com/collab-vm/vm3',
|
||||||
"wss://computernewb.com/collab-vm/vm4",
|
'wss://computernewb.com/collab-vm/vm4',
|
||||||
"wss://computernewb.com/collab-vm/vm5",
|
'wss://computernewb.com/collab-vm/vm5',
|
||||||
"wss://computernewb.com/collab-vm/vm6",
|
'wss://computernewb.com/collab-vm/vm6',
|
||||||
"wss://computernewb.com/collab-vm/vm7",
|
'wss://computernewb.com/collab-vm/vm7',
|
||||||
"wss://computernewb.com/collab-vm/vm8",
|
'wss://computernewb.com/collab-vm/vm8'
|
||||||
]
|
]
|
||||||
}
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
// TODO: `Object` has a toString(), but we should probably gate that off
|
// TODO: `Object` has a toString(), but we should probably gate that off
|
||||||
/// Interface for things that can be turned into strings
|
/// Interface for things that can be turned into strings
|
||||||
export interface ToStringable {
|
export interface ToStringable {
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ export enum I18nStringKey {
|
||||||
|
|
||||||
kError_UsernameTaken = 'kError_UsernameTaken',
|
kError_UsernameTaken = 'kError_UsernameTaken',
|
||||||
kError_UsernameInvalid = 'kError_UsernameInvalid',
|
kError_UsernameInvalid = 'kError_UsernameInvalid',
|
||||||
kError_UsernameBlacklisted = 'kError_UsernameBlacklisted',
|
kError_UsernameBlacklisted = 'kError_UsernameBlacklisted'
|
||||||
}
|
}
|
||||||
|
|
||||||
// This models the JSON structure.
|
// This models the JSON structure.
|
||||||
|
|
@ -68,7 +68,7 @@ type LanguagesJson = {
|
||||||
|
|
||||||
// The default language (set if a invalid language not in the languages array is set, or no language is set)
|
// The default language (set if a invalid language not in the languages array is set, or no language is set)
|
||||||
defaultLanguage: string;
|
defaultLanguage: string;
|
||||||
}
|
};
|
||||||
|
|
||||||
// ID for fallback language
|
// ID for fallback language
|
||||||
const fallbackId = '!!fallback';
|
const fallbackId = '!!fallback';
|
||||||
|
|
@ -77,7 +77,7 @@ const fallbackId = '!!fallback';
|
||||||
const fallbackLanguage: Language = {
|
const fallbackLanguage: Language = {
|
||||||
languageName: 'Fallback',
|
languageName: 'Fallback',
|
||||||
translatedLanguageName: 'Fallback',
|
translatedLanguageName: 'Fallback',
|
||||||
flag: "no",
|
flag: 'no',
|
||||||
author: 'Computernewb',
|
author: 'Computernewb',
|
||||||
|
|
||||||
stringKeys: {
|
stringKeys: {
|
||||||
|
|
|
||||||
|
|
@ -368,7 +368,7 @@ async function openVM(vm: VM): Promise<void> {
|
||||||
throw new Error('Failed to connect to node');
|
throw new Error('Failed to connect to node');
|
||||||
}
|
}
|
||||||
// Set the title
|
// Set the title
|
||||||
document.title = Format("{0} - {1}", vm.id, TheI18n.GetString(I18nStringKey.kGeneric_CollabVM));
|
document.title = Format('{0} - {1}', vm.id, TheI18n.GetString(I18nStringKey.kGeneric_CollabVM));
|
||||||
// Append canvas
|
// Append canvas
|
||||||
elements.vmDisplay.appendChild(VM!.canvas);
|
elements.vmDisplay.appendChild(VM!.canvas);
|
||||||
// Switch to the VM view
|
// Switch to the VM view
|
||||||
|
|
|
||||||
|
|
@ -438,7 +438,7 @@ export default class CollabVMClient {
|
||||||
this.connectedToVM = false;
|
this.connectedToVM = false;
|
||||||
|
|
||||||
// call all unsubscribe callbacks explicitly
|
// call all unsubscribe callbacks explicitly
|
||||||
for(let cb of this.unsubscribeCallbacks) {
|
for (let cb of this.unsubscribeCallbacks) {
|
||||||
cb();
|
cb();
|
||||||
}
|
}
|
||||||
this.unsubscribeCallbacks = [];
|
this.unsubscribeCallbacks = [];
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import { Format } from '../format';
|
import { Format } from '../format';
|
||||||
|
|
||||||
test('a string without any format specifiers in it is unaltered', () => {
|
test('a string without any format specifiers in it is unaltered', () => {
|
||||||
expect(Format("Hello World")).toBe("Hello World");
|
expect(Format('Hello World')).toBe('Hello World');
|
||||||
});
|
});
|
||||||
|
|
||||||
test('formatting a string works', () => {
|
test('formatting a string works', () => {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user