You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/04/28 09:17:43 UTC
[2/3] incubator-weex git commit: Merge commit
'507cd7ca3cc1af696c498b6b570e7cd73cb8ab84' into cijian-dev
Merge commit '507cd7ca3cc1af696c498b6b570e7cd73cb8ab84' into cijian-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/1d53ab24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1d53ab24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1d53ab24
Branch: refs/heads/0.13-dev
Commit: 1d53ab246112fe03cef8970680431cfbbfd96011
Parents: eed974f 507cd7c
Author: \u6b64\u95f4 <zh...@alibaba-inc.com>
Authored: Wed Apr 26 18:54:26 2017 +0800
Committer: \u6b64\u95f4 <zh...@alibaba-inc.com>
Committed: Wed Apr 26 18:54:26 2017 +0800
----------------------------------------------------------------------
WeexSDK.podspec | 2 +-
android/sdk/assets/main.js | 8 ---
android/sdk/build.gradle | 6 +++
.../com/taobao/weex/dom/TextDecorationSpan.java | 55 ++++++++++++++++++++
.../main/java/com/taobao/weex/dom/WXStyle.java | 32 ++++++++----
.../com/taobao/weex/dom/WXTextDomObject.java | 11 +---
.../weex/ui/component/WXTextDecoration.java | 1 +
dangerfile.js | 1 +
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 10 ++--
ios/sdk/WeexSDK/Resources/main.js | 8 ---
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 4 +-
pre-build/native-bundle-main.js | 8 +++
13 files changed, 102 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1d53ab24/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------