diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-03-31 00:19:15 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-03-31 00:31:40 +0900 |
| commit | c352aafb3e972870715770c7bd975051ff9b0fec (patch) | |
| tree | 16e0dd47cd1a5a05d398b87d35ecf06f9ec9f353 /src | |
| parent | Bye bye polyfill (diff) | |
| download | misskey-c352aafb3e972870715770c7bd975051ff9b0fec.tar.gz misskey-c352aafb3e972870715770c7bd975051ff9b0fec.tar.bz2 misskey-c352aafb3e972870715770c7bd975051ff9b0fec.zip | |
[Client] :v:
Diffstat (limited to 'src')
| -rw-r--r-- | src/const.json | 2 | ||||
| -rw-r--r-- | src/web/app/boot.js | 6 | ||||
| -rw-r--r-- | src/web/app/common/tags/error.tag (renamed from src/web/app/common/tags/core-error.tag) | 12 | ||||
| -rw-r--r-- | src/web/app/common/tags/index.js | 2 |
4 files changed, 7 insertions, 15 deletions
diff --git a/src/const.json b/src/const.json index e39db6e90d..1032ed538f 100644 --- a/src/const.json +++ b/src/const.json @@ -1,5 +1,5 @@ { "themeColor": "#87bb35", "themeColorForeground": "#fff", - "idea": ["#f13049"] + "idea": ["#f13049", "#f43636"] } diff --git a/src/web/app/boot.js b/src/web/app/boot.js index cc92357579..426c7be40e 100644 --- a/src/web/app/boot.js +++ b/src/web/app/boot.js @@ -139,11 +139,7 @@ function fetchme(token, cb) { me.data ? done() : init(); }); }, () => { - riot.mount(document.body.appendChild(document.createElement('mk-core-error')), { - retry: () => { - fetchme(token, cb); - } - }); + riot.mount(document.body.appendChild(document.createElement('mk-error'))); }); function done() { diff --git a/src/web/app/common/tags/core-error.tag b/src/web/app/common/tags/error.tag index dd6f994ea2..42d7642827 100644 --- a/src/web/app/common/tags/core-error.tag +++ b/src/web/app/common/tags/error.tag @@ -1,4 +1,4 @@ -<mk-core-error> +<mk-error> <!--i: i.fa.fa-times-circle--> <img src="/assets/error.jpg" alt=""/> <h1>サーバーに接続できません</h1> @@ -7,7 +7,7 @@ <style> :scope position fixed - z-index 16385 + z-index 100000 top 0 left 0 width 100% @@ -26,9 +26,6 @@ height 200px margin 64px auto 0 auto pointer-events none - -ms-user-select none - -moz-user-select none - -webkit-user-select none user-select none > h1 @@ -57,8 +54,7 @@ </style> <script> this.retry = () => { - this.unmount(); - this.opts.retry(); + location.reload() } </script> -</mk-core-error> +</mk-error> diff --git a/src/web/app/common/tags/index.js b/src/web/app/common/tags/index.js index dfec571478..5dc4ef4546 100644 --- a/src/web/app/common/tags/index.js +++ b/src/web/app/common/tags/index.js @@ -1,4 +1,4 @@ -require('./core-error.tag'); +require('./error.tag'); require('./url.tag'); require('./url-preview.tag'); require('./time.tag'); |