Merge remote-tracking branch 'upstream/archive' into archive-update-v0.55.0

This commit is contained in:
Eliot Partridge
2019-10-01 18:04:54 -05:00
39 changed files with 2998 additions and 2486 deletions
+1 -1
View File
@@ -26,7 +26,7 @@ h1(focusTitle) Account settings
| Changes saved
.form-group.text-right
button.btn.btn-default(type="submit" [disabled]="!canSubmit" style="min-width: 100px;")
| Save
| {{saveButtonText}}
div(style="margin-bottom: 100px;")
.form-group
+10 -1
View File
@@ -8,6 +8,7 @@ import { oauthProviders } from '../../../client/data';
import { Model } from '../../services/model';
import { getProviderIcon } from '../../shared/sign-in-box/sign-in-box';
import { faStar, faExclamationCircle, faSync } from '../../../client/icons';
import { Router } from '@angular/router';
@Component({
selector: 'account',
@@ -33,9 +34,10 @@ export class Account implements OnInit, OnDestroy {
removedAccount?: boolean;
accountError?: string;
accountSaved = false;
isNewAccount = false;
hides: HiddenPlayer[] | undefined = undefined;
page = 0;
constructor(private model: Model) {
constructor(private model: Model, private router: Router) {
}
ngOnInit() {
const account = this.account!;
@@ -44,6 +46,7 @@ export class Account implements OnInit, OnDestroy {
name: account.name,
birthdate: account.birthdate,
};
this.isNewAccount = account.birthdate === '';
this.pageChanged();
}
@@ -88,6 +91,9 @@ export class Account implements OnInit, OnDestroy {
get showAccountAlert() {
return this.model.missingBirthdate;
}
get saveButtonText() {
return this.isNewAccount ? 'Save and continue' : 'Save';
}
icon(id: string) {
return getProviderIcon(id);
}
@@ -98,6 +104,9 @@ export class Account implements OnInit, OnDestroy {
this.model.updateAccount(this.data)
.catch((e: Error) => this.accountError = e.message)
.then(() => this.accountSaved = true);
if (this.isNewAccount) {
this.router.navigate(['home']);
}
}
}
removeSite(site: SocialSiteInfo) {
+4 -2
View File
@@ -205,13 +205,15 @@ h1(focusTitle) Help
p.text-fading.
This is usually caused by outdated graphics drivers or browser.
Check if your browser is #[a(href="https://updatemybrowser.org/") up to date] and check
if there are new updates for your graphics card or device.
if there are new updates for your graphics driver or your device.
p.text-fading.
If your browser is already up to date, try installing different browser.
We recommend using #[a(href="https://www.google.com/chrome/") Chrome]
or #[a(href="https://www.mozilla.org/en-US/firefox/new/") Firefox].
p.text-fading.
Some older devices don't support necessary functions and will never work with the game.
If other workarounds didn't help, switching Graphics Quality to Low usually works.
You'll find that option in the game settings. After switching to Low, it
might take a minute for the screen to stop glitching.
section
h4 Graphical glitches, disappearing objects