You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ji...@apache.org on 2017/02/24 16:43:11 UTC
[32/50] incubator-weex git commit: Merge branch '0.11-dev' into dev
Merge branch '0.11-dev' into 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/27965734
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/27965734
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/27965734
Branch: refs/heads/dev
Commit: 27965734ebde1d5be3437ac74ce8da370b81fa76
Parents: 6e71437 94d5649
Author: sospartan zheng <so...@apache.org>
Authored: Tue Feb 21 17:01:35 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Tue Feb 21 17:01:35 2017 +0800
----------------------------------------------------------------------
.eslintrc | 1 +
.gitignore | 2 +
.travis.yml | 22 +-
Dangerfile | 55 ++
Gemfile | 15 +
Gemfile.lock | 122 +++++
README.md | 2 +-
android/.gitignore | 3 +-
android/commons/build.gradle | 12 +-
.../weex/commons/AbstractWeexActivity.java | 2 +-
android/playground/app/build.gradle | 8 +-
.../java/com/alibaba/weex/IndexActivity.java | 204 +++++++
.../java/com/alibaba/weex/SplashActivity.java | 204 +++++++
.../java/com/alibaba/weex/WXApplication.java | 204 +++++++
.../java/com/alibaba/weex/WXBaseActivity.java | 204 +++++++
.../java/com/alibaba/weex/WXDebugActivity.java | 204 +++++++
.../java/com/alibaba/weex/WXPageActivity.java | 204 +++++++
.../com/alibaba/weex/constants/Constants.java | 204 +++++++
.../alibaba/weex/extend/PlayDebugAdapter.java | 204 +++++++
.../extend/adapter/InterceptWXHttpAdapter.java | 204 +++++++
.../alibaba/weex/extend/component/RichText.java | 204 +++++++
.../extend/component/WXComponentSyncTest.java | 204 +++++++
.../weex/extend/module/GeolocationModule.java | 204 +++++++
.../alibaba/weex/extend/module/MyModule.java | 204 +++++++
.../weex/extend/module/RenderModule.java | 204 +++++++
.../weex/extend/module/SyncTestModule.java | 204 +++++++
.../weex/extend/module/WXEventModule.java | 204 +++++++
.../extend/module/location/DefaultLocation.java | 204 +++++++
.../weex/extend/module/location/ILocatable.java | 204 +++++++
.../extend/module/location/LocationFactory.java | 204 +++++++
.../alibaba/weex/https/HotRefreshManager.java | 204 +++++++
.../com/alibaba/weex/https/WXHttpManager.java | 204 +++++++
.../com/alibaba/weex/https/WXHttpResponse.java | 204 +++++++
.../java/com/alibaba/weex/https/WXHttpTask.java | 204 +++++++
.../alibaba/weex/https/WXOkHttpDispatcher.java | 204 +++++++
.../alibaba/weex/https/WXRequestListener.java | 204 +++++++
.../zxing/client/android/CaptureActivity.java | 1 +
.../com.taobao.taobao_2016.11.21_17.35.li | Bin 2415126 -> 0 bytes
android/sdk/assets/main.js | 14 +-
android/sdk/build.gradle | 49 +-
.../main/java/com/taobao/weex/WXSDKEngine.java | 2 +-
.../java/com/taobao/weex/WXSDKInstance.java | 3 +-
.../weex/appfram/pickers/WXPickersModule.java | 8 +-
.../appfram/storage/WXSQLiteOpenHelper.java | 2 -
.../com/taobao/weex/bridge/WXBridgeManager.java | 92 ++--
.../java/com/taobao/weex/common/Constants.java | 14 +-
.../com/taobao/weex/dom/CSSAlignConvert.java | 204 +++++++
.../weex/dom/CSSFlexDirectionConvert.java | 204 +++++++
.../com/taobao/weex/dom/CSSJustifyConvert.java | 204 +++++++
.../taobao/weex/dom/CSSPositionTypeConvert.java | 204 +++++++
.../com/taobao/weex/dom/CSSWrapConvert.java | 204 +++++++
.../main/java/com/taobao/weex/dom/WXAttr.java | 13 +
.../com/taobao/weex/dom/WXCustomStyleSpan.java | 207 +++++++-
.../java/com/taobao/weex/dom/WXDomHandler.java | 2 +-
.../java/com/taobao/weex/dom/WXDomManager.java | 6 +-
.../java/com/taobao/weex/dom/WXDomObject.java | 5 +-
.../main/java/com/taobao/weex/dom/WXStyle.java | 4 +-
.../com/taobao/weex/dom/WXTextDomObject.java | 206 +++++++-
.../com/taobao/weex/ui/WXRenderStatement.java | 14 +-
.../weex/ui/animation/WXAnimationModule.java | 4 +-
.../ui/component/AbstractEditComponent.java | 126 ++++-
.../taobao/weex/ui/component/Scrollable.java | 4 +-
.../taobao/weex/ui/component/WXComponent.java | 18 +-
.../taobao/weex/ui/component/WXScroller.java | 126 ++++-
.../ui/component/list/BasicListComponent.java | 141 ++++-
.../weex/ui/component/pesudo/PesudoStatus.java | 18 +-
.../taobao/weex/ui/module/WXTimerModule.java | 139 +++--
.../taobao/weex/ui/view/WXCircleViewPager.java | 38 +-
.../com/taobao/weex/ui/view/WXScrollView.java | 4 +
.../weex/ui/view/border/BorderDrawable.java | 30 +-
.../taobao/weex/ui/view/border/BorderEdge.java | 6 +-
.../weex/ui/view/border/BorderRadiusType.java | 222 ++++++++
.../view/border/BorderWidthStyleColorType.java | 224 ++++++++
.../listview/ExtendedLinearLayoutManager.java | 256 +++++++++
.../weex/ui/view/listview/WXRecyclerView.java | 3 +-
.../listview/adapter/ListBaseViewHolder.java | 10 +-
.../taobao/weex/utils/WXDataStructureUtil.java | 211 +++++++-
.../main/java/com/taobao/weex/utils/WXHack.java | 527 -------------------
.../ui/component/list/WXListComponentTest.java | 19 +-
.../weex/ui/module/WXTimerModuleTest.java | 151 ++++--
.../weex/ui/view/border/BorderDrawableTest.java | 4 +-
bin/dist-browser.sh | 2 +-
circle.yml | 3 +-
examples/vue/components/slider.vue | 18 +-
examples/vue/components/text.vue | 4 +-
html5/render/vue/components/index.js | 2 +
.../render/vue/components/scrollable/header.js | 49 +-
.../vue/components/scrollable/list/index.js | 6 +-
.../vue/components/scrollable/list/listMixin.js | 26 +
.../vue/components/scrollable/scroller.js | 6 +-
html5/render/vue/components/slider/index.js | 24 +-
html5/render/vue/components/slider/indicator.js | 69 ++-
html5/render/vue/components/text.js | 12 +-
html5/render/vue/env/index.js | 2 +-
html5/render/vue/mixins/style.js | 218 +++++---
html5/render/vue/styles/components.css | 13 +-
ios/playground/Podfile | 2 +-
ios/playground/WeexDemo.app.zip | Bin 0 -> 2561323 bytes
.../WeexDemo.xcodeproj/project.pbxproj | 23 +-
ios/playground/WeexDemo/AppDelegate.m | 6 +
ios/playground/WeexDemo/DemoDefine.h | 4 +-
ios/playground/WeexDemo/Info.plist | 9 +
ios/playground/WeexDemo/UIView+UIThreadCheck.h | 15 +
ios/playground/WeexDemo/UIView+UIThreadCheck.m | 42 ++
ios/playground/WeexDemo/WXDemoViewController.m | 5 +
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 32 +-
.../xcshareddata/xcschemes/WeexSDK.xcscheme | 2 +-
.../xcschemes/WeexSDKTests.xcscheme | 4 +-
.../WeexSDK/Sources/Bridge/WXBridgeContext.h | 5 +
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 11 +-
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 38 ++
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 1 +
.../WeexSDK/Sources/Component/WXCellComponent.h | 1 +
.../WeexSDK/Sources/Component/WXCellComponent.m | 5 +
.../Sources/Component/WXComponent_internal.h | 4 +-
.../Sources/Component/WXImageComponent.m | 2 +-
.../WeexSDK/Sources/Component/WXListComponent.m | 39 +-
.../Sources/Component/WXLoadingComponent.m | 4 +-
.../Sources/Component/WXRefreshComponent.h | 6 +
.../Sources/Component/WXRefreshComponent.m | 22 +-
.../Sources/Component/WXScrollerComponent.m | 69 ++-
.../Sources/Component/WXSliderComponent.m | 73 ++-
.../Sources/Component/WXTextAreaComponent.m | 51 ++
.../WeexSDK/Sources/Component/WXTextComponent.m | 46 ++
.../Sources/Component/WXTextInputComponent.m | 50 +-
ios/sdk/WeexSDK/Sources/Component/WXTransform.h | 15 +-
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 313 ++++++-----
.../Sources/Component/WXVideoComponent.m | 2 +-
.../Sources/Controller/WXBaseViewController.h | 2 +-
.../Sources/Controller/WXRootViewController.h | 2 +-
ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.h | 8 +
ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.m | 52 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h | 9 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 37 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h | 2 +-
.../WeexSDK/Sources/Events/WXComponent+Events.m | 8 +-
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 3 +-
.../WeexSDK/Sources/Manager/WXBridgeManager.h | 23 +-
.../WeexSDK/Sources/Manager/WXBridgeManager.m | 13 +
.../Sources/Manager/WXComponentManager.h | 4 +-
.../Sources/Manager/WXComponentManager.m | 12 +-
ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 7 +-
.../WeexSDK/Sources/Manager/WXServiceFactory.m | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 6 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +-
.../WeexSDK/Sources/Model/WXJSExceptionInfo.h | 60 +++
.../WeexSDK/Sources/Model/WXJSExceptionInfo.m | 39 ++
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h | 19 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 7 +-
.../WeexSDK/Sources/Module/WXAnimationModule.m | 268 +++++++---
.../WeexSDK/Sources/Module/WXClipboardModule.m | 4 +-
ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 53 +-
.../Sources/Module/WXGlobalEventModule.m | 8 +-
.../WeexSDK/Sources/Module/WXModalUIModule.m | 4 +-
.../WeexSDK/Sources/Module/WXNavigatorModule.m | 12 +-
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 34 +-
.../WeexSDK/Sources/Module/WXStorageModule.m | 72 ++-
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 24 +-
.../WeexSDK/Sources/Module/WXWebSocketModule.m | 4 +-
.../Sources/Protocol/WXImgLoaderProtocol.h | 2 +-
.../Sources/Protocol/WXJSExceptionProtocol.h | 21 +
.../Sources/Protocol/WXNavigationProtocol.h | 8 +-
.../Sources/Protocol/WXScrollerProtocol.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXAssert.h | 3 +
ios/sdk/WeexSDK/Sources/Utility/WXConvert.h | 3 +-
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 25 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 3 +-
ios/sdk/WeexSDK/Sources/Utility/WXLength.h | 31 ++
ios/sdk/WeexSDK/Sources/Utility/WXLength.m | 61 +++
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 59 ++-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 121 +++--
.../Sources/View/WXComponent+ViewManagement.m | 18 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 6 +
ios/sdk/WeexSDK/dependency/SRWebSocket.m | 4 +-
ios/sdk/WeexSDKTests/WXComponentTests.m | 2 +-
ios/sdk/WeexSDKTests/WXFloatCompareTests.m | 82 +++
ios/sdk/WeexSDKTests/WXRootViewTests.m | 35 +-
ios/sdk/WeexSDKTests/WXStorageTests.m | 16 +-
ios/sdk/WeexSDKTests/WXStreamModuleTests.m | 30 --
package.json | 4 +
packages/weex-html5/LICENSE | 201 +++++++
packages/weex-html5/NOTICE | 7 +
packages/weex-html5/README.md | 158 ++++++
packages/weex-html5/demo/build/index.js | 111 ++++
packages/weex-html5/demo/index.we | 29 +
packages/weex-html5/index.html | 57 ++
packages/weex-html5/package.json | 23 +
test/ci-funcs.sh | 110 ++++
test/mocha.opts | 2 +
test/pages/components/input.we | 0
test/pages/dom-operation.we | 32 ++
test/pages/list-scroll.we | 31 ++
test/pages/scroller-scroll.we | 31 ++
test/run.sh | 47 +-
test/scripts/components/scroll-event.test.js | 92 ++++
test/scripts/dom.test.js | 73 +++
test/scripts/index.test.js | 46 +-
test/scripts/test.js | 1 -
test/scripts/util.js | 57 ++
test/scripts/weex-node-map.js | 17 -
test/scripts/weex.js | 129 -----
201 files changed, 11546 insertions(+), 1686 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/27965734/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/27965734/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/27965734/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/27965734/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/27965734/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
diff --cc android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index b7562aa,8b7b970..cd7a11b
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@@ -225,8 -225,10 +225,9 @@@ public abstract class WXComponent<T ex
private Set<String> mAppendEvents = new HashSet<>();
private WXAnimationModule.AnimationHolder mAnimationHolder;
private PesudoStatus mPesudoStatus = new PesudoStatus();
- private boolean mIsDestoryed = false;
+ private boolean mIsDestroyed = false;
+ private boolean mCanRecycled = true;
-
//Holding the animation bean when component is uninitialized
public void postAnimation(WXAnimationModule.AnimationHolder holder) {
this.mAnimationHolder = holder;
@@@ -1460,6 -1463,10 +1462,10 @@@
return mStickyOffset;
}
+ public boolean canRecycled(){
+ return mCanRecycled;
+ }
-
++
/**
* Sets the offset for the sticky
* @param stickyOffset child[y]-parent[y]
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/27965734/ios/playground/WeexDemo.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --cc ios/playground/WeexDemo.xcodeproj/project.pbxproj
index c88f61e,6db9e16..5fb8ccb
--- a/ios/playground/WeexDemo.xcodeproj/project.pbxproj
+++ b/ios/playground/WeexDemo.xcodeproj/project.pbxproj
@@@ -449,10 -453,9 +454,10 @@@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "myFile=\"XcodeCoverage/exportenv.sh\"\n\nif [ -f \"$myFile\" ]; then\nXcodeCoverage/exportenv.sh\nfi";
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexDemo/Pods-WeexDemo-resources.sh\"\n";
+ showEnvVarsInLog = 0;
};
- 567369891CE436EB000A646C /* ShellScript */ = {
+ 685399B3421CD1410375A2AD /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/27965734/ios/playground/WeexDemo/Info.plist
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/27965734/package.json
----------------------------------------------------------------------
diff --cc package.json
index f3ee3a5,598ded6..ae91688
--- a/package.json
+++ b/package.json
@@@ -87,7 -87,8 +87,8 @@@
"semver": "^5.1.0",
"weex-components": "^0.2.0",
"weex-picker": "^0.1.0",
- "weex-rax-framework": "0.1.0",
+ "weex-rax-framework": "0.1.7",
+ "weex-styler":"0.1.8",
"weex-vue-framework": "2.1.8-weex.1"
},
"devDependencies": {