summaryrefslogtreecommitdiff
path: root/src/web/app
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-03-26 14:32:22 +0900
committerGitHub <noreply@github.com>2018-03-26 14:32:22 +0900
commitc48a33c996dc869db31d3295c7425c418c3f7151 (patch)
tree8ef5489b5cb63101b251b7f4e08c5c798b1f95ad /src/web/app
parentMerge pull request #1292 from akihikodaki/config (diff)
parentdocument.domainをチェックする際に、hostのかわりにhostnameを... (diff)
downloadsharkey-c48a33c996dc869db31d3295c7425c418c3f7151.tar.gz
sharkey-c48a33c996dc869db31d3295c7425c418c3f7151.tar.bz2
sharkey-c48a33c996dc869db31d3295c7425c418c3f7151.zip
Merge pull request #1293 from rinsuki/fix/using-hostname-insteadof-host
document.domainをチェックする際に、hostのかわりにhostnameを使うように
Diffstat (limited to 'src/web/app')
-rw-r--r--src/web/app/init.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/web/app/init.ts b/src/web/app/init.ts
index 28adfd3b07..6cc7ae6ce6 100644
--- a/src/web/app/init.ts
+++ b/src/web/app/init.ts
@@ -14,7 +14,7 @@ import ElementLocaleJa from 'element-ui/lib/locale/lang/ja';
import App from './app.vue';
import checkForUpdate from './common/scripts/check-for-update';
import MiOS, { API } from './common/mios';
-import { version, host, lang } from './config';
+import { version, hostname, lang } from './config';
let elementLocale;
switch (lang) {
@@ -60,8 +60,8 @@ console.info(
window.clearTimeout((window as any).mkBootTimer);
delete (window as any).mkBootTimer;
-if (host != 'localhost') {
- document.domain = host;
+if (hostname != 'localhost') {
+ document.domain = hostname;
}
//#region Set lang attr