build uni runtime(refactor previewImage)

elmknot · May 9, 2019 · 1198bbd · 1198bbd
1 parent bc23156
commit 1198bbd
Show file tree

Hide file tree

Showing 11 changed files with 141 additions and 159 deletions.
diff --git a/packages/uni-mp-baidu/dist/index.js b/packages/uni-mp-baidu/dist/index.js
@@ -144,33 +144,39 @@ function upx2px (number, newDeviceWidth) {
   return number < 0 ? -result : result
 }
 
-function normalize (fromArgs) {
-  let currentIndex = parseInt(fromArgs.current);
-  if (isNaN(currentIndex)) {
-    return
-  }
-  const urls = fromArgs.urls;
-  if (!Array.isArray(urls)) {
-    return
-  }
-  const len = urls.length;
-  if (!len) {
-    return
-  }
-  if (currentIndex < 0) {
-    currentIndex = 0;
-  } else if (currentIndex >= len) {
-    currentIndex = len - 1;
-  }
-  if (currentIndex > 0) {
-    fromArgs.current = urls[currentIndex];
-    fromArgs.urls = urls.filter(
-      (item, index) => index < currentIndex ? item !== urls[currentIndex] : true
-    );
-  } else {
-    fromArgs.current = urls[0];
+var previewImage = {
+  args (fromArgs) {
+    let currentIndex = parseInt(fromArgs.current);
+    if (isNaN(currentIndex)) {
+      return
+    }
+    const urls = fromArgs.urls;
+    if (!Array.isArray(urls)) {
+      return
+    }
+    const len = urls.length;
+    if (!len) {
+      return
+    }
+    if (currentIndex < 0) {
+      currentIndex = 0;
+    } else if (currentIndex >= len) {
+      currentIndex = len - 1;
+    }
+    if (currentIndex > 0) {
+      fromArgs.current = urls[currentIndex];
+      fromArgs.urls = urls.filter(
+        (item, index) => index < currentIndex ? item !== urls[currentIndex] : true
+      );
+    } else {
+      fromArgs.current = urls[0];
+    }
+    return {
+      indicator: false,
+      loop: false
+    }
   }
-}
+};
 
 // 不支持的 API 列表
 const todos = [
@@ -232,15 +238,7 @@ const protocols = {
       method: false
     }
   },
-  previewImage: {
-    args (fromArgs) {
-      normalize(fromArgs);
-      return {
-        indicator: false,
-        loop: false
-      }
-    }
-  },
+  previewImage,
   getRecorderManager: {
     returnValue (fromRet) {
       fromRet.onFrameRecorded = createTodoMethod('RecorderManager', 'onFrameRecorded');

diff --git a/packages/uni-mp-baidu/package.json b/packages/uni-mp-baidu/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-mp-baidu",
-	"version": "0.0.829",
+	"version": "0.0.830",
 	"description": "uni-app mp-baidu",
 	"main": "dist/index.js",
 	"scripts": {

diff --git a/packages/uni-mp-toutiao/dist/index.js b/packages/uni-mp-toutiao/dist/index.js
@@ -144,33 +144,39 @@ function upx2px (number, newDeviceWidth) {
   return number < 0 ? -result : result
 }
 
-function normalize (fromArgs) {
-  let currentIndex = parseInt(fromArgs.current);
-  if (isNaN(currentIndex)) {
-    return
-  }
-  const urls = fromArgs.urls;
-  if (!Array.isArray(urls)) {
-    return
-  }
-  const len = urls.length;
-  if (!len) {
-    return
-  }
-  if (currentIndex < 0) {
-    currentIndex = 0;
-  } else if (currentIndex >= len) {
-    currentIndex = len - 1;
-  }
-  if (currentIndex > 0) {
-    fromArgs.current = urls[currentIndex];
-    fromArgs.urls = urls.filter(
-      (item, index) => index < currentIndex ? item !== urls[currentIndex] : true
-    );
-  } else {
-    fromArgs.current = urls[0];
+var previewImage = {
+  args (fromArgs) {
+    let currentIndex = parseInt(fromArgs.current);
+    if (isNaN(currentIndex)) {
+      return
+    }
+    const urls = fromArgs.urls;
+    if (!Array.isArray(urls)) {
+      return
+    }
+    const len = urls.length;
+    if (!len) {
+      return
+    }
+    if (currentIndex < 0) {
+      currentIndex = 0;
+    } else if (currentIndex >= len) {
+      currentIndex = len - 1;
+    }
+    if (currentIndex > 0) {
+      fromArgs.current = urls[currentIndex];
+      fromArgs.urls = urls.filter(
+        (item, index) => index < currentIndex ? item !== urls[currentIndex] : true
+      );
+    } else {
+      fromArgs.current = urls[0];
+    }
+    return {
+      indicator: false,
+      loop: false
+    }
   }
-}
+};
 
 // 不支持的 API 列表
 const todos = [
@@ -265,15 +271,7 @@ const protocols = {
       sizeType: false
     }
   },
-  previewImage: {
-    args (fromArgs) {
-      normalize(fromArgs);
-      return {
-        indicator: false,
-        loop: false
-      }
-    }
-  },
+  previewImage,
   connectSocket: {
     args: {
       method: false

diff --git a/packages/uni-mp-toutiao/package.json b/packages/uni-mp-toutiao/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-mp-toutiao",
-	"version": "0.0.327",
+	"version": "0.0.328",
 	"description": "uni-app mp-toutiao",
 	"main": "dist/index.js",
 	"scripts": {

diff --git a/packages/uni-mp-weixin/dist/index.js b/packages/uni-mp-weixin/dist/index.js
@@ -144,38 +144,42 @@ function upx2px (number, newDeviceWidth) {
   return number < 0 ? -result : result
 }
 
-function normalize (fromArgs) {
-  let currentIndex = parseInt(fromArgs.current);
-  if (isNaN(currentIndex)) {
-    return
-  }
-  const urls = fromArgs.urls;
-  if (!Array.isArray(urls)) {
-    return
-  }
-  const len = urls.length;
-  if (!len) {
-    return
-  }
-  if (currentIndex < 0) {
-    currentIndex = 0;
-  } else if (currentIndex >= len) {
-    currentIndex = len - 1;
-  }
-  if (currentIndex > 0) {
-    fromArgs.current = urls[currentIndex];
-    fromArgs.urls = urls.filter(
-      (item, index) => index < currentIndex ? item !== urls[currentIndex] : true
-    );
-  } else {
-    fromArgs.current = urls[0];
+var previewImage = {
+  args (fromArgs) {
+    let currentIndex = parseInt(fromArgs.current);
+    if (isNaN(currentIndex)) {
+      return
+    }
+    const urls = fromArgs.urls;
+    if (!Array.isArray(urls)) {
+      return
+    }
+    const len = urls.length;
+    if (!len) {
+      return
+    }
+    if (currentIndex < 0) {
+      currentIndex = 0;
+    } else if (currentIndex >= len) {
+      currentIndex = len - 1;
+    }
+    if (currentIndex > 0) {
+      fromArgs.current = urls[currentIndex];
+      fromArgs.urls = urls.filter(
+        (item, index) => index < currentIndex ? item !== urls[currentIndex] : true
+      );
+    } else {
+      fromArgs.current = urls[0];
+    }
+    return {
+      indicator: false,
+      loop: false
+    }
   }
-}
+};
 
 const protocols = {
-  previewImage: {
-    args: normalize
-  }
+  previewImage
 };
 const todos = [];
 const canIUses = [];

diff --git a/packages/uni-mp-weixin/package.json b/packages/uni-mp-weixin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-mp-weixin",
-	"version": "0.0.951",
+	"version": "0.0.952",
 	"description": "uni-app mp-weixin",
 	"main": "dist/index.js",
 	"scripts": {

diff --git a/src/platforms/mp-baidu/service/api/protocols.js b/src/platforms/mp-baidu/service/api/protocols.js
@@ -1,4 +1,4 @@
-import normalizePreviewImageArgs from '../../../mp-weixin/helpers/normalize-preview-image-args'
+import previewImage from '../../../mp-weixin/helpers/normalize-preview-image'
 // 不支持的 API 列表
 const todos = [
   'hideKeyboard',
@@ -59,15 +59,7 @@ const protocols = {
       method: false
     }
   },
-  previewImage: {
-    args (fromArgs) {
-      normalizePreviewImageArgs(fromArgs)
-      return {
-        indicator: false,
-        loop: false
-      }
-    }
-  },
+  previewImage,
   getRecorderManager: {
     returnValue (fromRet) {
       fromRet.onFrameRecorded = createTodoMethod('RecorderManager', 'onFrameRecorded')

diff --git a/src/platforms/mp-toutiao/service/api/protocols.js b/src/platforms/mp-toutiao/service/api/protocols.js
@@ -1,4 +1,4 @@
-import normalizePreviewImageArgs from '../../../mp-weixin/helpers/normalize-preview-image-args'
+import previewImage from '../../../mp-weixin/helpers/normalize-preview-image'
 
 // 不支持的 API 列表
 const todos = [
@@ -93,15 +93,7 @@ const protocols = {
       sizeType: false
     }
   },
-  previewImage: {
-    args (fromArgs) {
-      normalizePreviewImageArgs(fromArgs)
-      return {
-        indicator: false,
-        loop: false
-      }
-    }
-  },
+  previewImage,
   connectSocket: {
     args: {
       method: false

diff --git a/src/platforms/mp-weixin/helpers/normalize-preview-image-args.js b/src/platforms/mp-weixin/helpers/normalize-preview-image-args.js
diff --git a/src/platforms/mp-weixin/helpers/normalize-preview-image.js b/src/platforms/mp-weixin/helpers/normalize-preview-image.js
@@ -0,0 +1,33 @@
+export default {
+  args (fromArgs) {
+    let currentIndex = parseInt(fromArgs.current)
+    if (isNaN(currentIndex)) {
+      return
+    }
+    const urls = fromArgs.urls
+    if (!Array.isArray(urls)) {
+      return
+    }
+    const len = urls.length
+    if (!len) {
+      return
+    }
+    if (currentIndex < 0) {
+      currentIndex = 0
+    } else if (currentIndex >= len) {
+      currentIndex = len - 1
+    }
+    if (currentIndex > 0) {
+      fromArgs.current = urls[currentIndex]
+      fromArgs.urls = urls.filter(
+        (item, index) => index < currentIndex ? item !== urls[currentIndex] : true
+      )
+    } else {
+      fromArgs.current = urls[0]
+    }
+    return {
+      indicator: false,
+      loop: false
+    }
+  }
+}
diff --git a/src/platforms/mp-weixin/service/api/protocols.js b/src/platforms/mp-weixin/service/api/protocols.js
@@ -1,14 +1,6 @@
-import normalizePreviewImageArgs from '../../helpers/normalize-preview-image-args'
+import previewImage from '../../helpers/normalize-preview-image'
 export const protocols = {
-  previewImage: {
-    args (fromArgs) {
-      normalizePreviewImageArgs(fromArgs)
-      return {
-        indicator: false,
-        loop: false
-      }
-    }
-  }
+  previewImage
 }
 export const todos = []
 export const canIUses = []