[+] update all

apache · Dec 13, 2017 · cc2f64e · cc2f64e
1 parent df7768e
commit cc2f64e
Show file tree

Hide file tree

Showing 11 changed files with 2,024 additions and 1,507 deletions.
diff --git a/build/index.native.js b/build/index.native.js
diff --git a/build/index.native.js.map b/build/index.native.js.map
diff --git a/build/index.web.js b/build/index.web.js
diff --git a/build/index.web.js.map b/build/index.web.js.map
diff --git a/example/_mods/set-nav.js b/example/_mods/set-nav.js
@@ -5,25 +5,25 @@
  */
 
 const navigationBar = weex.requireModule('navigationBar');
-const navigator = weex.requireModule('navigator')
+const navigator = weex.requireModule('navigator');
+import { Utils } from '../../index';
 
 export function setTitle (title) {
   if (navigationBar && navigationBar.setTitle) {
-    const NOOP = () => {
-    };
+    const NOOP = () => {};
     navigationBar.setTitle({
-      title,
+      title
     }, NOOP, NOOP);
 
     const CALLBACK = (event) => {
-      if (event.index != undefined) {
+      if (event.index !== undefined) {
         navigator.push({
           url: 'https://h5.m.taobao.com/trip/weex-ui/index.html?_wx_tpl=https%3A%2F%2Fh5.m.taobao.com%2Ftrip%2Fweex-ui%2Fdemo%2Findex.native-min.js',
           animated: true
         }, NOOP)
       }
     };
-    navigationBar.setRightItem({
+    Utils.env.isAliWeex() && navigationBar.setRightItem({
       items: [{
         icon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABCUExURUxpcTMzMzMzMzAwMDIyMjIyMjExMTAwMDIyMjIyMjIyMjIyMjIyMjIyMjIyMjMzMzIyMjAwMDMzMzMzMzIyMjMzMxR9TlYAAAAVdFJOUwCgvzCfgD9AYMCQcO+P389/IG9Q0HT9VioAAADRSURBVEjH7ZXrDoMgDEZhVgFvu/L+r7pZgQlSLcuSJYvfHwKcU5HUKMSRj6P7Xhfx9hVdyBcYjmcbyEvJNmZeCK7hea5xCTzPgAXPMZCv3/M9A1b7aAx83hnA54XoSAOI82rCAPL98gZs3EfOgM37Wxuwc9+pgTw0V4qvGoiM1vd/l+fDfusW/NyOeaEPgFswyUI1nObckoLGl1BTHkEYbXzGqYERiR9sgmCTknEHf0mo5+EQfiM0GOx1HM5+TglkcoIsFe5bgsp+iIpM9V+//CcugShOKAURTAAAAABJRU5ErkJggg=='
       }]

diff --git a/example/_mods/index.html → example/_public/index.html b/example/_mods/index.html → example/_public/index.html
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "weex-loader": "^0.6.0-beta.3",
     "weex-vue-loader": "^0.5.0-beta.3",
     "weex-vue-precompiler": "^0.1.10",
-    "weex-vue-render": "^1.0.2"
+    "weex-vue-render": "^1.0.4"
   },
   "dependencies": {
     "url-parse": "^1.1.9"

diff --git a/packages/utils/index.js b/packages/utils/index.js
@@ -105,6 +105,13 @@ const Utils = {
     isAlipayWeb () {
       return Utils.env.isAlipay() && Utils.env.isWeb();
     },
+    isTmall () {
+      let { appName } = weex.config.env;
+      return /(tm|tmall|天猫)/i.test(appName);
+    },
+    isAliWeex () {
+      return Utils.env.isTmall() || Utils.env.isTrip() || Utils.env.isTaobao();
+    },
     supportsEB () {
       const weexVersion = weex.config.env.weexVersion || '0';
       const isHighWeex = Utils.compareVersion(weexVersion, '0.10.1.4') && (Utils.env.isIOS() || Utils.env.isAndroid());

diff --git a/packages/wxc-lightbox/index.vue b/packages/wxc-lightbox/index.vue
@@ -21,7 +21,7 @@
                :style="{ height: height + 'px', width: width  + 'px'}"></image>
       </div>
       <indicator class="indicator"
-                 :style="indicatorStyle"></indicator>
+                 :style="[indicatorStyle,{itemSelectedColor:indicatorStyle[item-selected-color],itemSize: indicatorStyle[item-size]}]"></indicator>
     </slider>
   </wxc-mask>
 </template>

diff --git a/webpack.config.js b/webpack.config.js
@@ -29,9 +29,9 @@ const getCopyConfig = () => {
   const foundScripts = glob.sync('example/*/', {});
   const ret = [];
   foundScripts.forEach(function (scriptPath) {
-    if (scriptPath !== 'example/_mods/') {
+    if (!/(_mods|_public)/.test(scriptPath)) {
       ret.push({
-        from: 'example/_mods/index.html',
+        from: 'example/_public/index.html',
         to: scriptPath + 'index.html'
       })
     }