Skip to content
This repository was archived by the owner on May 13, 2018. It is now read-only.

Commit ad837d1

Browse files
committed
未ログイン時にプロフィール画面を封印するように。
1 parent 20941dc commit ad837d1

3 files changed

Lines changed: 26 additions & 9 deletions

File tree

libraries/common/common.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ window.addEventListener("DOMContentLoaded", () => {
7777
let result = true;
7878

7979
dialog.querySelectorAll('*[Required]').forEach(requiredField => {
80-
if (requiredField.value.replace(/\s/g, "").length == 0) {
80+
if (requiredField.value.replace(/\s/g, "").length == 0 || !requiredField.checkValidity()) {
8181
result = false;
8282
return;
8383
}

profile/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</Section>
7373

7474
<Footer Class = "mdc-dialog__footer">
75-
<Button Class = "mdc-button mdc-dialog__action mdc-dialog__footer__button mdc-dialog__footer__button--accept" Data-Locales = "common.dialog_yes">はい</Button>
75+
<Button Class = "mdc-button mdc-dialog__action mdc-dialog__footer__button mdc-dialog__footer__button--accept" Data-Locales = "common.dialog_yes" Disabled = "Disabled">はい</Button>
7676
<Button Class = "mdc-button mdc-dialog__footer__button mdc-dialog__footer__button--cancel" Data-Locales = "common.dialog_no">いいえ</Button>
7777
</Footer>
7878
</Div>

profile/profile.js

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,35 @@
11
terminal.addEventListener("message", event => {
22
if (event.data.code == "Loaded") {
3-
base.Database.get(base.Database.INTERVAL, `users/${base.user.uid}`, res => {
4-
new DOM("#Profile-Info-Name").value = res.userName,
5-
new DOM("#Profile-Info-Name").parentNode.querySelector("Label").classList.add("mdc-text-field__label--float-above");
3+
if (base.user) {
4+
base.Database.get(base.Database.INTERVAL, `users/${base.user.uid}`, res => {
5+
new DOM("#Profile-Info-Name").value = res.userName,
6+
new DOM("#Profile-Info-Name").parentNode.querySelector("Label").classList.add("mdc-text-field__label--float-above");
67

7-
new DOM("#Profile-Info-Detail").value = res.detail,
8-
new DOM("#Profile-Info-Detail").parentNode.querySelector("Label").classList.add("mdc-text-field__label--float-above");
9-
});
8+
new DOM("#Profile-Info-Detail").value = res.detail,
9+
new DOM("#Profile-Info-Detail").parentNode.querySelector("Label").classList.add("mdc-text-field__label--float-above");
10+
});
11+
} else {
12+
location.href = "/SimpleThread/";
13+
}
1014
}
1115
});
1216

1317
window.addEventListener("DOMContentLoaded", () => {
1418
new DOM("@.mdc-text-field").forEach(textField => new mdc.textField.MDCTextField(textField));
1519

20+
let deleteConfirmer = new mdc.dialog.MDCDialog(new DOM("#DeleteConfirmer"));
21+
deleteConfirmer.listen("MDCDialog:accept", () => {
22+
base.delete();
23+
});
24+
25+
new DOM("#DeleteConfirmer-Email").addEventListener("input", event => {
26+
if (event.target.value == base.user.email) {
27+
deleteConfirmer.acceptButton_.removeAttribute("disabled");
28+
} else {
29+
deleteConfirmer.acceptButton_.setAttribute("disabled", "");
30+
}
31+
});
32+
1633
new DOM("#Profile-Save").addEventListener("click", () => {
1734
base.Database.update("users/" + base.user.uid, {
1835
userName: new DOM("#Profile-Info-Name").value,
@@ -23,6 +40,6 @@ window.addEventListener("DOMContentLoaded", () => {
2340
});
2441

2542
new DOM("#Profile-Delete").addEventListener("click", () => {
26-
new mdc.dialog.MDCDialog(new DOM("#DeleteConfirmer")).show();
43+
deleteConfirmer.show();
2744
})
2845
});

0 commit comments

Comments
 (0)