Merge branch 'dev' into alpha

src/core/helpers/api.js

@@ -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 = {}) {
       }
     }
   }
-}
+}

src/core/service/api/plugin/push.js

@@ -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)
     }
   }
-}
+}

src/core/view/components/image/index.vue

@@ -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 => {

src/core/view/components/navigator/index.vue

@@ -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],

src/platforms/mp-alipay/runtime/api/index.js

@@ -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
-}
+}

src/platforms/mp-baidu/runtime/api/index.js

 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
-}
+}

src/platforms/mp-jd/runtime/api/index.js

 export {
-  getPushClientid,
+  getPushClientId,
   onPushMessage,
   offPushMessage,
   invokePushCallback
 }
-  from 'uni-core/service/api/plugin/push'
+  from 'uni-core/service/api/plugin/push'

src/platforms/mp-kuaishou/runtime/api/index.js

 export {
-  getPushClientid,
+  getPushClientId,
   onPushMessage,
   offPushMessage,
   invokePushCallback
 }
-  from 'uni-core/service/api/plugin/push'
+  from 'uni-core/service/api/plugin/push'

src/platforms/mp-lark/runtime/api/index.js

 export {
-  getPushClientid,
+  getPushClientId,
   onPushMessage,
   offPushMessage,
   invokePushCallback
 }
-  from 'uni-core/service/api/plugin/push'
+  from 'uni-core/service/api/plugin/push'

src/platforms/mp-qq/runtime/api/index.js

@@ -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'

src/platforms/mp-toutiao/runtime/api/index.js

@@ -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'

src/platforms/mp-weixin/runtime/api/index.js

 export {
-  getPushClientid,
+  getPushClientId,
   onPushMessage,
   offPushMessage,
   invokePushCallback
 }
-  from 'uni-core/service/api/plugin/push'
+  from 'uni-core/service/api/plugin/push'

src/platforms/mp-xhs/runtime/api/index.js

 export {
-  getPushClientid,
+  getPushClientId,
   onPushMessage,
   offPushMessage,
   invokePushCallback
 }
-  from 'uni-core/service/api/plugin/push'
+  from 'uni-core/service/api/plugin/push'

src/platforms/quickapp-webview/runtime/api/index.js

 export {
-  getPushClientid,
+  getPushClientId,
   onPushMessage,
   offPushMessage,
   invokePushCallback
 }
-  from 'uni-core/service/api/plugin/push'
+  from 'uni-core/service/api/plugin/push'