You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/07/29 02:59:15 UTC
[01/11] incubator-weex git commit: * [ios] compatile iOS 11 and add
permission for weex playground description
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev 53edff05b -> 5951404d8
* [ios] compatile iOS 11 and add permission for weex playground description
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5a3bac36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5a3bac36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5a3bac36
Branch: refs/heads/0.16-dev
Commit: 5a3bac36c7185007f41a51e34db25af8814943e3
Parents: 495fc6b
Author: acton393 <zh...@gmail.com>
Authored: Fri Jul 28 15:30:16 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Jul 28 15:30:16 2017 +0800
----------------------------------------------------------------------
ios/playground/WeexDemo/Info.plist | 4 ++++
ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m | 14 ++++++++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5a3bac36/ios/playground/WeexDemo/Info.plist
----------------------------------------------------------------------
diff --git a/ios/playground/WeexDemo/Info.plist b/ios/playground/WeexDemo/Info.plist
index 12ee186..85b4fce 100644
--- a/ios/playground/WeexDemo/Info.plist
+++ b/ios/playground/WeexDemo/Info.plist
@@ -93,5 +93,9 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
+ <key>NSPhotoLibraryAddUsageDescription</key>
+ <string>$(PRODUCT_NAME) needs access your photo Album</string>
+ <key>NSPhotoLibraryUsageDescription</key>
+ <string>$(PRODUCT_NAME) needs access your photo Album</string>
</dict>
</plist>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5a3bac36/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
index c880a60..6ce6094 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
@@ -130,8 +130,18 @@ WX_EXPORT_METHOD(@selector(save:))
@"errorDesc": @"This maybe crash above iOS 10 because it attempted to access privacy-sensitive data without a usage description. The app's Info.plist must contain an NSPhotoLibraryUsageDescription key with a string value explaining to the user how the app uses this data."
});
}
- if (WX_SYS_VERSION_GREATER_THAN_OR_EQUAL_TO(@"10.0")) {
- // if the iOS version is above 10.0, this operation will skip
+ return ;
+ }
+
+ // iOS 11 needs a NSPhotoLibraryUsageDescription key for permission
+ if (WX_SYS_VERSION_GREATER_THAN_OR_EQUAL_TO(@"11.0")) {
+ if (!info[@"NSPhotoLibraryUsageDescription"]) {
+ if (resultCallback) {
+ resultCallback(@{
+ @"success" : @(false),
+ @"errorDesc": @"This maybe crash above iOS 10 because it attempted to access privacy-sensitive data without a usage description. The app's Info.plist must contain an NSPhotoLibraryUsageDescription key with a string value explaining to the user how the app uses this data."
+ });
+ }
return;
}
}
[06/11] incubator-weex git commit: Merge branch '0.16-dev' into
0.16-dev
Posted by ac...@apache.org.
Merge branch '0.16-dev' 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/37371e7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/37371e7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/37371e7a
Branch: refs/heads/0.16-dev
Commit: 37371e7ae8c40d23981dcd17adf8253438b193f3
Parents: cea16e2 b11c4e1
Author: acton393 <ac...@users.noreply.github.com>
Authored: Fri Jul 28 17:42:19 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Fri Jul 28 17:42:19 2017 +0800
----------------------------------------------------------------------
.gitignore | 3 +
build/build.js | 105 +++-
build/config.js | 37 +-
dangerfile.js | 36 +-
entry.js | 11 +
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 +-
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 +-
vue.html | 8 +-
136 files changed, 2953 insertions(+), 2176 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/37371e7a/dangerfile.js
----------------------------------------------------------------------
diff --cc dangerfile.js
index 79a7f55,fed5a9b..e93dc14
--- a/dangerfile.js
+++ b/dangerfile.js
@@@ -324,19 -315,25 +325,26 @@@ function getContent(url)
return new Promise((resolve, reject) => {
// select http or https module, depending on reqested url
const lib = url.startsWith('https') ? require('https') : require('http');
- const request = lib.get(url, (response) => {
- // handle http errors
- console.log('response:', response.statusCode)
- if (response.statusCode < 200 || response.statusCode > 299) {
- reject(new Error('Failed to load page, status code: ' + response.statusCode));
- }
- // temporary data holder
- const body = [];
- // on every content chunk, push it to the data array
- response.on('data', (chunk) => body.push(chunk));
- // we are done, resolve promise with those joined chunks
- response.on('end', () => resolve(body.join('')));
- });
+ const request = lib.get(url, (function (url) {
+ return (response) => {
+ // handle http errors
++ console.log('response:', response.statusCode)
+ if (response.statusCode < 200 || response.statusCode > 299) {
+ if (response.statusCode === 404) {
+ // ignore this, probably a renamed file.
+ return resolve('')
+ }
+ reject(new Error('Failed to load page, status code: ' + response.statusCode + ', '
+ + ' url: ' + url));
+ }
+ // temporary data holder
+ const body = [];
+ // on every content chunk, push it to the data array
+ response.on('data', (chunk) => body.push(chunk));
+ // we are done, resolve promise with those joined chunks
+ response.on('end', () => resolve(body.join('')));
+ }
+ })(url));
// handle connection errors of the request
request.on('error', (err) => reject(err))
})
[07/11] 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 ac...@apache.org.
Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.16-dev
# Conflicts:
# dangerfile.js
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9750cff8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9750cff8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9750cff8
Branch: refs/heads/0.16-dev
Commit: 9750cff8b5230f8d22e2f4883e1abad8f4fbc5e8
Parents: cea16e2 b11c4e1
Author: acton393 <zh...@gmail.com>
Authored: Fri Jul 28 17:48:35 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Jul 28 17:48:35 2017 +0800
----------------------------------------------------------------------
.gitignore | 3 +
build/build.js | 105 +++-
build/config.js | 37 +-
dangerfile.js | 36 +-
entry.js | 11 +
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 +-
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 +-
vue.html | 8 +-
136 files changed, 2953 insertions(+), 2176 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9750cff8/dangerfile.js
----------------------------------------------------------------------
diff --cc dangerfile.js
index 79a7f55,fed5a9b..e93dc14
--- a/dangerfile.js
+++ b/dangerfile.js
@@@ -324,19 -315,25 +325,26 @@@ function getContent(url)
return new Promise((resolve, reject) => {
// select http or https module, depending on reqested url
const lib = url.startsWith('https') ? require('https') : require('http');
- const request = lib.get(url, (response) => {
- // handle http errors
- console.log('response:', response.statusCode)
- if (response.statusCode < 200 || response.statusCode > 299) {
- reject(new Error('Failed to load page, status code: ' + response.statusCode));
- }
- // temporary data holder
- const body = [];
- // on every content chunk, push it to the data array
- response.on('data', (chunk) => body.push(chunk));
- // we are done, resolve promise with those joined chunks
- response.on('end', () => resolve(body.join('')));
- });
+ const request = lib.get(url, (function (url) {
+ return (response) => {
+ // handle http errors
++ console.log('response:', response.statusCode)
+ if (response.statusCode < 200 || response.statusCode > 299) {
+ if (response.statusCode === 404) {
+ // ignore this, probably a renamed file.
+ return resolve('')
+ }
+ reject(new Error('Failed to load page, status code: ' + response.statusCode + ', '
+ + ' url: ' + url));
+ }
+ // temporary data holder
+ const body = [];
+ // on every content chunk, push it to the data array
+ response.on('data', (chunk) => body.push(chunk));
+ // we are done, resolve promise with those joined chunks
+ response.on('end', () => resolve(body.join('')));
+ }
+ })(url));
// handle connection errors of the request
request.on('error', (err) => reject(err))
})
[11/11] incubator-weex git commit: Merge branch '0.16-dev' of
https://github.com/acton393/incubator-weex into wip-us-0.16-dev
Posted by ac...@apache.org.
Merge branch '0.16-dev' of https://github.com/acton393/incubator-weex into wip-us-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/5951404d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5951404d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5951404d
Branch: refs/heads/0.16-dev
Commit: 5951404d844617ff19bcca4b32744b7c891868aa
Parents: 53edff0 9251d16
Author: acton393 <zh...@gmail.com>
Authored: Sat Jul 29 10:58:54 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Sat Jul 29 10:58:54 2017 +0800
----------------------------------------------------------------------
dangerfile.js | 46 +++++++++++++-------
ios/playground/WeexDemo/Info.plist | 4 ++
.../Sources/Component/WXImageComponent.m | 21 +++++++--
3 files changed, 52 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[08/11] incubator-weex git commit: Merge branch '0.16-dev' of
https://github.com/acton393/incubator-weex into 0.16-dev
Posted by ac...@apache.org.
Merge branch '0.16-dev' of https://github.com/acton393/incubator-weex into 0.16-dev
* '0.16-dev' of https://github.com/acton393/incubator-weex:
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/24d20d98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/24d20d98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/24d20d98
Branch: refs/heads/0.16-dev
Commit: 24d20d9866aceb920b382a70141d006b7b4766fd
Parents: 9750cff 37371e7
Author: acton393 <zh...@gmail.com>
Authored: Fri Jul 28 17:48:52 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Jul 28 17:48:52 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[10/11] incubator-weex git commit: * [ios] make it resolve
Posted by ac...@apache.org.
* [ios] make it resolve
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9251d16f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9251d16f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9251d16f
Branch: refs/heads/0.16-dev
Commit: 9251d16f7443406b54fd54979f40d3ecdadb0715
Parents: 78e5e27
Author: acton393 <zh...@gmail.com>
Authored: Fri Jul 28 18:52:53 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Jul 28 18:52:53 2017 +0800
----------------------------------------------------------------------
dangerfile.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9251d16f/dangerfile.js
----------------------------------------------------------------------
diff --git a/dangerfile.js b/dangerfile.js
index 3df2fe6..7c40561 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -295,7 +295,7 @@ function findReviewer(resolve, reject) {
}, function (err, result) {
console.log('parseDeleteAndNormalLines')
if ("undefined" === typeof result || "undefined" === typeof result.data || err) {
- reject()
+ resolve()
return
}
parseDeleteAndNormalLines(result.data, fileToDeletedLinesMap, fileToNormalLinesMap)
[04/11] incubator-weex git commit: * [ios] format code @nodanger
Posted by ac...@apache.org.
* [ios] format code @nodanger
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9d776226
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9d776226
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9d776226
Branch: refs/heads/0.16-dev
Commit: 9d7762267aa7d29e441f58a3cb007107039b1248
Parents: 99ac804
Author: acton393 <zh...@gmail.com>
Authored: Fri Jul 28 16:45:20 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Jul 28 16:45:20 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9d776226/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
index 6ce6094..bbfddba 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
@@ -145,6 +145,7 @@ WX_EXPORT_METHOD(@selector(save:))
return;
}
}
+
if (![self isViewLoaded]) {
if (resultCallback) {
resultCallback(@{@"success": @(false),
[03/11] incubator-weex git commit: * [test] add log to danger file
Posted by ac...@apache.org.
* [test] add log to danger file
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/99ac8045
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/99ac8045
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/99ac8045
Branch: refs/heads/0.16-dev
Commit: 99ac804597d5084b9010f65f8db5570439bf6e4b
Parents: a0431cd
Author: acton393 <zh...@gmail.com>
Authored: Fri Jul 28 16:25:32 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Jul 28 16:25:32 2017 +0800
----------------------------------------------------------------------
dangerfile.js | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/99ac8045/dangerfile.js
----------------------------------------------------------------------
diff --git a/dangerfile.js b/dangerfile.js
index ce4c4e1..79a7f55 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -298,11 +298,13 @@ function findReviewer(resolve, reject) {
return
}
parseDeleteAndNormalLines(result.data, fileToDeletedLinesMap, fileToNormalLinesMap)
+ console.log('getContent')
var promises = danger.git.modified_files.map(function(file) {
let repoURL = danger.github.pr.base.repo.html_url
let fileName = file.replace(/^.*[\\\/]/, '')
let blameURL = repoURL + '/blame/' + danger.github.pr.base.ref + '/' + file
// console.log("Getting blame html: " + blameURL)
+ console.log('getContent2')
return getContent(blameURL)
});
@@ -324,6 +326,7 @@ function getContent(url) {
const lib = url.startsWith('https') ? require('https') : require('http');
const request = lib.get(url, (response) => {
// handle http errors
+ console.log('response:', response.statusCode)
if (response.statusCode < 200 || response.statusCode > 299) {
reject(new Error('Failed to load page, status code: ' + response.statusCode));
}
[05/11] incubator-weex git commit: * [ios] adjust code style
@notdanger
Posted by ac...@apache.org.
* [ios] adjust code style @notdanger
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cea16e22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cea16e22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cea16e22
Branch: refs/heads/0.16-dev
Commit: cea16e2288ac045c54e2e5c7c54ad0d887f8a654
Parents: 9d77622
Author: acton393 <zh...@gmail.com>
Authored: Fri Jul 28 16:59:19 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Jul 28 16:59:19 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cea16e22/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
index bbfddba..79e6225 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
@@ -92,13 +92,15 @@ WX_EXPORT_METHOD(@selector(save:))
return self;
}
-- (void)configPlaceHolder:(NSDictionary*)attributes {
+- (void)configPlaceHolder:(NSDictionary*)attributes
+{
if (attributes[@"placeHolder"] || attributes[@"placeholder"]) {
_placeholdSrc = [[WXConvert NSString:attributes[@"placeHolder"]?:attributes[@"placeholder"]]stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
}
}
-- (void)configFilter:(NSDictionary *)styles {
+- (void)configFilter:(NSDictionary *)styles
+{
if (styles[@"filter"]) {
NSString *filter = styles[@"filter"];
[09/11] incubator-weex git commit: * [ios] add try catch @notdanger
Posted by ac...@apache.org.
* [ios] add try catch @notdanger
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/78e5e27e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/78e5e27e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/78e5e27e
Branch: refs/heads/0.16-dev
Commit: 78e5e27e576afa1041ad320e70538a1e3d511540
Parents: 24d20d9
Author: acton393 <zh...@gmail.com>
Authored: Fri Jul 28 17:49:57 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Jul 28 17:49:57 2017 +0800
----------------------------------------------------------------------
dangerfile.js | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/78e5e27e/dangerfile.js
----------------------------------------------------------------------
diff --git a/dangerfile.js b/dangerfile.js
index e93dc14..3df2fe6 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -351,21 +351,26 @@ function getContent(url) {
}
function parseDeleteAndNormalLines(diffData, fileToDeletedLinesMap, fileToNormalLinesMap) {
- var diffs = parseDiff(diffData)
- diffs.forEach(diff => {
- fileToDeletedLinesMap[diff.from] = [];
- fileToNormalLinesMap[diff.from] = [];
- diff.chunks.forEach(chunk => {
- chunk.changes.forEach(change => {
- if (change.del) {
- fileToDeletedLinesMap[diff.from].push(change.ln)
- }
- if (change.normal) {
- fileToNormalLinesMap[diff.from].push(change.ln1)
- }
+ try {
+ var diffs = parseDiff(diffData)
+ diffs.forEach(diff => {
+ fileToDeletedLinesMap[diff.from] = [];
+ fileToNormalLinesMap[diff.from] = [];
+ diff.chunks.forEach(chunk => {
+ chunk.changes.forEach(change => {
+ if (change.del) {
+ fileToDeletedLinesMap[diff.from].push(change.ln)
+ }
+ if (change.normal) {
+ fileToNormalLinesMap[diff.from].push(change.ln1)
+ }
+ })
})
- })
- })
+ })
+ } catch (error) {
+ console.log(error)
+ }
+
}
[02/11] incubator-weex git commit: * [test] add log to danger file
Posted by ac...@apache.org.
* [test] add log to danger file
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a0431cd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a0431cd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a0431cd8
Branch: refs/heads/0.16-dev
Commit: a0431cd82e6eca73e2303b85476203426af7ca49
Parents: 5a3bac3
Author: acton393 <zh...@gmail.com>
Authored: Fri Jul 28 16:13:29 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Jul 28 16:13:29 2017 +0800
----------------------------------------------------------------------
dangerfile.js | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a0431cd8/dangerfile.js
----------------------------------------------------------------------
diff --git a/dangerfile.js b/dangerfile.js
index ac3a5a7..ce4c4e1 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -195,12 +195,15 @@ if (danger.git.modified_files) {
checkFileToVerifySrcHeader(file);
});
}
+
+console.log('checkFileToVerifySrcHeader')
if (danger.git.created_files) {
danger.git.created_files.forEach(file => {
checkChangedFile(file);
checkFileToVerifySrcHeader(file);
});
}
+console.log('checkAndroidBreakChange')
if (danger.git.deleted_files) {
danger.git.deleted_files.forEach(file => {
checkChangedFile(file);
@@ -242,6 +245,7 @@ const ignoreCopyrightVerifyPath = [
'ios/sdk/WeexSDK/dependency/SRWebSocket'
]
+console.log('copyright_header_components')
filesToVerifySrcHeader.forEach(filepath => {
for(var i=ignoreCopyrightVerifyPath.length-1;i>=0;i--){
if(filepath.startsWith(ignoreCopyrightVerifyPath[i])){
@@ -263,6 +267,7 @@ filesToVerifySrcHeader.forEach(filepath => {
* will be seperated to a danger plugin
*/
+console.log('findReviewer')
schedule(new Promise((resolve, reject) => {
try {
findReviewer(resolve, reject)
@@ -287,6 +292,7 @@ function findReviewer(resolve, reject) {
number: danger.github.pr.number,
headers: {Accept: 'application/vnd.github.diff'}
}, function (err, result) {
+ console.log('parseDeleteAndNormalLines')
if ("undefined" === typeof result || "undefined" === typeof result.data || err) {
reject()
return
@@ -300,6 +306,7 @@ function findReviewer(resolve, reject) {
return getContent(blameURL)
});
+ console.log('findBlameReviewers')
Promise.all(promises).then(datas => {
datas.forEach(function(data, index) {
fileToBlamesMap[danger.git.modified_files[index]] = parseBlame(data);