You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by da...@apache.org on 2017/07/03 03:44:58 UTC
[09/13] incubator-weex git commit: Merge branch '0.15-dev' of
https://github.com/apache/incubator-weex into 0.15-dev
Merge branch '0.15-dev' of https://github.com/apache/incubator-weex into 0.15-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/68875def
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/68875def
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/68875def
Branch: refs/heads/0.15-dev
Commit: 68875def1daf0083f4f09bcaa75c1522de093bab
Parents: da75a60 55ba496
Author: erha19 <fa...@gmail.com>
Authored: Fri Jun 30 16:38:55 2017 +0800
Committer: erha19 <fa...@gmail.com>
Committed: Fri Jun 30 16:38:55 2017 +0800
----------------------------------------------------------------------
.travis.yml | 1 -
README.md | 2 +-
WeexSDK.podspec | 2 +-
.../com/taobao/weex/common/WXImageStrategy.java | 9 +-
.../main/java/com/taobao/weex/dom/WXAttr.java | 38 +-
.../com/taobao/weex/dom/WXImageQuality.java | 4 +-
.../java/com/taobao/weex/dom/WXAttrTest.java | 19 +-
doc/_config.yml | 7 +
doc/_config_cn.yml | 7 +
doc/source/cn/references/components/text.md | 64 +-
doc/source/cn/references/modules/dom.md | 2 +-
doc/source/cn/releasenote.md | 663 ++-----------------
doc/source/faq.md | 6 +-
doc/source/guide/index.md | 26 +-
doc/source/guide/intro/using-vue.md | 6 +-
doc/source/references/components/text.md | 69 +-
doc/source/references/modules/dom.md | 2 +-
doc/source/releasenote.md | 663 ++-----------------
doc/themes/weex/layout/_partial/head.ejs | 3 +
doc/themes/weex/layout/layout.ejs | 15 +
doc/themes/weex/layout/post.ejs | 7 -
doc/themes/weex/source/css/common.scss | 14 +-
doc/themes/weex/source/css/docsearch.min.css | 2 +
doc/themes/weex/source/css/media-queries.scss | 2 +-
.../weex/source/css/partial/highlight.scss | 7 +-
.../weex/source/css/partial/search-form.scss | 44 +-
doc/themes/weex/source/css/variable.scss | 4 +-
doc/themes/weex/source/js/docsearch.min.js | 7 +
examples/vue/market/gcanvas.vue | 36 +-
html5/render/vue/core/style.js | 1 -
html5/shared/console.js | 10 +-
.../WeexSDK/Sources/Component/WXListComponent.m | 3 +
.../WeexSDK/Sources/Component/WXTextComponent.m | 62 +-
.../WeexSDK/Sources/Events/WXComponent+Events.m | 19 +-
ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 16 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 2 -
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 15 +-
package.json | 2 +-
test/screenshot/border-ios.png | Bin 126375 -> 126185 bytes
40 files changed, 405 insertions(+), 1458 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/68875def/html5/render/vue/core/style.js
----------------------------------------------------------------------
diff --cc html5/render/vue/core/style.js
index d2b155a,7230b74..0531a73
--- a/html5/render/vue/core/style.js
+++ b/html5/render/vue/core/style.js
@@@ -55,18 -50,16 +55,17 @@@ export function getHeadStyleMap ()
* another reason not to use cssRules directy:
* @issue: https://stackoverflow.com/questions/21642277/security-error-the-operation-is-insecure-in-firefox-document-stylesheets
*/
- if ((styleSheet.ownerNode.tagName.toLowerCase() === 'link')
- || !styleSheet.ownerNode.textContent) {
- /**
- * css in a link. just ignore this. probably a link stylesheet.
- */
- return pre
- }
- if (styleSheet.ownerNode.id.match(/weex-pseudo-\d+/)) {
+ if (
+ // css in a link. just ignore this. probably a link stylesheet.
+ (styleSheet.ownerNode.tagName.toLowerCase() === 'link')
+ || !styleSheet.ownerNode.textContent
+ // pseudo class styleSheet node is generated by weex. just ignore it.
+ || styleSheet.ownerNode.id.match(/weex-pseudo-\d+/)) {
return pre
}
-
+ /**
+ * start to analyze it's content.
+ */
const strArr = trimComment(styleSheet.ownerNode.textContent.trim()).split(/}/)
const len = strArr.length
const rules = []
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/68875def/package.json
----------------------------------------------------------------------