diff --git a/.eslintrc.js b/.eslintrc.js
index 27cd432b1..1861ec826 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -106,7 +106,7 @@ module.exports = {
'no-this-before-super': 2,
'no-throw-literal': 2,
'no-trailing-spaces': 2,
- 'no-undef': 2,
+ 'no-undef': 0,
'no-undef-init': 2,
'no-unexpected-multiline': 2,
'no-unmodified-loop-condition': 2,
diff --git a/docs/src/components/DemoList.vue b/docs/src/components/DemoList.vue
index 5fe6be82a..6ff02a794 100644
--- a/docs/src/components/DemoList.vue
+++ b/docs/src/components/DemoList.vue
@@ -4,6 +4,10 @@
Vant
+
+ EN
+ 中文
+
{{ description }}
@@ -16,6 +20,7 @@
diff --git a/docs/src/index.js b/docs/src/index.js
index 59fdf22bd..59ef3d960 100644
--- a/docs/src/index.js
+++ b/docs/src/index.js
@@ -18,7 +18,7 @@ const router = new VueRouter({
router.beforeEach((route, redirect, next) => {
if (isMobile) {
- window.location.replace('/zanui/vant/examples');
+ location.replace('/zanui/vant/examples' + location.hash);
}
document.title = route.meta.title || document.title;
next();
diff --git a/docs/src/utils/lang.js b/docs/src/utils/lang.js
index 2698ef3d4..871808154 100644
--- a/docs/src/utils/lang.js
+++ b/docs/src/utils/lang.js
@@ -3,24 +3,36 @@ import zhCN from '../../../packages/locale/lang/zh-CN';
import enUS from '../../../packages/locale/lang/en-US';
const langMap = {
- 'en-US': enUS,
- 'zh-CN': zhCN
+ 'en-US': {
+ title: 'Vant - A Vue.js 2.0 Mobile UI at YouZan',
+ messages: enUS
+ },
+ 'zh-CN': {
+ title: 'Vant - 有赞移动端 Vue 组件库',
+ messages: zhCN
+ }
};
-const titleMap = {
- 'en-US': 'Vant - A Vue.js 2.0 Mobile UI at YouZan',
- 'zh-CN': 'Vant - 有赞移动端 Vue 组件库'
-};
+setLang(getDefaultLang());
-const userLang = window.localStorage.getItem('VANT_LANGUAGE') || window.navigator.language || 'en-US';
-let defaultLang = 'en-US';
-if (userLang.indexOf('zh-') !== -1) {
- defaultLang = 'zh-CN';
+function getDefaultLang() {
+ const langs = Object.keys(langMap);
+ const hash = location.hash;
+
+ for (let i = 0; i < langs.length; i++) {
+ if (hash.indexOf(langs[i]) !== -1) {
+ return langs[i];
+ }
+ }
+
+ const userLang = localStorage.getItem('VANT_LANGUAGE') || navigator.language || 'en-US';
+ return userLang.indexOf('zh-') !== -1 ? 'zh-CN' : 'en-US';
}
-setLang(defaultLang);
export function setLang(lang) {
- window.localStorage.setItem('VANT_LANGUAGE', lang);
- Locale.use(lang, langMap[lang]);
- document.title = titleMap[lang];
+ if (window.localStorage) {
+ localStorage.setItem('VANT_LANGUAGE', lang);
+ }
+ Locale.use(lang, langMap[lang].messages);
+ document.title = langMap[lang].title;
}