You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by fk...@apache.org on 2017/04/12 08:27:51 UTC
[08/17] incubator-weex git commit: * [html5] bugfix.
* [html5] bugfix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e8ab2699
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e8ab2699
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e8ab2699
Branch: refs/heads/0.11-dev
Commit: e8ab26991893f1dc0c212176737fdda434466491
Parents: 40f600e
Author: MrRaindrop <te...@gmail.com>
Authored: Thu Apr 6 18:45:08 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Thu Apr 6 18:45:08 2017 +0800
----------------------------------------------------------------------
NOTICE | 6 ++++--
html5/render/vue/core/style.js | 7 +++++--
package.json | 2 +-
packages/weex-vue-render/package.json | 2 +-
4 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e8ab2699/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index c4d3e93..147a854 100644
--- a/NOTICE
+++ b/NOTICE
@@ -12,5 +12,7 @@ by Denis Pushkarev , licensed under the MIT License.
This product contains software vuejs(https://github.com/vuejs/vue) developed
by Yuxi Evan You , licensed under the MIT License.
-This product contains software (https://github.com/component/scroll-to) developed
-by TooTallNate , licensed under the MIT License.
\ No newline at end of file
+This product contains software scroll-to (https://github.com/component/scroll-to) developed
+by TooTallNate , licensed under the MIT License.
+
+This product contains software inline-style-prefixer (https://github.com/rofrischmann/inline-style-prefixer) developed by rofrischmann , licensed under the MIT License.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e8ab2699/html5/render/vue/core/style.js
----------------------------------------------------------------------
diff --git a/html5/render/vue/core/style.js b/html5/render/vue/core/style.js
index 45a4103..09357cf 100644
--- a/html5/render/vue/core/style.js
+++ b/html5/render/vue/core/style.js
@@ -16,6 +16,7 @@ export function getHeadStyleMap () {
if (process.env.NODE_ENV === 'development') {
tagBegin('getHeadStyleMap')
}
+ const needToRemoveStyleSheetNodes = []
const res = Array.from(document.styleSheets || [])
.reduce((pre, styleSheet) => {
// why not using styleSheet.rules || styleSheet.cssRules to get css rules ?
@@ -73,10 +74,12 @@ export function getHeadStyleMap () {
* should only be fetched and used from styleMap to generate the final combined
* component style, not from the stylesheet itself.
*/
- const node = styleSheet.ownerNode
- node.parentNode.removeChild(node)
+ needToRemoveStyleSheetNodes.push(styleSheet.ownerNode)
return pre
}, {})
+ needToRemoveStyleSheetNodes.forEach(function (node) {
+ node.parentNode.removeChild(node)
+ })
if (process.env.NODE_ENV === 'development') {
tagEnd('getHeadStyleMap')
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e8ab2699/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 69aecaf..d5736c7 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"subversion": {
"browser": "0.5.0",
"framework": "0.19.17",
- "vue-render": "0.11.3",
+ "vue-render": "0.11.4",
"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/e8ab2699/packages/weex-vue-render/package.json
----------------------------------------------------------------------
diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json
index 48f8d95..81ddff0 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.3",
+ "version": "0.11.4",
"description": "Weex built-in components for Vue 2.x.",
"license": "Apache-2.0",
"main": "src/render/vue/index.js",