[GitHub] incubator-weex pull request #298: + [html5] add jsonpCallback support
Github user MrRaindrop commented on a diff in the pull request: https://github.com/apache/incubator-weex/pull/298#discussion_r124726568 --- Diff: html5/render/browser/extend/api/stream.js --- @@ -12,7 +12,7 @@ let jsonpCnt = 0 const ERROR_STATE = -1 function _jsonp (config, callback, progressCallback) { - const cbName = 'jsonp_' + (++jsonpCnt) + const cbName = config.jsonpCallback || 'jsonp_' + (++jsonpCnt) --- End diff -- I think it's better to use `jsonpCallbackName` instead of `jsonpCallback`, since there'are already two parameters about callback function, `callback` and `progressCallback`, in this case another `xxCallback` may mislead user to pass a jsonp callback **function** other than the callback name **string** to it according to the other `xxCallback`s are all **functions**. Using `jsonpCallbackName` should avoid this misunderstanding. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] incubator-weex pull request #479: * [ios] support iPad when screen rotation
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/479 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
incubator-weex git commit: * [ios] support iPad when screen rotation
Repository: incubator-weex Updated Branches: refs/heads/0.15-dev 7a2337ee8 -> db640768c * [ios] support iPad when screen rotation Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/db640768 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/db640768 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/db640768 Branch: refs/heads/0.15-dev Commit: db640768cfb677543bc983e80f4106e7640ac2d3 Parents: 7a2337e Author: acton393 Authored: Thu Jun 29 14:35:03 2017 +0800 Committer: acton393 Committed: Thu Jun 29 14:35:03 2017 +0800 -- ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 2 -- ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 15 ++- 2 files changed, 6 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/db640768/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 2c8a7b4..715617d 100644 --- a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h +++ b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h @@ -113,8 +113,6 @@ extern _Nonnull SEL WXSwizzledSelectorForSelector(_Nonnull SEL selector); + (void)performBlock:(void (^_Nonnull)())block onThread:(NSThread *_Nonnull)thread; -+ (void)setNotStat:(BOOL)notStat; -+ (BOOL)notStat; /** * @abstract Returns the environment of current application, you can get some necessary properties such as appVersionãsdkVersionãappName etc. * http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/db640768/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 766a353..fed8f0a 100644 --- a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m +++ b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m @@ -133,7 +133,6 @@ CGFloat WXFloorPixelValue(CGFloat value) return floor(value * scale) / scale; } -static BOOL WXNotStat; @implementation WXUtility + (void)performBlock:(void (^)())block onThread:(NSThread *)thread @@ -655,6 +654,9 @@ static BOOL WXNotStat; + (CGSize)portraitScreenSize { +if ([[UIDevice currentDevice].model isEqualToString:@"iPad"]) { +return [UIScreen mainScreen].bounds.size; +} static CGSize portraitScreenSize; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ @@ -668,6 +670,9 @@ static BOOL WXNotStat; + (CGFloat)defaultPixelScaleFactor { +if ([[UIDevice currentDevice].model isEqualToString:@"iPad"]) { +return [self portraitScreenSize].width / WXDefaultScreenWidth; +} static CGFloat defaultScaleFactor; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ @@ -740,14 +745,6 @@ static BOOL WXNotStat; SecItemDelete((CFDictionaryRef)keychainQuery); } -+ (void)setNotStat:(BOOL)notStat { -WXNotStat = YES; -} - -+ (BOOL)notStat { -return WXNotStat; -} - + (NSURL *)urlByDeletingParameters:(NSURL *)url { NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:YES];
[incubator-weex] Git Push Summary
Repository: incubator-weex Updated Branches: refs/heads/android-feature-yoga [deleted] b648441fe
[GitHub] incubator-weex issue #480: [vue-render] support vue-loader@^12.0 and optimiz...
Github user MrRaindrop commented on the issue: https://github.com/apache/incubator-weex/pull/480 jira issue: https://issues.apache.org/jira/browse/WEEX-53 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] incubator-weex pull request #481: [iOS] bug with line
GitHub user 452MJ opened a pull request: https://github.com/apache/incubator-weex/pull/481 [iOS] bug with line The can not adapt to content's length on iOS, such as {{content}} .cContent{ color: white; font-size:12; max-width: 360; text-overflow: ellipsis; } ![image](https://user-images.githubusercontent.com/13673008/27679780-49c3490e-5cec-11e7-8ecd-2668202c9d6d.png) You can merge this pull request into a Git repository by running: $ git pull https://github.com/apache/incubator-weex dev Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/481.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #481 commit 08d24e5f98d92b94149b43f44bf346e74e2c499d Author: sospartan Date: 2017-05-25T03:56:01Z Merge branch '0.13-dev' into 0.14-dev # Conflicts: # .travis.yml # android/build.gradle # android/gradle/wrapper/gradle-wrapper.properties # android/run-ci.sh # html5/render/vue/components/slider/slider-neighbor.js # test/scripts/components/scroll-event.test.js commit 5547a2067b3d21178965cb87a1c704b3850d75d5 Author: cxfeng Date: 2017-05-25T08:38:32Z Merge branch '0.13-dev' into 0.14-dev Conflicts: android/sdk/libs/armeabi/libweexjsc.so commit 61b743be70a3c2cc35a9e99c2ed56460b0e94e7b Author: acton393 Date: 2017-05-25T13:45:10Z * [ios] update 0.14.0 commit 971952128e5a233a32ace9862bce314fd31e4433 Author: acton393 Date: 2017-05-25T13:46:09Z * [ios] remove gesture in case of crash commit afb5d1b993702b4828a5002100a63e3034e84c61 Author: acton393 Date: 2017-05-26T03:58:24Z * [ios] fix text description about coretext commit 45a69d6a211954cc8906e052df1633a1b32ef710 Author: acton393 Date: 2017-05-26T09:11:57Z * [ios] bugfix application fore-background Event commit 1d2224196dcbd7e8f48121bf54051b59f45bfa0c Author: yinfeng Date: 2017-05-26T09:31:19Z * [ios] add updateTransform interface to WXComponent to enable setting native transform directly, instead of updating css styles and parsing them. commit 3dfbf30ef2217696685776dc443ddaea1f18c779 Author: yinfeng Date: 2017-05-26T09:31:39Z Merge remote-tracking branch 'upstream/0.14-dev' into 0.14-dev commit 4e4bba8a7b4717f5adb94273df2ff637f3dcc23c Author: yinfeng Date: 2017-05-26T09:52:18Z * [ios] rename updateTransform to setNativeTransform commit 00067c7d9a0cd75a6149af34956f29b4fb8c91a0 Author: é½å±± Date: 2017-05-26T10:03:48Z + [ios] fixbug: cycle slider commit 4f3ee57303322bc379e25ad3e0cb0f419b94f333 Author: acton393 Date: 2017-05-26T12:22:38Z * [ios] remove observer if add it commit d0f844ff6a156c404f67711e1a8f6438c3fb39bd Author: yinfeng Date: 2017-05-31T06:48:07Z * [ios] fix issue that wrong transform value is read by animation module. commit 48d7aded1e68f907933ac6a0a078974445fa9d1d Author: yinfeng Date: 2017-05-31T08:27:07Z * [test] reject if blame info request is failed commit 4ec5d449c74320f8c1dfb472af40750e23920839 Author: yinfeng Date: 2017-05-31T09:21:14Z * [test] add undefined detect to danger commit 4368ec28602efe71c9cf748bb23892ae68e95499 Author: acton393 Date: 2017-05-31T09:28:26Z * [ios] add force touch force value for touch event commit 5599530fd63f831666c4431725158c6460289e34 Author: acton393 Date: 2017-05-31T09:47:35Z * [ios] support 3d transform commit c613714f475c351c39ac85d5e0a11a2cc827fe18 Author: acton393 Date: 2017-06-01T06:47:54Z * [ios] try to fix text crash commit 7eeed0188792574778a6e7b73fd0ff954951fdc8 Author: acton393 Date: 2017-06-01T07:26:30Z * [ios] use range compare commit 8d7058a0355283cf38f7c6d1a3243c479d4763c5 Author: acton393 Date: 2017-06-01T07:37:04Z * [ios] use intersectionRange compare commit 76dd7751a739b746afe36ad15bec07cddc511d10 Author: acton393 Date: 2017-06-01T07:45:38Z Merge branch 'ios-feature-macaca-0.13-dev-2' of https://github.com/kfeagle/incubator-weex into wip-us-0.14-dev commit e8d1fd1094230a6f7919e87480586798765b8e12 Author: é½å±± Date: 2017-06-01T13:43:39Z + [ios] fix bug: when add IndicatorView lazy . the IndicatorView can not create in slider successfully commit 0222e4de47c66f5d8d7948eb9a77e1392a814236 Author: acton393 Date: 2017-06-02T02:36:01Z Merge branch 'wip-us-0.14-dev' into 0.14-dev commit 6c30b43718a804ada914e150bbf1429c11408627 Author: sospartan Date: 2017-06-02T02:49:38Z Merge branch '0.13-dev' into 0.14-dev commit 08df59707905ce0e2750a2d5425a20063df89b41 Author: acton393 Date: 2017-06-02T03:04:08Z Merge branches '0.14-dev' and '0.14-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into wip-us-0.14-dev commit 20093deb9c535ce9ff020
[GitHub] incubator-weex issue #481: [iOS] bug with line
Github user acton393 commented on the issue: https://github.com/apache/incubator-weex/pull/481 @452MJ sorry I cannot understand what you said ,why does this pull request existï¼ --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] incubator-weex issue #471: [example] Modify the countdown example
Github user elover commented on the issue: https://github.com/apache/incubator-weex/pull/471 why not change reserved tag to remove "countdown"? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] incubator-weex issue #481: [iOS] bug with line
Github user 452MJ commented on the issue: https://github.com/apache/incubator-weex/pull/481 @acton393 è±è¯å¤ªæ¸£ãè¿ä¹è¯´å§ï¼æè¦åä¸ä¸ªå¼¹å¹å表ï¼å¼¹å¹å 容é¿åº¦æ¯ä¸ç¡®å®çï¼æ以textè¦èªéåºå 容é¿åº¦ï¼ç¶åæåç°å¨iOSä¸å¹¶ä¸è½èªéåºå®½åº¦ï¼å¨androidä¸æ¯å¯ä»¥è¾¾å°é¢æææçï¼ï¼æ 论æè®¾ç½®äº ``` lines:0; max-height:300px ``` å¨iOSä¸é½ä¸æåï¼åªæå°é«åº¦åæ»æ¯å¦height:500pxçæ åµä¸æè½æ¾ç¤ºåºå¤è¡å 容ã --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
incubator-weex git commit: * [android] Fix camera NPE.
Repository: incubator-weex Updated Branches: refs/heads/0.14-dev 24fbad2f0 -> 5191cc380 * [android] Fix camera NPE. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5191cc38 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5191cc38 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5191cc38 Branch: refs/heads/0.14-dev Commit: 5191cc380a8fca6069a3f549f6015d84d0972615 Parents: 24fbad2 Author: YorkShen Authored: Fri Jun 30 00:27:47 2017 +0800 Committer: YorkShen Committed: Fri Jun 30 00:27:47 2017 +0800 -- .../src/main/java/com/taobao/weex/ui/component/WXComponent.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5191cc38/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java -- diff --git 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 index 985b616..730d6da 100644 --- 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 @@ -949,7 +949,9 @@ public abstract class WXComponent implements IWXObject, IWXActi */ @CallSuper protected void onHostViewInitialized(T host){ -host.setCameraDistance(Float.MAX_VALUE); +if(host!=null){ + host.setCameraDistance(Float.MAX_VALUE); +} if (mAnimationHolder != null) { //Performs cached animation mAnimationHolder.execute(mInstance, this);
[GitHub] incubator-weex pull request #482: [doc] correct platform information.
GitHub user MrRaindrop opened a pull request: https://github.com/apache/incubator-weex/pull/482 [doc] correct platform information. platform 'android' is lowercase. You can merge this pull request into a Git repository by running: $ git pull https://github.com/MrRaindrop/incubator-weex dev Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/482.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #482 commit 21a8032fc332e2121488389706e26d5d2266b4e1 Author: MrRaindrop Date: 2017-06-30T02:42:21Z * [doc] correct platform information.x --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] incubator-weex issue #482: [doc] correct platform information.
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/482 Warnings :warning: No Changelog changes! Messages :book: According to the blame info, we recommended @DoranYun to be the reviewers. Generated by :no_entry_sign: http://github.com/danger/danger-js/";>dangerJS --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[1/2] incubator-weex git commit: * [doc] update title style
Repository: incubator-weex Updated Branches: refs/heads/dev 44e959a41 -> a53deeb15 * [doc] update title style Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/825c6e30 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/825c6e30 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/825c6e30 Branch: refs/heads/dev Commit: 825c6e308effbb652c29369ab946e13754a6929d Parents: 2510206 Author: tancy Authored: Fri Jun 30 11:08:30 2017 +0800 Committer: tancy Committed: Fri Jun 30 11:08:30 2017 +0800 -- doc/themes/weex/source/css/index.scss | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/825c6e30/doc/themes/weex/source/css/index.scss -- diff --git a/doc/themes/weex/source/css/index.scss b/doc/themes/weex/source/css/index.scss index e1e744b..7d8614c 100644 --- a/doc/themes/weex/source/css/index.scss +++ b/doc/themes/weex/source/css/index.scss @@ -124,6 +124,7 @@ top: 70px; left: 50%; margin-left: -250px; + line-height: 120%; } .btn-group { @@ -226,6 +227,7 @@ .left-text h2 { width: 300px; text-align: left; +line-height: 120%; } .left-text p {
[2/2] incubator-weex git commit: Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into dev
Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex 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/a53deeb1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a53deeb1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a53deeb1 Branch: refs/heads/dev Commit: a53deeb15b42712aa0b0249a9124ecce1c21817f Parents: 825c6e3 44e959a Author: tancy Authored: Fri Jun 30 11:09:09 2017 +0800 Committer: tancy Committed: Fri Jun 30 11:09:09 2017 +0800 -- android/sdk/libs/armeabi/libweexjsc.so | Bin 7575352 -> 7570504 bytes android/sdk/libs/x86/libweexjsc.so | Bin 12130116 -> 12121924 bytes .../java/com/taobao/weex/ComponentObserver.java | 50 .../java/com/taobao/weex/WXSDKInstance.java | 16 +++ .../taobao/weex/ui/component/WXComponent.java | 14 +++ .../ui/component/list/BasicListComponent.java | 16 ++- examples/vue/index.vue | 1 + examples/vue/modules/websocket.vue | 116 +++ html5/render/vue/README.md | 19 ++- html5/render/vue/components/input.js| 52 +++-- .../components/scrollable/loading-indicator.js | 11 +- .../render/vue/components/slider/slideMixin.js | 24 ++-- html5/render/vue/core/style.js | 31 +++-- html5/render/vue/env/weex.js| 3 + html5/render/vue/mixins/scrollable.js | 38 +++--- html5/render/vue/modules/index.js | 2 + html5/render/vue/modules/websocket/index.js | 26 + html5/render/vue/modules/websocket/websocket.js | 60 ++ html5/render/vue/utils/style.js | 44 +++ html5/test/render/vue/modules/websocket.js | 11 ++ .../Sources/Component/WXCycleSliderComponent.m | 7 ++ package.json| 2 +- packages/weex-vue-render/package.json | 2 +- test/pages/components/textarea-maxlength.vue| 10 +- .../components/textarea-maxlength.test.js | 6 +- test/scripts/util.js| 2 +- 26 files changed, 491 insertions(+), 72 deletions(-) --
[1/2] incubator-weex git commit: * [doc] correct platform information.x
Repository: incubator-weex Updated Branches: refs/heads/dev a53deeb15 -> cf0bff04a * [doc] correct platform information.x Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/21a8032f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/21a8032f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/21a8032f Branch: refs/heads/dev Commit: 21a8032fc332e2121488389706e26d5d2266b4e1 Parents: 44e959a Author: MrRaindrop Authored: Fri Jun 30 10:42:21 2017 +0800 Committer: MrRaindrop Committed: Fri Jun 30 10:42:21 2017 +0800 -- doc/source/cn/references/weex-variable.md | 2 +- doc/source/references/weex-variable.md| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/21a8032f/doc/source/cn/references/weex-variable.md -- diff --git a/doc/source/cn/references/weex-variable.md b/doc/source/cn/references/weex-variable.md index 4630681..0848441 100644 --- a/doc/source/cn/references/weex-variable.md +++ b/doc/source/cn/references/weex-variable.md @@ -19,7 +19,7 @@ has_chapter_content: true * `weexVersion: string`: Weex sdk çæ¬ã * `appName: string`: åºç¨ååã * `appVersion: string`: åºç¨çæ¬ã -* `platform: string`: å¹³å°ä¿¡æ¯ï¼æ¯ iOSãAndroid è¿æ¯ Webã +* `platform: string`: å¹³å°ä¿¡æ¯ï¼æ¯ 'iOS'ã'android' è¿æ¯ 'Web'ã * `osVersion: string`: ç³»ç»çæ¬ã * `deviceModel: string`: 设å¤åå· (ä» åçåºç¨)ã * `deviceWidth: number`: 设å¤å®½åº¦ãWeex é»è®¤ä»¥å®½åº¦ä¸º 750px åéé 渲æï¼è¦è·å¾750pxä¸çå±å¹é«åº¦ï¼å¯ä»¥éè¿ `height = 750/deviceWidth*deviceHeight` å ¬å¼è·å¾ï¼å¯ä»¥ä½¿ç¨å° CSS ä¸ï¼ç¨æ¥è®¾ç½®å ¨å±å°ºå¯¸ http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/21a8032f/doc/source/references/weex-variable.md -- diff --git a/doc/source/references/weex-variable.md b/doc/source/references/weex-variable.md index b55eef5..c8806af 100644 --- a/doc/source/references/weex-variable.md +++ b/doc/source/references/weex-variable.md @@ -18,7 +18,7 @@ This variable contains all the environment information for the current Weex page + `WeexVersion: string`: Weex sdk version. + `AppName: string`: application name. + `AppVersion: string`: app version. -+ `Platform: string`: platform information, that is iOS, Android or Web. ++ `Platform: string`: platform information, that is 'iOS', 'android' or 'Web'. + `OsVersion: string`: system version. + `DeviceModel: string`: device model (native application only). + `DeviceWidth: number`: device width
[2/2] incubator-weex git commit: Merge branch 'dev' of https://github.com/MrRaindrop/incubator-weex into dev
Merge branch 'dev' of https://github.com/MrRaindrop/incubator-weex 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/cf0bff04 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cf0bff04 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cf0bff04 Branch: refs/heads/dev Commit: cf0bff04a750f94d6285d329087e2955b1d1d292 Parents: a53deeb 21a8032 Author: tancy Authored: Fri Jun 30 11:21:51 2017 +0800 Committer: tancy Committed: Fri Jun 30 11:21:51 2017 +0800 -- doc/source/cn/references/weex-variable.md | 2 +- doc/source/references/weex-variable.md| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --
[GitHub] incubator-weex pull request #482: [doc] correct platform information.
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/482 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[4/5] incubator-weex git commit: * [html5] fix test for getHeadStyleMap & @notdanger
* [html5] fix test for getHeadStyleMap & @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/d20e0d88 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d20e0d88 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d20e0d88 Branch: refs/heads/0.14-dev Commit: d20e0d8829e7601ac1a23da0fd77a2ae5b2a39aa Parents: 6fea967 Author: MrRaindrop Authored: Thu Jun 29 15:41:41 2017 +0800 Committer: MrRaindrop Committed: Thu Jun 29 15:41:41 2017 +0800 -- html5/test/render/vue/core/scope-style-map.js | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d20e0d88/html5/test/render/vue/core/scope-style-map.js -- diff --git a/html5/test/render/vue/core/scope-style-map.js b/html5/test/render/vue/core/scope-style-map.js index 38ec2a4..29bea0c 100644 --- a/html5/test/render/vue/core/scope-style-map.js +++ b/html5/test/render/vue/core/scope-style-map.js @@ -64,6 +64,10 @@ describe('style map', () => { * get style map. */ window._no_remove_style_sheets = false +// clear mark set in other test cases. +Array.from(document.styleSheets).forEach(function (styleSheet) { + styleSheet.ownerNode.removeAttribute('weex-scanned') +}) const styleMap = getHeadStyleMap() window._no_remove_style_sheets = true
[3/5] incubator-weex git commit: * [html5] update vue-loader verison.
* [html5] update vue-loader verison. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6fea967a Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6fea967a Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6fea967a Branch: refs/heads/0.14-dev Commit: 6fea967a13c349893a73af5650f46181aa1dccc6 Parents: ec85355 Author: MrRaindrop Authored: Thu Jun 29 14:40:21 2017 +0800 Committer: MrRaindrop Committed: Thu Jun 29 14:40:21 2017 +0800 -- build/webpack.test.web.config.js | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6fea967a/build/webpack.test.web.config.js -- diff --git a/build/webpack.test.web.config.js b/build/webpack.test.web.config.js index 3135852..6c2a6d4 100644 --- a/build/webpack.test.web.config.js +++ b/build/webpack.test.web.config.js @@ -81,6 +81,7 @@ module.exports = { ] }, vue: { +optimizeSSR: false, /** * important! should use postTransformNode to add $processStyle for * inline style prefixing. http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6fea967a/package.json -- diff --git a/package.json b/package.json index 702bba1..2888260 100644 --- a/package.json +++ b/package.json @@ -155,7 +155,7 @@ "sinon-chai": "^2.8.0", "uglify-js": "^2.6.4", "vue": "^2.2.6", -"vue-loader": "^11.3.3", +"vue-loader": "^12.2.1", "vue-template-compiler": "^2.2.6", "webpack": "^1.13.1", "weex-components": "^0.2.0",
[GitHub] incubator-weex pull request #480: [vue-render] support vue-loader@^12.0 and ...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/480 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[2/5] incubator-weex git commit: + [html5] support vue-loader ^12.0
+ [html5] support vue-loader ^12.0 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ec853550 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ec853550 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ec853550 Branch: refs/heads/0.14-dev Commit: ec853550eece60153d966bbf7decc65e0090fb0e Parents: ccc6c4b Author: MrRaindrop Authored: Thu Jun 29 14:35:48 2017 +0800 Committer: MrRaindrop Committed: Thu Jun 29 14:35:48 2017 +0800 -- build/webpack.examples.web.config.js | 1 + html5/render/vue/core/style.js | 27 -- html5/render/vue/env/global.js | 2 ++ html5/render/vue/env/weex.js | 3 ++ html5/render/vue/mixins/style.js | 58 ++- 5 files changed, 73 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ec853550/build/webpack.examples.web.config.js -- diff --git a/build/webpack.examples.web.config.js b/build/webpack.examples.web.config.js index 4b81cc5..c28db57 100644 --- a/build/webpack.examples.web.config.js +++ b/build/webpack.examples.web.config.js @@ -81,6 +81,7 @@ module.exports = { ] }, vue: { +optimizeSSR: false, /** * important! should use postTransformNode to add $processStyle for * inline style prefixing. http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ec853550/html5/render/vue/core/style.js -- diff --git a/html5/render/vue/core/style.js b/html5/render/vue/core/style.js index 7230b74..d2b155a 100644 --- a/html5/render/vue/core/style.js +++ b/html5/render/vue/core/style.js @@ -41,8 +41,13 @@ export function getHeadStyleMap () { tagBegin('getHeadStyleMap') } const needToRemoveStyleSheetNodes = [] - const res = Array.from(document.styleSheets || []) + const styleSheetsArr = Array.from(document.styleSheets || []).filter(function (styleSheet) { +return styleSheet.ownerNode.getAttribute('weex-scanned') !== '1' + }) + + const res = Array.from(styleSheetsArr) .reduce((pre, styleSheet) => { + styleSheet.ownerNode.setAttribute('weex-scanned', 1) /** * why not using styleSheet.rules || styleSheet.cssRules to get css rules ? * because weex's components defined non-standard style attributes, which is @@ -50,16 +55,18 @@ export function getHeadStyleMap () { * another reason not to use cssRules directy: * @issue: https://stackoverflow.com/questions/21642277/security-error-the-operation-is-insecure-in-firefox-document-stylesheets */ - if ((styleSheet.ownerNode.tagName.toLowerCase() === 'link') -|| !styleSheet.ownerNode.textContent) { -/** - * css in a link. just ignore this. probably a link stylesheet. - */ -return pre - } - if (styleSheet.ownerNode.id.match(/weex-pseudo-\d+/)) { + if ( +// css in a link. just ignore this. probably a link stylesheet. +(styleSheet.ownerNode.tagName.toLowerCase() === 'link') +|| !styleSheet.ownerNode.textContent +// pseudo class styleSheet node is generated by weex. just ignore it. +|| styleSheet.ownerNode.id.match(/weex-pseudo-\d+/)) { return pre } + + /** + * start to analyze it's content. + */ const strArr = trimComment(styleSheet.ownerNode.textContent.trim()).split(/}/) const len = strArr.length const rules = [] @@ -170,7 +177,7 @@ export function getScopeId (vnode) { export function getScopeStyle (vnode, classNames) { const scopeId = getScopeId(vnode) const style = {} - const styleMap = weex.styleMap || {} + const styleMap = weex._styleMap || {} let clsNmsIdx = 0 const clsNmsLen = classNames.length while (clsNmsIdx < clsNmsLen) { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ec853550/html5/render/vue/env/global.js -- diff --git a/html5/render/vue/env/global.js b/html5/render/vue/env/global.js index 337244e..e872c4f 100644 --- a/html5/render/vue/env/global.js +++ b/html5/render/vue/env/global.js @@ -22,6 +22,8 @@ import * as core from '../core' window.global = window window.weex = weex +weex._styleMap = {} + ; ['getComponentStyle', 'extractComponentStyle', 'createEventMap', http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ec853550/html5/render/vue/env/weex.js -- diff --git a/html5/render/vue/env/weex.js b/html5/render/vue/env/weex.js index e5ae94b..cffb2e2 100644 --- a/html5/render/vue/env/weex.js +++ b/html5/render/vue/env
[1/5] incubator-weex git commit: * [html5] release v-render 0.11.52
Repository: incubator-weex Updated Branches: refs/heads/0.14-dev 5191cc380 -> bc7ef1d1e * [html5] release v-render 0.11.52 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ccc6c4b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ccc6c4b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ccc6c4b2 Branch: refs/heads/0.14-dev Commit: ccc6c4b2c783784ab1082aefb25a29c64f8ffcee Parents: 4567754 Author: MrRaindrop Authored: Tue Jun 27 15:34:01 2017 +0800 Committer: MrRaindrop Committed: Tue Jun 27 15:34:01 2017 +0800 -- package.json | 2 +- packages/weex-vue-render/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ccc6c4b2/package.json -- diff --git a/package.json b/package.json index 0a9e951..702bba1 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.20.6", -"vue-render": "0.11.51", +"vue-render": "0.11.52", "transformer": ">=0.1.5 <0.5" }, "description": "A framework for building Mobile cross-platform UI", http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ccc6c4b2/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index 80d6443..485a099 100644 --- a/packages/weex-vue-render/package.json +++ b/packages/weex-vue-render/package.json @@ -1,6 +1,6 @@ { "name": "weex-vue-render", - "version": "0.11.51", + "version": "0.11.52", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js",
[5/5] incubator-weex git commit: Merge branch '0.14-dev' of https://github.com/MrRaindrop/incubator-weex into 0.14-dev
Merge branch '0.14-dev' of https://github.com/MrRaindrop/incubator-weex into 0.14-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/bc7ef1d1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bc7ef1d1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bc7ef1d1 Branch: refs/heads/0.14-dev Commit: bc7ef1d1ecea399ea5b7e0b1c848284e2e3e24df Parents: 5191cc3 d20e0d8 Author: tancy Authored: Fri Jun 30 11:24:50 2017 +0800 Committer: tancy Committed: Fri Jun 30 11:24:50 2017 +0800 -- build/webpack.examples.web.config.js | 1 + build/webpack.test.web.config.js | 1 + html5/render/vue/core/style.js| 27 ++ html5/render/vue/env/global.js| 2 + html5/render/vue/env/weex.js | 3 ++ html5/render/vue/mixins/style.js | 58 +++--- html5/test/render/vue/core/scope-style-map.js | 4 ++ package.json | 4 +- packages/weex-vue-render/package.json | 2 +- 9 files changed, 81 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bc7ef1d1/html5/render/vue/env/weex.js --