Skip to content

U
uni-app

wzj-java / uni-app
与 Fork 源项目一致

Fork自 DCloud / uni-app

通知 1
Star 1
Fork 0
U
uni-app

体验新版 GitCode，发现更多精彩内容 >>

提交 16730167 编写于 作者: fxy060608's avatar fxy060608
浏览文件
操作

Merge branch 'dev' of https://github.com/dcloudio/uni-app into alpha

上级 1d70ed3f 9cffb293
展开全部 隐藏空白更改
内联 并排
Showing with 113 addition and 113 deletion
packages/vue-cli-plugin-uni/packages/h5-vue-router/dist/vue-router.common.js 100755 → 100644
浏览文件 @ 16730167
/*!
* vue-router v3.0.1
* (c) 2018 Evan You
* (c) 2019 Evan You
* @license MIT
*/
'use strict';
......@@ -1671,19 +1671,19 @@ function scrollToPosition (shouldScroll, position) {
/* */
var supportsPushState = inBrowser && (function() {
var ua = window.navigator.userAgent;
var supportsPushState = inBrowser && (function () {
var ua = window.navigator.userAgent;
if (
(ua.indexOf('Android 2.') !== -1 || ua.indexOf('Android 4.0') !== -1) &&
if (
(ua.indexOf('Android 2.') !== -1 || ua.indexOf('Android 4.0') !== -1) &&
ua.indexOf('Mobile Safari') !== -1 &&
ua.indexOf('Chrome') === -1 &&
ua.indexOf('Windows Phone') === -1
) {
return false
}
) {
return false
}
return window.history && 'pushState' in window.history
return window.history && 'pushState' in window.history
})();
// use User Timing api (if present) for more accurate key precision
......@@ -1697,39 +1697,39 @@ function genKey () {
return Time.now().toFixed(3)
}
function getStateKey() {
return _key
function getStateKey () {
return _key
}
function setStateKey(key) {
_key = key;
function setStateKey (key) {
_key = key;
}
function pushState(url , id , replace ) {
saveScrollPosition();
// try...catch the pushState call to get around Safari
// DOM Exception 18 where it limits to 100 pushState calls
var history = window.history;
try {
if (replace) {
history.replaceState({
function pushState (url , id , replace ) {
saveScrollPosition();
// try...catch the pushState call to get around Safari
// DOM Exception 18 where it limits to 100 pushState calls
var history = window.history;
try {
if (replace) {
history.replaceState({
id: id,
key: _key
}, '', url);
} else {
_key = genKey();
history.pushState({
key: _key
}, '', url);
} else {
_key = genKey();
history.pushState({
id: id,
key: _key
}, '', url);
}
} catch (e) {
window.location[replace ? 'replace' : 'assign'](url);
}
key: _key
}, '', url);
}
} catch (e) {
window.location[replace ? 'replace' : 'assign'](url);
}
}
function replaceState(url , id ) {
pushState(url, id, true);
function replaceState (url , id ) {
pushState(url, id, true);
}
/* */
......@@ -2776,8 +2776,8 @@ function createHref (base, fullPath, mode) {
VueRouter.install = install;
VueRouter.version = '3.0.1';
if (inBrowser && window.Vue) {
window.Vue.use(VueRouter);
}
// if (inBrowser && window.Vue) {
// window.Vue.use(VueRouter)
// }
module.exports = VueRouter;
packages/vue-cli-plugin-uni/packages/h5-vue-router/dist/vue-router.esm.js 100755 → 100644
浏览文件 @ 16730167
/*!
* vue-router v3.0.1
* (c) 2018 Evan You
* (c) 2019 Evan You
* @license MIT
*/
/* */
......@@ -1669,19 +1669,19 @@ function scrollToPosition (shouldScroll, position) {
/* */
var supportsPushState = inBrowser && (function() {
var ua = window.navigator.userAgent;
var supportsPushState = inBrowser && (function () {
var ua = window.navigator.userAgent;
if (
(ua.indexOf('Android 2.') !== -1 || ua.indexOf('Android 4.0') !== -1) &&
if (
(ua.indexOf('Android 2.') !== -1 || ua.indexOf('Android 4.0') !== -1) &&
ua.indexOf('Mobile Safari') !== -1 &&
ua.indexOf('Chrome') === -1 &&
ua.indexOf('Windows Phone') === -1
) {
return false
}
) {
return false
}
return window.history && 'pushState' in window.history
return window.history && 'pushState' in window.history
})();
// use User Timing api (if present) for more accurate key precision
......@@ -1695,39 +1695,39 @@ function genKey () {
return Time.now().toFixed(3)
}
function getStateKey() {
return _key
function getStateKey () {
return _key
}
function setStateKey(key) {
_key = key;
function setStateKey (key) {
_key = key;
}
function pushState(url , id , replace ) {
saveScrollPosition();
// try...catch the pushState call to get around Safari
// DOM Exception 18 where it limits to 100 pushState calls
var history = window.history;
try {
if (replace) {
history.replaceState({
function pushState (url , id , replace ) {
saveScrollPosition();
// try...catch the pushState call to get around Safari
// DOM Exception 18 where it limits to 100 pushState calls
var history = window.history;
try {
if (replace) {
history.replaceState({
id: id,
key: _key
}, '', url);
} else {
_key = genKey();
history.pushState({
key: _key
}, '', url);
} else {
_key = genKey();
history.pushState({
id: id,
key: _key
}, '', url);
}
} catch (e) {
window.location[replace ? 'replace' : 'assign'](url);
}
key: _key
}, '', url);
}
} catch (e) {
window.location[replace ? 'replace' : 'assign'](url);
}
}
function replaceState(url , id ) {
pushState(url, id, true);
function replaceState (url , id ) {
pushState(url, id, true);
}
/* */
......@@ -2774,8 +2774,8 @@ function createHref (base, fullPath, mode) {
VueRouter.install = install;
VueRouter.version = '3.0.1';
if (inBrowser && window.Vue) {
window.Vue.use(VueRouter);
}
// if (inBrowser && window.Vue) {
// window.Vue.use(VueRouter)
// }
export default VueRouter;
packages/vue-cli-plugin-uni/packages/h5-vue-router/dist/vue-router.js 100755 → 100644
浏览文件 @ 16730167
/*!
* vue-router v3.0.1
* (c) 2018 Evan You
* (c) 2019 Evan You
* @license MIT
*/
(function (global, factory) {
......@@ -1675,19 +1675,19 @@ function scrollToPosition (shouldScroll, position) {
/* */
var supportsPushState = inBrowser && (function() {
var ua = window.navigator.userAgent;
var supportsPushState = inBrowser && (function () {
var ua = window.navigator.userAgent;
if (
(ua.indexOf('Android 2.') !== -1 || ua.indexOf('Android 4.0') !== -1) &&
if (
(ua.indexOf('Android 2.') !== -1 || ua.indexOf('Android 4.0') !== -1) &&
ua.indexOf('Mobile Safari') !== -1 &&
ua.indexOf('Chrome') === -1 &&
ua.indexOf('Windows Phone') === -1
) {
return false
}
) {
return false
}
return window.history && 'pushState' in window.history
return window.history && 'pushState' in window.history
})();
// use User Timing api (if present) for more accurate key precision
......@@ -1701,39 +1701,39 @@ function genKey () {
return Time.now().toFixed(3)
}
function getStateKey() {
return _key
function getStateKey () {
return _key
}
function setStateKey(key) {
_key = key;
function setStateKey (key) {
_key = key;
}
function pushState(url , id , replace ) {
saveScrollPosition();
// try...catch the pushState call to get around Safari
// DOM Exception 18 where it limits to 100 pushState calls
var history = window.history;
try {
if (replace) {
history.replaceState({
function pushState (url , id , replace ) {
saveScrollPosition();
// try...catch the pushState call to get around Safari
// DOM Exception 18 where it limits to 100 pushState calls
var history = window.history;
try {
if (replace) {
history.replaceState({
id: id,
key: _key
}, '', url);
} else {
_key = genKey();
history.pushState({
key: _key
}, '', url);
} else {
_key = genKey();
history.pushState({
id: id,
key: _key
}, '', url);
}
} catch (e) {
window.location[replace ? 'replace' : 'assign'](url);
}
key: _key
}, '', url);
}
} catch (e) {
window.location[replace ? 'replace' : 'assign'](url);
}
}
function replaceState(url , id ) {
pushState(url, id, true);
function replaceState (url , id ) {
pushState(url, id, true);
}
/* */
......@@ -2780,9 +2780,9 @@ function createHref (base, fullPath, mode) {
VueRouter.install = install;
VueRouter.version = '3.0.1';
if (inBrowser && window.Vue) {
window.Vue.use(VueRouter);
}
// if (inBrowser && window.Vue) {
// window.Vue.use(VueRouter)
// }
return VueRouter;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或