You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ta...@apache.org on 2017/05/25 02:46:04 UTC

[22/50] incubator-weex git commit: * [html5] release vue-render 0.11.25

* [html5] release vue-render 0.11.25


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e2dd9bf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e2dd9bf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e2dd9bf7

Branch: refs/heads/0.13-dev
Commit: e2dd9bf7c3a47830ecf668c596a2b341c315a311
Parents: 1b72c9e
Author: MrRaindrop <te...@gmail.com>
Authored: Thu May 11 18:02:56 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Thu May 11 18:02:56 2017 +0800

----------------------------------------------------------------------
 html5/render/vue/mixins/style.js      | 8 ++++++--
 html5/render/vue/utils/perf.js        | 2 +-
 package.json                          | 2 +-
 packages/weex-vue-render/package.json | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e2dd9bf7/html5/render/vue/mixins/style.js
----------------------------------------------------------------------
diff --git a/html5/render/vue/mixins/style.js b/html5/render/vue/mixins/style.js
index 69b7dc2..6fe9bb2 100644
--- a/html5/render/vue/mixins/style.js
+++ b/html5/render/vue/mixins/style.js
@@ -29,8 +29,12 @@ import {
 
 export default {
   beforeCreate () {
-    // get static class style map from document's styleSheets.
-    if (!weex.styleMap) {
+    /**
+     * get static class style map from document's styleSheets.
+     * Weex.on will create a Vue instance. In this case we'll ignore it, since
+     * it's not sure whether the scoped style has already attached to head or not.
+     */
+    if (!weex.styleMap && this.$options && this.$options._scopeId) {
       weex.styleMap = getHeadStyleMap()
     }
   },

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e2dd9bf7/html5/render/vue/utils/perf.js
----------------------------------------------------------------------
diff --git a/html5/render/vue/utils/perf.js b/html5/render/vue/utils/perf.js
index af0ce78..37b3512 100644
--- a/html5/render/vue/utils/perf.js
+++ b/html5/render/vue/utils/perf.js
@@ -128,7 +128,7 @@ function collectStat (): void {
           const res: any = extend({}, entry)
           extend(perf.stat, {
             templateUrl: res.name,
-            JSTemplateSize: parseInt(res.transferSize / 1024),
+            JSTemplateSize: (res.transferSize / 1024).toFixed(2),
             networkTime: parseInt(res.duration)
           })
           break

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e2dd9bf7/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 1f55aed..28ffb09 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "subversion": {
     "browser": "0.5.0",
     "framework": "0.20.5",
-    "vue-render": "0.11.24",
+    "vue-render": "0.11.25",
     "transformer": ">=0.1.5 <0.5"
   },
   "description": "A framework for building Mobile cross-platform UI",

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e2dd9bf7/packages/weex-vue-render/package.json
----------------------------------------------------------------------
diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json
index fb41117..0c85fab 100644
--- a/packages/weex-vue-render/package.json
+++ b/packages/weex-vue-render/package.json
@@ -1,6 +1,6 @@
 {
   "name": "weex-vue-render",
-  "version": "0.11.24",
+  "version": "0.11.25",
   "description": "Weex built-in components for Vue 2.x.",
   "license": "Apache-2.0",
   "main": "dist/index.js",