You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by kf...@apache.org on 2017/08/31 09:47:45 UTC
[1/2] incubator-weex git commit: + [ios] fix bug: if pod with
framework , compile error with duplicate
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev 58441fa47 -> ec30d175b
+ [ios] fix bug: if pod with framework , compile error with duplicate
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/781328f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/781328f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/781328f1
Branch: refs/heads/0.16-dev
Commit: 781328f11b6b4d00b708e13ce67e18e346a3ad4f
Parents: 09fc591
Author: 齐山 <su...@163.com>
Authored: Wed Aug 30 11:31:25 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Wed Aug 30 11:31:25 2017 +0800
----------------------------------------------------------------------
ios/playground/WeexDemo/Scanner/WXScannerVC.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/781328f1/ios/playground/WeexDemo/Scanner/WXScannerVC.m
----------------------------------------------------------------------
diff --git a/ios/playground/WeexDemo/Scanner/WXScannerVC.m b/ios/playground/WeexDemo/Scanner/WXScannerVC.m
index 056d678..e5a0c96 100644
--- a/ios/playground/WeexDemo/Scanner/WXScannerVC.m
+++ b/ios/playground/WeexDemo/Scanner/WXScannerVC.m
@@ -17,6 +17,7 @@
* under the License.
*/
+#import <WeexSDK/WeexSDK.h>
#import "WXScannerVC.h"
#import "AppDelegate.h"
#import "UIViewController+WXDemoNaviBar.h"
@@ -24,7 +25,6 @@
#import "WXDebugTool.h"
#import <TBWXDevTool/WXDevTool.h>
#import <AudioToolbox/AudioToolbox.h>
-#import <WeexSDK/WeexSDK.h>
@interface WXScannerVC ()
[2/2] incubator-weex git commit: Merge branch '0.16-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.16-dev
Posted by kf...@apache.org.
Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.16-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/ec30d175
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ec30d175
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ec30d175
Branch: refs/heads/0.16-dev
Commit: ec30d175b77d8ffe100c1bb3233eb972a345e928
Parents: 781328f 58441fa
Author: 齐山 <su...@163.com>
Authored: Thu Aug 31 17:46:38 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Thu Aug 31 17:46:38 2017 +0800
----------------------------------------------------------------------
.../commons/adapter/FrescoImageComponent.java | 2 +-
.../java/com/alibaba/weex/WXPageActivity.java | 5 +-
android/sdk/libs/armeabi/libweexjsb.so | Bin 22556 -> 0 bytes
android/sdk/libs/armeabi/libweexjsc.so | Bin 325660 -> 7570392 bytes
android/sdk/libs/armeabi/libweexjss.so | Bin 6754012 -> 0 bytes
.../java/com/taobao/weex/WXSDKInstance.java | 23 ++-
.../java/com/taobao/weex/common/Constants.java | 1 +
.../com/taobao/weex/common/IWXDebugProxy.java | 2 +
.../weex/ui/component/AppearanceHelper.java | 9 +-
.../com/taobao/weex/ui/component/WXImage.java | 75 ++++----
.../taobao/weex/ui/component/WXScroller.java | 2 +-
.../com/taobao/weex/ui/component/WXText.java | 25 ++-
.../taobao/weex/ui/component/WXVContainer.java | 6 +
.../ui/component/list/BasicListComponent.java | 98 +++++-----
.../com/taobao/weex/ui/view/WXImageView.java | 16 +-
.../com/taobao/weex/utils/ImageDrawable.java | 17 +-
.../java/com/taobao/weex/utils/WXUtils.java | 64 ++++---
dangerfile.js | 2 +-
doc/_config.yml | 2 +
doc/_config_cn.yml | 2 +
doc/source/cn/guide/integrate-to-your-app.md | 6 +-
doc/source/cn/guide/tools/index.md | 1 +
doc/source/cn/guide/tools/plugin.md | 77 ++++++++
doc/source/cn/references/common-style.md | 59 +++++-
doc/source/cn/references/modules/animation.md | 37 ++--
doc/source/guide/integrate-to-your-app.md | 6 +-
doc/source/guide/tools/index.md | 1 +
doc/source/guide/tools/plugin.md | 68 +++++++
doc/source/references/common-style.md | 57 ++++++
doc/source/references/modules/animation.md | 46 ++---
doc/themes/weex/languages/en.yml | 2 +-
.../weex/layout/_partial/after-footer.ejs | 10 +
doc/themes/weex/layout/_partial/header.ejs | 3 +
doc/themes/weex/layout/_partial/sidebar.ejs | 3 +
doc/themes/weex/source/css/index.scss | 42 ++++-
.../WeexSDK/Sources/Component/WXAComponent.m | 2 +-
.../Sources/Component/WXComponent_internal.h | 4 +-
.../Sources/Component/WXSwitchComponent.m | 1 +
.../Sources/Component/WXTextAreaComponent.m | 1 +
.../WeexSDK/Sources/Component/WXTextComponent.m | 1 -
.../Sources/Manager/WXComponentManager.h | 8 +
.../Sources/Manager/WXComponentManager.m | 18 ++
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 41 ++--
test/mocha.opts | 2 -
test/pages/attributes/dom-operation.vue | 33 ++++
test/pages/components/a-src.vue | 86 +++++++++
test/pages/components/a-support-href1.vue | 58 ++++++
test/pages/components/a-support-href2.vue | 58 ++++++
test/pages/components/hyperlink.vue | 31 ----
test/pages/components/hyperlink_target.vue | 23 ---
test/pages/components/image-onload.vue | 65 +++++++
test/pages/components/list-scroll.vue | 33 ++++
test/pages/components/refresh-loading.vue | 20 +-
test/pages/components/scroller-scroll.vue | 31 ++++
test/pages/components/slider-infinite.vue | 54 ++++++
test/pages/components/video-property.vue | 97 ++++++++++
test/pages/dom-operation.vue | 33 ----
test/pages/image-onload.vue | 31 ----
test/pages/index.vue | 30 ---
test/pages/list-scroll.vue | 33 ----
test/pages/modules/modal-event.vue | 75 ++++++--
test/pages/modules/stream-result.vue | 185 +++++++++++++++----
test/pages/scroller-scroll.vue | 31 ----
test/pages/slider-infinite.vue | 54 ------
test/scripts/attributes/compositing.test.js | 5 +-
test/scripts/attributes/dom.test.js | 98 ++++++++++
test/scripts/components/a-src.test.js | 65 +++++++
test/scripts/components/hyperlink.test.js | 44 -----
test/scripts/components/iconfont.test.js | 2 +-
test/scripts/components/image-onload.test.js | 32 +---
test/scripts/components/input-event.test.js | 2 +-
test/scripts/components/recycler.test.js | 20 +-
test/scripts/components/refresh-loading.test.js | 12 +-
test/scripts/components/scroll-event.test.js | 11 +-
test/scripts/components/scroller-fixed.test.js | 2 +-
test/scripts/components/slider-common.test.js | 4 +-
test/scripts/components/slider-infinite.test.js | 4 +-
test/scripts/components/switch-event.test.js | 2 +-
test/scripts/components/text.test.js | 8 +-
.../components/textarea-maxlength.test.js | 3 +-
test/scripts/components/video-property.test.js | 45 +++++
test/scripts/components/web-event.test.js | 2 +-
test/scripts/css/border.test.js | 3 +-
test/scripts/dom.test.js | 97 ----------
test/scripts/index.test.js | 77 --------
.../scripts/modules/animation-translate.test.js | 5 +-
test/scripts/modules/clipboard-event.test.js | 5 +-
test/scripts/modules/gesture-longpress.test.js | 5 +-
test/scripts/modules/globalEvent.test.js | 2 +-
test/scripts/modules/modal-event.test.js | 18 +-
test/scripts/modules/picker-event.test.js | 5 +-
test/scripts/modules/stream-result.test.js | 20 +-
test/scripts/modules/timer.test.js | 5 +-
test/scripts/util.js | 21 ++-
94 files changed, 1666 insertions(+), 866 deletions(-)
----------------------------------------------------------------------