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/04/21 10:23:35 UTC
[1/6] incubator-weex git commit: * [ios] add search Path for
WeexSDK.podspec
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev bdec7b5d5 -> 536beb0ad
* [ios] add search Path for WeexSDK.podspec
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a3f86df6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a3f86df6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a3f86df6
Branch: refs/heads/0.12-dev
Commit: a3f86df67e104cbb1f1a1267b1b79d4fb4e718c8
Parents: 8b9cf60
Author: acton393 <zh...@gmail.com>
Authored: Thu Apr 20 17:16:49 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Apr 20 17:16:49 2017 +0800
----------------------------------------------------------------------
WeexSDK.podspec | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a3f86df6/WeexSDK.podspec
----------------------------------------------------------------------
diff --git a/WeexSDK.podspec b/WeexSDK.podspec
index ae1b6a9..cb94313 100644
--- a/WeexSDK.podspec
+++ b/WeexSDK.podspec
@@ -30,6 +30,7 @@ Pod::Spec.new do |s|
s.source_files = 'ios/sdk/WeexSDK/Sources/**/*.{h,m,mm,c}'
s.resources = 'ios/sdk/WeexSDK/Resources/main.js', 'ios/sdk/WeexSDK/Resources/wx_load_error@3x.png'
+ s.user_target_xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => "'$(PODS_ROOT)/WeexSDK'" }
s.requires_arc = true
s.prefix_header_file = 'ios/sdk/WeexSDK/Sources/Supporting Files/WeexSDK-Prefix.pch'
[4/6] incubator-weex git commit: * [ios] protect nil object in array
Posted by cx...@apache.org.
* [ios] protect nil object in array
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fee493bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fee493bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fee493bc
Branch: refs/heads/0.12-dev
Commit: fee493bcd26c7c91b0c42b9b842079e6598145f0
Parents: c4afacb
Author: acton393 <zh...@gmail.com>
Authored: Fri Apr 21 16:32:21 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Apr 21 16:32:21 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fee493bc/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
index add07dd..e1a9d54 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
@@ -823,6 +823,9 @@
- (void)_deleteTableViewCellAtIndexPath:(NSIndexPath *)indexPath keepScrollPosition:(BOOL)keepScrollPosition animation:(UITableViewRowAnimation)animation
{
+ if (!indexPath) {
+ return ;
+ }
[self _performUpdates:^{
[_tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:animation];
} withKeepScrollPosition:keepScrollPosition adjustmentBlock:^CGFloat(NSIndexPath *top) {
[6/6] incubator-weex git commit: Merge branch '0.12-dev' of
https://github.com/acton393/incubator-weex into 0.12-dev
Posted by cx...@apache.org.
Merge branch '0.12-dev' of https://github.com/acton393/incubator-weex into 0.12-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/536beb0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/536beb0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/536beb0a
Branch: refs/heads/0.12-dev
Commit: 536beb0adbae31175b4acb483e061abb8fcf2574
Parents: bdec7b5 7bde63a
Author: cxfeng <cx...@apache.org>
Authored: Fri Apr 21 18:23:18 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Fri Apr 21 18:23:18 2017 +0800
----------------------------------------------------------------------
WeexSDK.podspec | 1 +
ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 5 ++++-
ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m | 7 +++++--
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 4 ++--
4 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/6] incubator-weex git commit: * [ios] fix compiler complains about
format data
Posted by cx...@apache.org.
* [ios] fix compiler complains about format data
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0eba2ead
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0eba2ead
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0eba2ead
Branch: refs/heads/0.12-dev
Commit: 0eba2ead7d4a853e714f814c341a1abce524e904
Parents: a3f86df
Author: acton393 <zh...@gmail.com>
Authored: Fri Apr 21 10:32:34 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Apr 21 10:32:34 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0eba2ead/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
index 99f6f54..add07dd 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
@@ -283,7 +283,7 @@
[_completedSections insertObject:completedInsertSection atIndex:insertIndex];
if (completedReloadSection) {
- WXLogDebug(@"Reload section:%u", insertIndex - 1);
+ WXLogDebug(@"Reload section:%lu", insertIndex - 1);
_completedSections[insertIndex - 1] = completedReloadSection;
}
[5/6] incubator-weex git commit: * [ios] protect crash when access
nil address
Posted by cx...@apache.org.
* [ios] protect crash when access nil address
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7bde63a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7bde63a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7bde63a1
Branch: refs/heads/0.12-dev
Commit: 7bde63a190376363b2cc13ef35b3daded0c930c2
Parents: fee493b
Author: acton393 <zh...@gmail.com>
Authored: Fri Apr 21 17:29:31 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Apr 21 17:29:31 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7bde63a1/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
index 2ebc098..b4a29e3 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
@@ -220,8 +220,11 @@ static css_node_t * rootNodeGetChild(void *context, int i)
- (void)_recursivelyAddComponent:(NSDictionary *)componentData toSupercomponent:(WXComponent *)supercomponent atIndex:(NSInteger)index appendingInTree:(BOOL)appendingInTree
{
WXComponent *component = [self _buildComponentForData:componentData];
-
- index = (index == -1 ? supercomponent->_subcomponents.count : index);
+ if (!supercomponent.subcomponents) {
+ index = 0;
+ } else {
+ index = (index == -1 ? supercomponent->_subcomponents.count : index);
+ }
[supercomponent _insertSubcomponent:component atIndex:index];
// use _lazyCreateView to forbid component like cell's view creating
[3/6] incubator-weex git commit: * [ios] fix warnnings
Posted by cx...@apache.org.
* [ios] fix warnnings
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c4afacb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c4afacb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c4afacb1
Branch: refs/heads/0.12-dev
Commit: c4afacb13c2ffbd8c6a575b767aa7da3cacc0da1
Parents: 0eba2ea
Author: acton393 <zh...@gmail.com>
Authored: Fri Apr 21 10:47:53 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Apr 21 10:47:53 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c4afacb1/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h
index 39c4034..0644c9a 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h
@@ -388,8 +388,8 @@ CGPoint WXPixelPointResize(CGPoint value) DEPRECATED_MSG_ATTRIBUTE("Use WXPixelS
/**
@discusstion parse gradient-color string to a dictionary, then you can get gradientLayer from @see gradientLayerFromColors:colors:locations:frame:locations
- @param a linear-gradient string like linear-gradient(to right, #a80077,rgba(200, 54, 54, 0.5))
- @return A dictionary with endColor, startColor and gradientType value
+ @param backgroundImage linear-gradient string like linear-gradient(to right, #a80077,rgba(200, 54, 54, 0.5))
+ @return dictionary with endColor, startColor and gradientType value
@code
NSDictionary * linearGradient = [self linearGradientWithBackgroundImage:@"linear-gradient(to right, #a80077,rgba(200, 54, 54, 0.5))"];
CAGradientLayer * gradientLayer = [self gradientLayerFromColors:@[linearGradient[@"startColor"], linearGradient[@"endColor"]],nil,bounds,[linearGradient[@"gradientType"] integerValue]];