You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by bo...@apache.org on 2017/08/01 10:00:59 UTC
[1/3] incubator-weex git commit: * [ios] add notification for
instance will render
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev a877605be -> e20cdcb11
* [ios] add notification for instance will render
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c7c879ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c7c879ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c7c879ed
Branch: refs/heads/0.16-dev
Commit: c7c879ed7b8208563ddcdc7a43e0708ee333a34f
Parents: a54bcb9
Author: acton393 <zh...@gmail.com>
Authored: Thu Jul 27 19:47:16 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Jul 27 19:47:16 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 7 ++++---
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c7c879ed/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index c527ae1..07b2fe8 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -199,6 +199,7 @@ typedef enum : NSUInteger {
});
// ensure default modules/components/handlers are ready before create instance
[WXSDKEngine registerDefaults];
+ [[NSNotificationCenter defaultCenter] postNotificationName:WX_SDKINSTANCE_WILL_RENDER object:self];
[self _handleConfigCenter];
@@ -246,9 +247,9 @@ typedef enum : NSUInteger {
}
_options = [newOptions copy];
- if (!self.pageName || [self.pageName isEqualToString:@""]) {
- self.pageName = url.absoluteString ? : @"";
- }
+// if (!self.pageName || [self.pageName isEqualToString:@""]) {
+// self.pageName = url.absoluteString ? : @"";
+// }
request.userAgent = [WXUtility userAgent];
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c7c879ed/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h b/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h
index 5120fcd..6fd5781 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h
@@ -81,6 +81,8 @@ parts = [parts subarrayWithRange:(NSRange){0, parts.count - 1}];\
#define WX_COMPONENT_NOTIFICATION_VIEW_LOADED @"WXComponentViewLoaded"
+#define WX_SDKINSTANCE_WILL_RENDER @"WXSDKInstanceWillRender"
+
#define WX_COMPONENT_THREAD_NAME @"com.taobao.weex.component"
#define WX_BRIDGE_THREAD_NAME @"com.taobao.weex.bridge"
[3/3] incubator-weex git commit: * [ios] remove unused
Posted by bo...@apache.org.
* [ios] remove unused
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e20cdcb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e20cdcb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e20cdcb1
Branch: refs/heads/0.16-dev
Commit: e20cdcb11d73334cd23087966c7ada58c0f3dd1d
Parents: 73fe039
Author: acton393 <zh...@gmail.com>
Authored: Tue Aug 1 17:46:17 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Aug 1 17:46:17 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e20cdcb1/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index 07b2fe8..ea4ed7a 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -247,9 +247,9 @@ typedef enum : NSUInteger {
}
_options = [newOptions copy];
-// if (!self.pageName || [self.pageName isEqualToString:@""]) {
-// self.pageName = url.absoluteString ? : @"";
-// }
+ if (!self.pageName || [self.pageName isEqualToString:@""]) {
+ self.pageName = url.absoluteString ? : @"";
+ }
request.userAgent = [WXUtility userAgent];
[2/3] incubator-weex git commit: Merge branch '0.16-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into
ios-feature-notification-instance-render
Posted by bo...@apache.org.
Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-feature-notification-instance-render
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/73fe039c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/73fe039c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/73fe039c
Branch: refs/heads/0.16-dev
Commit: 73fe039c7aabd8c8ef25d1d42a072ea72096538d
Parents: c7c879e a877605
Author: acton393 <zh...@gmail.com>
Authored: Tue Aug 1 17:43:45 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Aug 1 17:43:45 2017 +0800
----------------------------------------------------------------------
.gitignore | 3 +
.../java/com/alibaba/weex/IndexActivity.java | 14 +
.../java/com/taobao/weex/WXSDKInstance.java | 11 +-
.../main/java/com/taobao/weex/WXSDKManager.java | 10 +
.../taobao/weex/common/WXWorkThreadManager.java | 48 ++
.../com/taobao/weex/ui/component/WXImage.java | 68 +++
.../ui/component/list/BasicListComponent.java | 15 +-
.../taobao/weex/utils/WXViewToImageUtil.java | 151 +++++
build/build.js | 105 +++-
build/config.js | 37 +-
dangerfile.js | 79 ++-
entry.js | 11 +
examples/vue/index.vue | 1 +
examples/vue/modules/picker.vue | 97 ++++
html5/render/vue/README.md | 77 +++
html5/render/vue/components/a.js | 90 +--
html5/render/vue/components/div.js | 43 +-
html5/render/vue/components/image.js | 18 +-
html5/render/vue/components/index.js | 37 +-
html5/render/vue/components/input.js | 130 +++--
html5/render/vue/components/scrollable/cell.js | 39 ++
.../render/vue/components/scrollable/header.js | 102 ++--
html5/render/vue/components/scrollable/index.js | 48 ++
html5/render/vue/components/scrollable/list.js | 82 +++
.../vue/components/scrollable/list/cell.js | 36 --
.../vue/components/scrollable/list/index.js | 77 ---
.../vue/components/scrollable/list/listMixin.js | 47 --
.../vue/components/scrollable/list/style.js | 34 --
.../components/scrollable/loading-indicator.js | 17 +-
.../render/vue/components/scrollable/loading.js | 141 ++---
.../vue/components/scrollable/mixins/index.js | 26 +
.../vue/components/scrollable/mixins/list.js | 46 ++
.../components/scrollable/mixins/scrollable.js | 267 +++++++++
.../render/vue/components/scrollable/refresh.js | 157 ++---
.../vue/components/scrollable/scroller.js | 135 +++--
.../render/vue/components/scrollable/style.css | 85 +++
.../vue/components/scrollable/waterfall.js | 573 ++++++++++---------
html5/render/vue/components/slider/index.js | 52 +-
html5/render/vue/components/slider/indicator.js | 18 +-
.../render/vue/components/slider/slideMixin.js | 46 +-
.../vue/components/slider/slider-neighbor.js | 12 +-
html5/render/vue/components/slider/slider.css | 19 +
html5/render/vue/components/slider/slider.js | 75 +++
html5/render/vue/components/switch.js | 114 ++--
html5/render/vue/components/text.js | 52 +-
html5/render/vue/components/textarea.js | 104 ++--
html5/render/vue/components/video.js | 107 ++--
html5/render/vue/components/web.js | 98 ++--
html5/render/vue/core/style.js | 35 --
html5/render/vue/env/global.js | 6 +
html5/render/vue/env/index.js | 5 -
html5/render/vue/index.js | 25 -
html5/render/vue/mixins/base.js | 71 ---
html5/render/vue/mixins/index.js | 2 -
html5/render/vue/mixins/scrollable.js | 233 --------
html5/render/vue/mixins/style.js | 4 +-
html5/render/vue/modules/animation.js | 36 +-
html5/render/vue/modules/dom.js | 21 +-
html5/render/vue/modules/globalEvent.js | 8 +-
html5/render/vue/modules/index.js | 36 +-
html5/render/vue/modules/navigator.js | 10 +-
html5/render/vue/modules/webview.js | 18 +-
html5/render/vue/styles/base.css | 86 +--
html5/render/vue/styles/reset.css | 19 +
html5/render/vue/utils/lazyload.js | 24 +-
html5/render/vue/utils/perf.js | 283 +--------
html5/test/render/vue/components/list.js | 2 +-
html5/test/render/vue/components/switch.js | 5 +-
html5/test/render/vue/examples/list-cell.js | 2 +-
html5/test/render/vue/helper/index.js | 2 +-
html5/test/render/vue/helper/main.js | 3 +-
html5/test/render/vue/helper/utils.js | 4 +
html5/test/render/vue/modules/animation.js | 12 +-
html5/test/render/vue/modules/dom.js | 10 +-
html5/test/render/vue/modules/globalEvent.js | 8 +-
html5/test/render/vue/modules/navigator.js | 8 +-
html5/test/render/vue/modules/webview.js | 10 +-
html5/test/render/vue/utils/lazyload.js | 59 +-
html5/test/render/vue/utils/perf.js | 94 +--
html5/test/render/vue/utils/style.js | 50 +-
ios/playground/WeexDemo/Info.plist | 4 +
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 4 +
.../WeexSDK/Sources/Component/WXAComponent.m | 1 +
.../Sources/Component/WXImageComponent.m | 90 ++-
.../Sources/Component/WXVideoComponent.m | 1 +
.../WeexSDK/Sources/Component/WXWebComponent.m | 1 +
ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 1 +
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 1 +
.../WeexSDK/Sources/Module/WXWebSocketModule.h | 1 -
.../WeexSDK/Sources/Module/WXWebSocketModule.m | 1 +
.../Sources/Protocol/WXURLRewriteProtocol.h | 2 +-
package.json | 19 +-
packages/weex-vue-plugins/weex-vue-a/README.md | 3 +
.../weex-vue-plugins/weex-vue-a/package.json | 26 +
.../weex-vue-plugins/weex-vue-a/src/index.js | 2 +
.../weex-vue-animation/README.md | 3 +
.../weex-vue-animation/package.json | 27 +
.../weex-vue-animation/src/index.js | 2 +
.../weex-vue-clipboard/README.md | 3 +
.../weex-vue-clipboard/package.json | 27 +
.../weex-vue-clipboard/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-dom/README.md | 3 +
.../weex-vue-plugins/weex-vue-dom/package.json | 27 +
.../weex-vue-plugins/weex-vue-dom/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-event/README.md | 3 +
.../weex-vue-event/package.json | 27 +
.../weex-vue-event/src/index.js | 2 +
.../weex-vue-geolocation/README.md | 3 +
.../weex-vue-geolocation/package.json | 27 +
.../weex-vue-geolocation/src/index.js | 2 +
.../weex-vue-global-event/README.md | 3 +
.../weex-vue-global-event/package.json | 27 +
.../weex-vue-global-event/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-input/README.md | 3 +
.../weex-vue-input/package.json | 26 +
.../weex-vue-input/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-modal/README.md | 3 +
.../weex-vue-modal/package.json | 27 +
.../weex-vue-modal/src/index.js | 2 +
.../weex-vue-navigator/README.md | 3 +
.../weex-vue-navigator/package.json | 27 +
.../weex-vue-navigator/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-slider/README.md | 3 +
.../weex-vue-slider/package.json | 27 +
.../weex-vue-slider/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-storage/README.md | 3 +
.../weex-vue-storage/package.json | 27 +
.../weex-vue-storage/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-stream/README.md | 3 +
.../weex-vue-stream/package.json | 27 +
.../weex-vue-stream/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-switch/README.md | 3 +
.../weex-vue-switch/package.json | 26 +
.../weex-vue-switch/src/index.js | 2 +
.../weex-vue-textarea/.DS_Store | Bin 0 -> 6148 bytes
.../weex-vue-textarea/README.md | 3 +
.../weex-vue-textarea/package.json | 26 +
.../weex-vue-textarea/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-video/README.md | 3 +
.../weex-vue-video/package.json | 26 +
.../weex-vue-video/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-web/README.md | 3 +
.../weex-vue-plugins/weex-vue-web/package.json | 26 +
.../weex-vue-plugins/weex-vue-web/src/index.js | 2 +
.../weex-vue-websocket/README.md | 3 +
.../weex-vue-websocket/package.json | 27 +
.../weex-vue-websocket/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-webview/README.md | 3 +
.../weex-vue-webview/package.json | 27 +
.../weex-vue-webview/src/index.js | 2 +
packages/weex-vue-render/README.md | 77 +++
packages/weex-vue-render/package.json | 9 +-
packages/weex-vue-render/src/index.core.js | 13 +
packages/weex-vue-render/src/index.js | 12 +
scripts/dist-vue.sh | 2 +-
test/pages/image-onload.vue | 14 +-
test/scripts/components/image-onload.test.js | 10 +
vue.html | 8 +-
158 files changed, 3511 insertions(+), 2207 deletions(-)
----------------------------------------------------------------------