diff --git a/src/platforms/mp-alipay/runtime/api/protocols.js b/src/platforms/mp-alipay/runtime/api/protocols.js index bed4763c2dbe347512a3b7c262af02b0bdb939d0..afd6d8cea580a60830569aeb63e97a47cfb3bbea 100644 --- a/src/platforms/mp-alipay/runtime/api/protocols.js +++ b/src/platforms/mp-alipay/runtime/api/protocols.js @@ -3,7 +3,6 @@ import { } from 'uni-shared' import navigateTo from 'uni-helpers/navigate-to' import redirectTo from '../../../mp-weixin/helpers/redirect-to' -import createCanvasContext from '../../../mp-weixin/helpers/create-canvas-context' // 不支持的 API 列表 const todos = [ @@ -478,8 +477,7 @@ const protocols = { // 需要做转换的 API 列表 result.telNumber = info.mobilePhone result.errMsg = result.resultStatus } - }, - createCanvasContext + } } export { diff --git a/src/platforms/mp-baidu/runtime/api/protocols.js b/src/platforms/mp-baidu/runtime/api/protocols.js index 8ecc39ea9caaa0659a80b8b230fc7156f3cb0017..1d2969dd08bf5d602dcb5463ebc61c76f24f2ec9 100644 --- a/src/platforms/mp-baidu/runtime/api/protocols.js +++ b/src/platforms/mp-baidu/runtime/api/protocols.js @@ -1,7 +1,6 @@ import navigateTo from 'uni-helpers/navigate-to' import redirectTo from '../../../mp-weixin/helpers/redirect-to' import previewImage from '../../../mp-weixin/helpers/normalize-preview-image' -import createCanvasContext from '../../../mp-weixin/helpers/create-canvas-context' // 不支持的 API 列表 const todos = [ @@ -120,12 +119,11 @@ const protocols = { getAccountInfoSync: { name: 'getEnvInfoSync', returnValue: _handleEnvInfo - }, - createCanvasContext + } } export { protocols, todos, canIUses -} +} diff --git a/src/platforms/mp-kuaishou/runtime/api/protocols.js b/src/platforms/mp-kuaishou/runtime/api/protocols.js index b4783871de78b9878da26e976621657133234116..b4acb05c0feedb863e8650539a40f5be69c8303e 100644 --- a/src/platforms/mp-kuaishou/runtime/api/protocols.js +++ b/src/platforms/mp-kuaishou/runtime/api/protocols.js @@ -1,13 +1,11 @@ import navigateTo from 'uni-helpers/navigate-to' import redirectTo from '../../../mp-weixin/helpers/redirect-to' import previewImage from '../../../mp-weixin/helpers/normalize-preview-image' -import createCanvasContext from '../../../mp-weixin/helpers/create-canvas-context' export const protocols = { navigateTo, redirectTo, - previewImage, - createCanvasContext + previewImage } export const todos = [ 'vibrate' diff --git a/src/platforms/mp-qq/runtime/api/protocols.js b/src/platforms/mp-qq/runtime/api/protocols.js index dec19a4d7504ccd975b576798456bbb0d56a07f1..a255937eb042b87e755d129524be81b738c2ec4b 100644 --- a/src/platforms/mp-qq/runtime/api/protocols.js +++ b/src/platforms/mp-qq/runtime/api/protocols.js @@ -1,13 +1,11 @@ import navigateTo from 'uni-helpers/navigate-to' import redirectTo from '../../../mp-weixin/helpers/redirect-to' import previewImage from '../../../mp-weixin/helpers/normalize-preview-image' -import createCanvasContext from '../../../mp-weixin/helpers/create-canvas-context' export const protocols = { navigateTo, redirectTo, - previewImage, - createCanvasContext + previewImage } export const todos = [ 'preloadPage', diff --git a/src/platforms/mp-toutiao/runtime/api/protocols.js b/src/platforms/mp-toutiao/runtime/api/protocols.js index e72adbc2e686b8e60ec87c566d9d8ee8ff928b28..5b99a973246d448a246fdf0574eca8a48a23e4ec 100644 --- a/src/platforms/mp-toutiao/runtime/api/protocols.js +++ b/src/platforms/mp-toutiao/runtime/api/protocols.js @@ -1,7 +1,6 @@ -import navigateTo from 'uni-helpers/navigate-to' -import redirectTo from '../../../mp-weixin/helpers/redirect-to' +import navigateTo from 'uni-helpers/navigate-to' +import redirectTo from '../../../mp-weixin/helpers/redirect-to' import previewImage from '../../../mp-weixin/helpers/normalize-preview-image' -import createCanvasContext from '../../../mp-weixin/helpers/create-canvas-context' // 不支持的 API 列表 const todos = [ @@ -101,8 +100,8 @@ const protocols = { args: { sizeType: false } - }, - navigateTo, + }, + navigateTo, redirectTo, previewImage, connectSocket: { @@ -170,8 +169,7 @@ const protocols = { args: { digestAlgorithm: false } - }, - createCanvasContext + } } export { diff --git a/src/platforms/mp-weixin/helpers/create-canvas-context.js b/src/platforms/mp-weixin/helpers/create-canvas-context.js deleted file mode 100644 index dd6d0535f6c3b723ab8057000e74c4717aa142e8..0000000000000000000000000000000000000000 --- a/src/platforms/mp-weixin/helpers/create-canvas-context.js +++ /dev/null @@ -1,12 +0,0 @@ -export default { - returnValue (fromRes, toRes) { - const measureText = fromRes.measureText - toRes.measureText = function (text, callback) { - const textMetrics = measureText.call(this, text) - if (typeof callback === 'function') { - setTimeout(() => callback(textMetrics), 0) - } - return textMetrics - } - } -} diff --git a/src/platforms/mp-weixin/runtime/api/protocols.js b/src/platforms/mp-weixin/runtime/api/protocols.js index 76fc4ef0748350dcca79b6184e03f3f326d1c2af..cc9b1584ce80401ca2e0e364aa0a562af8fa5c43 100644 --- a/src/platforms/mp-weixin/runtime/api/protocols.js +++ b/src/platforms/mp-weixin/runtime/api/protocols.js @@ -1,7 +1,6 @@ -import navigateTo from 'uni-helpers/navigate-to' +import navigateTo from 'uni-helpers/navigate-to' import redirectTo from '../../helpers/redirect-to' import previewImage from '../../helpers/normalize-preview-image' -import createCanvasContext from '../../helpers/create-canvas-context' function addSafeAreaInsets (result) { if (result.safeArea) { @@ -15,7 +14,7 @@ function addSafeAreaInsets (result) { } } export const protocols = { - redirectTo, + redirectTo, navigateTo, previewImage, getSystemInfo: { @@ -23,8 +22,7 @@ export const protocols = { }, getSystemInfoSync: { returnValue: addSafeAreaInsets - }, - createCanvasContext + } } export const todos = [ 'vibrate', @@ -32,4 +30,4 @@ export const todos = [ 'unPreloadPage', 'loadSubPackage' ] -export const canIUses = [] +export const canIUses = [] diff --git a/src/platforms/quickapp-webview/runtime/api/protocols.js b/src/platforms/quickapp-webview/runtime/api/protocols.js index 03e3bc5a0b413f4f85e2be3895171729d4f5b23d..3c28c70f9e1de0c32a7bb5e454ca403d0cfd03a0 100644 --- a/src/platforms/quickapp-webview/runtime/api/protocols.js +++ b/src/platforms/quickapp-webview/runtime/api/protocols.js @@ -1,13 +1,11 @@ import navigateTo from 'uni-helpers/navigate-to' import redirectTo from '../../../mp-weixin/helpers/redirect-to' import previewImage from '../../../mp-weixin/helpers/normalize-preview-image' -import createCanvasContext from '../../../mp-weixin/helpers/create-canvas-context' export const protocols = { navigateTo, redirectTo, - previewImage, - createCanvasContext + previewImage } export const todos = [ 'preloadPage',