You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/09 08:16:10 UTC
[1/8] incubator-weex git commit: * [ios] bugfix for loading local font
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev 18aa26514 -> 8ea7df013
* [ios] bugfix for loading local font
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e6e72835
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e6e72835
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e6e72835
Branch: refs/heads/0.11-dev
Commit: e6e72835596e05229b98baf412ed0d8e1941f402
Parents: fa1741e
Author: acton393 <zh...@gmail.com>
Authored: Tue Mar 7 21:20:48 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Mar 7 21:20:48 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e6e72835/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
index 6dad053..12677e3 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
@@ -392,7 +392,7 @@ static BOOL WXNotStat;
if ([url isFileURL]) {
// local file url
NSError * error = nil;
- if (![WXUtility isFileExist:url.absoluteString]) {
+ if (![WXUtility isFileExist:url.path]) {
error = [NSError errorWithDomain:WX_ERROR_DOMAIN code:-1 userInfo:@{@"errMsg":[NSString stringWithFormat:@"local font %@ is't exist", url.absoluteString]}];
}
completionBlock(url, error);
@@ -430,7 +430,6 @@ static BOOL WXNotStat;
+ (BOOL)isFileExist:(NSString *)filePath
{
-
return [[NSFileManager defaultManager] fileExistsAtPath:filePath];
}
[4/8] incubator-weex git commit: * [ios] Fix issue that [view
setTransform:] not working after animation * all CABasicAnimaitions should be
removed when animation stops,
otherwise it will affect view or layer's transform property * test demo:
http://
Posted by cx...@apache.org.
* [ios] Fix issue that [view setTransform:] not working after animation
* all CABasicAnimaitions should be removed when animation stops, otherwise it will affect view or layer's transform property
* test demo: http://dotwe.org/weex/6a0695ca46f6abfe9638eb391aac729c
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/92802970
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/92802970
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/92802970
Branch: refs/heads/0.11-dev
Commit: 928029703f3984aad956e60ba8e72200798869ee
Parents: 9a4ff8f
Author: \u9690\u98ce <cx...@apache.org>
Authored: Thu Mar 9 15:19:33 2017 +0800
Committer: \u9690\u98ce <cx...@apache.org>
Committed: Thu Mar 9 15:19:33 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/92802970/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
index 404402e..4527979 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
@@ -89,6 +89,12 @@
- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag
{
+ if (!_animationInfo.target) {
+ return;
+ }
+
+ [_animationInfo.target.layer removeAllAnimations];
+
if (_finishBlock) {
_finishBlock(flag);
}
[3/8] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Posted by cx...@apache.org.
Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-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/430cf12d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/430cf12d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/430cf12d
Branch: refs/heads/0.11-dev
Commit: 430cf12d0c699b60e4e96ccb870204f8c1d6e4d6
Parents: 2a8183e a291232
Author: acton393 <zh...@gmail.com>
Authored: Wed Mar 8 15:01:43 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Mar 8 15:01:43 2017 +0800
----------------------------------------------------------------------
android/sdk/build.gradle | 21 +++---
android/sdk/libs/armeabi/libweexv8.so | Bin 3583820 -> 3583820 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4340864 -> 4340864 bytes
.../java/com/taobao/weex/WXSDKInstance.java | 8 +-
.../java/com/taobao/weex/common/WXThread.java | 9 +++
.../com/taobao/weex/dom/ImmutableDomObject.java | 4 +
.../java/com/taobao/weex/dom/WXDomObject.java | 4 +
.../weex/ui/animation/WXAnimationModule.java | 16 ++--
.../taobao/weex/ui/component/WXComponent.java | 8 +-
.../com/taobao/weex/ui/component/WXEmbed.java | 3 +
.../taobao/weex/ui/component/WXScroller.java | 20 ++---
.../taobao/weex/ui/component/WXVContainer.java | 3 +-
.../ui/component/helper/WXStickyHelper.java | 11 +--
.../ui/component/list/BasicListComponent.java | 41 +++++++----
.../ui/component/list/ListComponentView.java | 1 +
.../ui/component/list/SimpleRecyclerView.java | 5 ++
.../com/taobao/weex/ui/view/WXScrollView.java | 4 +-
.../refresh/wrapper/BounceRecyclerView.java | 10 ++-
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 9 ++-
examples/vue/components/waterfall.vue | 8 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 18 ++---
.../Component/Recycler/WXRecyclerComponent.m | 73 +++++++++++++++++--
.../Recycler/WXRecyclerUpdateController.m | 15 ++--
.../WeexSDK/Sources/Component/WXListComponent.m | 69 +++++++++++++++---
package.json | 2 +-
test/README.md | 3 +-
test/pages/components/scroller-fixed.we | 62 ++++++++++++++++
test/scripts/components/scroller-fixed.test.js | 39 ++++++++++
28 files changed, 362 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
[7/8] incubator-weex git commit: Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-dev
Posted by cx...@apache.org.
Merge branch '0.11-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-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/35d51d1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/35d51d1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/35d51d1e
Branch: refs/heads/0.11-dev
Commit: 35d51d1eb8a7a4c29698a51b8169dfedc6336e19
Parents: 2ade599 18aa265
Author: cxfeng <cx...@apache.org>
Authored: Thu Mar 9 16:15:30 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Thu Mar 9 16:15:30 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/bridge/WXBridgeManager.java | 53 ++++++++++++++------
1 file changed, 37 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[5/8] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Posted by cx...@apache.org.
Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-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/4cd60541
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4cd60541
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4cd60541
Branch: refs/heads/0.11-dev
Commit: 4cd60541a6f6a433ef129ddc4e2f011f4d7af4ce
Parents: 430cf12 18aa265
Author: acton393 <zh...@gmail.com>
Authored: Thu Mar 9 15:57:15 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Mar 9 15:57:15 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/bridge/WXBridgeManager.java | 53 ++++++++++++++------
.../xcshareddata/xcschemes/WeexDemo.xcscheme | 2 +-
.../Sources/Display/WXComponent+BoxShadow.h | 5 +-
.../Sources/Display/WXComponent+BoxShadow.m | 22 ++++----
.../WeexSDK/Sources/Events/WXComponent+Events.m | 4 ++
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 10 ++--
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +-
.../Sources/View/WXComponent+ViewManagement.m | 2 +
package.json | 2 +-
9 files changed, 65 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
[2/8] incubator-weex git commit: * [ios] fix font load bug
Posted by cx...@apache.org.
* [ios] fix font load bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2a8183ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2a8183ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2a8183ec
Branch: refs/heads/0.11-dev
Commit: 2a8183ec0ff42fccbc02870bc1eb148ab35f5b2c
Parents: e6e7283
Author: acton393 <zh...@gmail.com>
Authored: Wed Mar 8 11:55:38 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Mar 8 11:55:38 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2a8183ec/ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m
index 4bc94fd..5f73628 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m
@@ -104,7 +104,10 @@ static WXRuleManager *_sharedInstance = nil;
// load success
NSMutableDictionary * dictForFontFamily = [weakSelf.fontStorage objectForKey:rule[@"fontFamily"]];
NSString *fontSrc = [dictForFontFamily objectForKey:@"tempSrc"];
- [dictForFontFamily setObject:fontSrc forKey:@"src"];
+ if (fontSrc) {
+ // only remote font will be mark as tempSrc
+ [dictForFontFamily setObject:fontSrc forKey:@"src"];
+ }
[dictForFontFamily setObject:url forKey:@"localSrc"];
[[NSNotificationCenter defaultCenter] postNotificationName:WX_ICONFONT_DOWNLOAD_NOTIFICATION object:nil userInfo:@{@"fontFamily":rule[@"fontFamily"]}];
[6/8] incubator-weex git commit: Merge branch '0.11-dev' of
https://github.com/cxfeng1/incubator-weex into 0.11-dev
Posted by cx...@apache.org.
Merge branch '0.11-dev' of https://github.com/cxfeng1/incubator-weex into 0.11-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/2ade5998
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2ade5998
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2ade5998
Branch: refs/heads/0.11-dev
Commit: 2ade59984f8e259cc0f09445b43e858405debdbd
Parents: 72c7ee1 9280297
Author: cxfeng <cx...@apache.org>
Authored: Thu Mar 9 16:15:23 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Thu Mar 9 16:15:23 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
[8/8] incubator-weex git commit: Merge branch '0.11-dev' of
https://github.com/acton393/incubator-weex into 0.11-dev
Posted by cx...@apache.org.
Merge branch '0.11-dev' of https://github.com/acton393/incubator-weex into 0.11-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/8ea7df01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8ea7df01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8ea7df01
Branch: refs/heads/0.11-dev
Commit: 8ea7df013b0e81b4c6160193ee5fdbc2b5f31d2c
Parents: 35d51d1 4cd6054
Author: cxfeng <cx...@apache.org>
Authored: Thu Mar 9 16:15:39 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Thu Mar 9 16:15:39 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 5 ++++-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 3 +--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------