From 42221f221a55fcae92581d7d7af0b7fe931038b3 Mon Sep 17 00:00:00 2001 From: handongxun Date: Wed, 20 Nov 2019 14:30:03 +0800 Subject: [PATCH] =?UTF-8?q?update:=20runtime=20web-view=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=9B=91=E5=90=ACDOMContentLoaded=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/uni.webview.1.5.2.js | 2 +- src/platforms/app-plus/runtime/web-view.js | 12 +++++------- src/platforms/h5/runtime/web-view.js | 4 +--- src/platforms/mp-alipay/runtime/web-view.js | 10 ++++------ src/platforms/mp-baidu/runtime/web-view.js | 6 ++---- src/platforms/mp-qq/runtime/web-view.js | 12 +++++------- src/platforms/mp-toutiao/runtime/web-view.js | 4 +--- src/platforms/mp-weixin/runtime/web-view.js | 13 ++++++------- 8 files changed, 25 insertions(+), 38 deletions(-) diff --git a/dist/uni.webview.1.5.2.js b/dist/uni.webview.1.5.2.js index 40ad9921f..ddb1c36db 100644 --- a/dist/uni.webview.1.5.2.js +++ b/dist/uni.webview.1.5.2.js @@ -1 +1 @@ -!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e=e||self).uni=n()}(this,function(){"use strict";function i(e,n){var i={options:{timestamp:+new Date},name:e,arg:n};if(!window.plus)return window.parent.postMessage({type:s,data:i,pageId:""},"*");if(0===d.length){var t=plus.webview.currentWebview();if(!t)throw new Error("plus.webview.currentWebview() is undefined");var o=t.parent(),a="";a=o?o.id:t.id,d.push(a)}var r=JSON.stringify(i);plus.webview.getWebviewById(u)?plus.webview.postMessageToUniNView({type:s,args:{data:i,webviewIds:d}},u):plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat(s,'",').concat(r,",").concat(JSON.stringify(d),");"))}var d=[],u="__uniapp__service",s="WEB_INVOKE_APPSERVICE",n={navigateTo:function(e){var n=(0 { - if (window.plus && readyRE.test(document.readyState)) { - readyCallback() - } else { - document.addEventListener('plusready', readyCallback) - } - }, 0) return api } diff --git a/src/platforms/h5/runtime/web-view.js b/src/platforms/h5/runtime/web-view.js index 85f50dbe4..19f4db67b 100644 --- a/src/platforms/h5/runtime/web-view.js +++ b/src/platforms/h5/runtime/web-view.js @@ -1,8 +1,6 @@ import api from '../../app-plus/runtime/web-view-api' export function initWebviewApi (readyCallback) { - setTimeout(() => { - document.addEventListener('DOMContentLoaded', readyCallback) - }, 0) + document.addEventListener('DOMContentLoaded', readyCallback) return api } diff --git a/src/platforms/mp-alipay/runtime/web-view.js b/src/platforms/mp-alipay/runtime/web-view.js index a5cf43e18..0ba5a043e 100644 --- a/src/platforms/mp-alipay/runtime/web-view.js +++ b/src/platforms/mp-alipay/runtime/web-view.js @@ -1,12 +1,10 @@ const isAlipay = window.my && navigator.userAgent.indexOf('AlipayClient') > -1 -export function initWebviewApi (readyCallback) { - if (!isAlipay) { +export function initWebviewApi (readyCallback) { + if (!isAlipay) { return - } - setTimeout(() => { - document.addEventListener('DOMContentLoaded', readyCallback) - }, 0) + } + document.addEventListener('DOMContentLoaded', readyCallback) const { navigateTo, navigateBack, diff --git a/src/platforms/mp-baidu/runtime/web-view.js b/src/platforms/mp-baidu/runtime/web-view.js index 8a15af4e3..55cea4247 100644 --- a/src/platforms/mp-baidu/runtime/web-view.js +++ b/src/platforms/mp-baidu/runtime/web-view.js @@ -1,13 +1,11 @@ const isBaidu = window.swan && window.swan.webView && - /swan-baiduboxapp/i.test(navigator.userAgent) + /swan/i.test(navigator.userAgent) export function initWebviewApi (readyCallback) { if (!isBaidu) { return } - setTimeout(() => { - document.addEventListener('DOMContentLoaded', readyCallback) - }, 0) + document.addEventListener('DOMContentLoaded', readyCallback) return window.swan.webView } diff --git a/src/platforms/mp-qq/runtime/web-view.js b/src/platforms/mp-qq/runtime/web-view.js index 2794f88f2..c52231f1e 100644 --- a/src/platforms/mp-qq/runtime/web-view.js +++ b/src/platforms/mp-qq/runtime/web-view.js @@ -6,13 +6,11 @@ const isQQ = window.qq && export function initWebviewApi (readyCallback) { if (!isQQ) { return + } + if (window.QQJSBridge && window.QQJSBridge.invoke) { + setTimeout(readyCallback, 0) + } else { + document.addEventListener('QQJSBridgeReady', readyCallback) } - setTimeout(() => { - if (window.QQJSBridge && window.QQJSBridge.invoke) { - readyCallback() - } else { - document.addEventListener('QQJSBridgeReady', readyCallback) - } - }, 0) return window.qq.miniProgram } diff --git a/src/platforms/mp-toutiao/runtime/web-view.js b/src/platforms/mp-toutiao/runtime/web-view.js index 45092fc18..63b6f5aa2 100644 --- a/src/platforms/mp-toutiao/runtime/web-view.js +++ b/src/platforms/mp-toutiao/runtime/web-view.js @@ -6,8 +6,6 @@ export function initWebviewApi (readyCallback) { if (!isToutiao) { return } - setTimeout(() => { - document.addEventListener('DOMContentLoaded', readyCallback) - }, 0) + document.addEventListener('DOMContentLoaded', readyCallback) return window.tt.miniProgram } diff --git a/src/platforms/mp-weixin/runtime/web-view.js b/src/platforms/mp-weixin/runtime/web-view.js index f96217ac7..57bfa1b5b 100644 --- a/src/platforms/mp-weixin/runtime/web-view.js +++ b/src/platforms/mp-weixin/runtime/web-view.js @@ -6,13 +6,12 @@ const isWeixin = window.wx && export function initWebviewApi (readyCallback) { if (!isWeixin) { return + } + if (window.WeixinJSBridge && window.WeixinJSBridge.invoke) { + setTimeout(readyCallback, 0) + } else { + document.addEventListener('WeixinJSBridgeReady', readyCallback) } - setTimeout(() => { - if (window.WeixinJSBridge && window.WeixinJSBridge.invoke) { - readyCallback() - } else { - document.addEventListener('WeixinJSBridgeReady', readyCallback) - } - }, 0) + return window.wx.miniProgram } -- GitLab