提交 d3b45222 编写于 作者: Q qiang

Merge branch 'dev' into alpha

......@@ -286,7 +286,7 @@ function wrapperExtras (name, extras) {
}
}
// 部分 API 直接实现
const unwrappers = ['getPushClientid', 'onPushMessage', 'offPushMessage']
const unwrappers = ['getPushClientId', 'onPushMessage', 'offPushMessage']
export function wrapper (name, invokeMethod, extras = {}) {
if (unwrappers.indexOf(name) > -1 || !isFn(invokeMethod)) {
......@@ -329,4 +329,4 @@ export function wrapper (name, invokeMethod, extras = {}) {
}
}
}
}
}
......@@ -49,7 +49,7 @@ function invokeGetPushCidCallbacks (cid, errMsg) {
getPushCidCallbacks.length = 0
}
export function getPushClientid (args) {
export function getPushClientId (args) {
if (!isPlainObject(args)) {
args = {}
}
......@@ -65,13 +65,13 @@ export function getPushClientid (args) {
let res
if (cid) {
res = {
errMsg: 'getPushClientid:ok',
errMsg: 'getPushClientId:ok',
cid
}
hasSuccess && success(res)
} else {
res = {
errMsg: 'getPushClientid:fail' + (errMsg ? ' ' + errMsg : '')
errMsg: 'getPushClientId:fail' + (errMsg ? ' ' + errMsg : '')
}
hasFail && fail(res)
}
......@@ -99,4 +99,4 @@ export const offPushMessage = (fn) => {
onPushMessageCallbacks.splice(index, 1)
}
}
}
}
......@@ -172,8 +172,8 @@ export default {
const img = this._img = this._img || new Image()
img.onload = $event => {
this._img = null
this.originalWidth = img.width
this.originalHeight = img.height
const width = this.originalWidth = img.width
const height = this.originalHeight = img.height
this._fixSize()
......@@ -186,8 +186,8 @@ export default {
this.$el.appendChild(img)
this.$trigger('load', $event, {
width: img.width,
height: img.height
width,
height
})
}
img.onerror = $event => {
......
......@@ -92,7 +92,8 @@ export default {
type: String,
validator (value) {
return !value || ~ANIMATION_TYPE_IN.concat(ANIMATION_TYPE_OUT).indexOf(value)
}
},
default: ''
},
animationDuration: {
type: [String, Number],
......
......@@ -11,7 +11,7 @@ export {
}
from '../../helpers/storage'
export {
getPushClientid,
getPushClientId,
onPushMessage,
offPushMessage,
invokePushCallback
......@@ -106,4 +106,4 @@ export function createIntersectionObserver (component, options) {
export {
createMediaQueryObserver
}
}
import createMediaQueryObserver from '../../../mp-weixin/helpers/create-media-query-observer'
export {
getPushClientid,
getPushClientId,
onPushMessage,
offPushMessage,
invokePushCallback
......@@ -26,4 +26,4 @@ export function requestPayment (params) {
export {
createMediaQueryObserver
}
}
export {
getPushClientid,
getPushClientId,
onPushMessage,
offPushMessage,
invokePushCallback
}
from 'uni-core/service/api/plugin/push'
from 'uni-core/service/api/plugin/push'
export {
getPushClientid,
getPushClientId,
onPushMessage,
offPushMessage,
invokePushCallback
}
from 'uni-core/service/api/plugin/push'
from 'uni-core/service/api/plugin/push'
export {
getPushClientid,
getPushClientId,
onPushMessage,
offPushMessage,
invokePushCallback
}
from 'uni-core/service/api/plugin/push'
from 'uni-core/service/api/plugin/push'
......@@ -4,9 +4,9 @@ export {
createMediaQueryObserver
}
export {
getPushClientid,
getPushClientId,
onPushMessage,
offPushMessage,
invokePushCallback
}
from 'uni-core/service/api/plugin/push'
from 'uni-core/service/api/plugin/push'
......@@ -4,9 +4,9 @@ export {
createMediaQueryObserver
}
export {
getPushClientid,
getPushClientId,
onPushMessage,
offPushMessage,
invokePushCallback
}
from 'uni-core/service/api/plugin/push'
from 'uni-core/service/api/plugin/push'
export {
getPushClientid,
getPushClientId,
onPushMessage,
offPushMessage,
invokePushCallback
}
from 'uni-core/service/api/plugin/push'
from 'uni-core/service/api/plugin/push'
export {
getPushClientid,
getPushClientId,
onPushMessage,
offPushMessage,
invokePushCallback
}
from 'uni-core/service/api/plugin/push'
from 'uni-core/service/api/plugin/push'
export {
getPushClientid,
getPushClientId,
onPushMessage,
offPushMessage,
invokePushCallback
}
from 'uni-core/service/api/plugin/push'
from 'uni-core/service/api/plugin/push'
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册