[50/50] [abbrv] incubator-weex git commit: Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev
Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/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/70af2318 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/70af2318 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/70af2318 Branch: refs/heads/0.12-dev Commit: 70af23183dfa910108cfffb5bbbcbd133f992db9 Parents: 5e56f38 8e120a9 Author: tancy <ron...@gmail.com> Authored: Mon Apr 24 11:45:45 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Mon Apr 24 11:45:45 2017 +0800 -- .travis.yml | 7 +- NOTICE | 96 POSSIBLE-NOTICES-FOR-BIN-DIST | 96 WeexSDK.podspec | 1 + ios/playground/Podfile | 2 +- .../WeexSDK/Sources/Component/WXListComponent.m | 5 +- .../WeexSDK/Sources/Loader/WXResourceLoader.m | 6 ++ .../Sources/Manager/WXComponentManager.m| 7 +- .../Sources/Network/WXResourceRequestHandler.h | 3 + .../WXResourceRequestHandlerDefaultImpl.m | 6 ++ ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 4 +- package.json| 2 +- test/pages/components/textarea-maxlength.vue| 8 +- test/pages/dom-operation.vue| 18 ++-- test/pages/image-onload.vue | 4 +- test/pages/index.vue| 4 +- test/pages/list-scroll.vue | 5 +- test/pages/scroller-scroll.vue | 4 +- test/pages/slider-infinite.vue | 4 +- test/run.sh | 1 - test/scripts/components/scroll-event.test.js| 8 +- test/scripts/components/slider-infinite.test.js | 4 +- test/scripts/components/text.test.js| 2 +- .../components/textarea-maxlength.test.js | 6 +- test/scripts/dom.test.js| 40 25 files changed, 180 insertions(+), 163 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/70af2318/package.json --
[26/50] [abbrv] incubator-weex git commit: * [all] update src-header
* [all] update src-header - update src-header in test code - update xml src-header - update rat script Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/808d9eba Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/808d9eba Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/808d9eba Branch: refs/heads/0.12-dev Commit: 808d9eba6673391ec6d4a3c1072d95f240a46efa Parents: 93c5329 Author: sospartanAuthored: Mon Apr 17 10:51:06 2017 +0800 Committer: sospartan Committed: Mon Apr 17 10:51:06 2017 +0800 -- android/commons/src/main/AndroidManifest.xml| 18 ++ .../java/com/alibaba/weex/ApplicationTest.java | 4 +- .../com/alibaba/weex/WeappJsBaseTestCase.java | 4 +- .../benchmark/BenchmarkActivityTestRule.java| 4 +- .../alibaba/weex/benchmark/BenchmarkTest.java | 4 +- .../com/alibaba/weex/benchmark/BoxPlot.java | 4 +- .../java/com/alibaba/weex/benchmark/Repeat.java | 4 +- .../com/alibaba/weex/benchmark/RepeatRule.java | 4 +- .../weex/benchmark/WeexNativeCompareTest.java | 4 +- .../weex/uitest/TC_AG/AG_AHref_A_Href.java | 18 ++ .../TC_AG/AG_Border_A_Border_Bottom_Color.java | 18 ++ .../AG_Border_A_Border_Bottom_Left_Radius.java | 18 ++ .../AG_Border_A_Border_Bottom_Right_Radius.java | 18 ++ .../TC_AG/AG_Border_A_Border_Bottom_Width.java | 18 ++ .../uitest/TC_AG/AG_Border_A_Border_Color.java | 18 ++ .../TC_AG/AG_Border_A_Border_Left_Color.java| 18 ++ .../TC_AG/AG_Border_A_Border_Left_Width.java| 18 ++ .../uitest/TC_AG/AG_Border_A_Border_Radius.java | 18 ++ .../TC_AG/AG_Border_A_Border_Right_Color.java | 18 ++ .../TC_AG/AG_Border_A_Border_Right_Width.java | 18 ++ .../uitest/TC_AG/AG_Border_A_Border_Style.java | 18 ++ .../TC_AG/AG_Border_A_Border_Top_Color.java | 18 ++ .../AG_Border_A_Border_Top_Left_Radius.java | 18 ++ .../AG_Border_A_Border_Top_Right_Radius.java| 18 ++ .../TC_AG/AG_Border_A_Border_Top_Width.java | 18 ++ .../uitest/TC_AG/AG_Border_A_Border_Width.java | 18 ++ .../AG_Border_Div_Border_Bottom_Color.java | 18 ++ ...AG_Border_Div_Border_Bottom_Left_Radius.java | 18 ++ ...G_Border_Div_Border_Bottom_Right_Radius.java | 18 ++ .../AG_Border_Div_Border_Bottom_Width.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Color.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Left_Color.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Left_Width.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Radius.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Right_Color.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Right_Width.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Style.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Top_Color.java | 18 ++ .../AG_Border_Div_Border_Top_Left_Radius.java | 18 ++ .../AG_Border_Div_Border_Top_Right_Radius.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Top_Width.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Width.java | 18 ++ .../AG_Border_Image_Border_Bottom_Color.java| 18 ++ ..._Border_Image_Border_Bottom_Left_Radius.java | 18 ++ ...Border_Image_Border_Bottom_Right_Radius.java | 18 ++ .../AG_Border_Image_Border_Bottom_Width.java| 18 ++ .../TC_AG/AG_Border_Image_Border_Color.java | 18 ++ .../AG_Border_Image_Border_Left_Color.java | 18 ++ .../AG_Border_Image_Border_Left_Width.java | 18 ++ .../TC_AG/AG_Border_Image_Border_Radius.java| 18 ++ .../AG_Border_Image_Border_Right_Color.java | 18 ++ .../AG_Border_Image_Border_Right_Width.java | 18 ++ .../TC_AG/AG_Border_Image_Border_Style.java | 18 ++ .../TC_AG/AG_Border_Image_Border_Top_Color.java | 18 ++ .../AG_Border_Image_Border_Top_Left_Radius.java | 18 ++ ...AG_Border_Image_Border_Top_Right_Radius.java | 18 ++ .../TC_AG/AG_Border_Image_Border_Top_Width.java | 18 ++ .../TC_AG/AG_Border_Image_Border_Width.java | 18 ++ .../AG_Border_Input_Border_Bottom_Color.java| 18 ++ ..._Border_Input_Border_Bottom_Left_Radius.java | 18 ++ ...Border_Input_Border_Bottom_Right_Radius.java | 18 ++ .../AG_Border_Input_Border_Bottom_Width.java| 18 ++ .../TC_AG/AG_Border_Input_Border_Color.java | 18 ++ .../AG_Border_Input_Border_Left_Color.java | 18 ++ .../AG_Border_Input_Border_Left_Width.java | 18 ++ .../TC_AG/AG_Border_Input_Border_Radius.java| 18 ++ .../AG_Border_Input_Border_Right_Color.java | 18 ++ .../AG_Border_Input_Border_Right_Width.java | 18 ++ .../TC_AG/AG_Border_Input_Border_Style.java | 18 ++ .../TC_AG/AG_Border_Input_Border_Top_Color.java | 18 ++ .../AG_Border_Input_Border_Top_Left_Radius.java | 18 ++ ...AG_Border_Input_Border_Top_Right_Radius.java | 18 ++ .../TC_AG/AG_Border_Input_Border_Top_Width.java | 18 ++
[29/50] [abbrv] incubator-weex git commit: * [html5] fix transition defaults.
* [html5] fix transition defaults. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/eb79187c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eb79187c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eb79187c Branch: refs/heads/0.12-dev Commit: eb79187ced7ecf314900bb9f11e6c1a9dc17cb2f Parents: 7932b23 Author: MrRaindropAuthored: Mon Apr 17 11:13:11 2017 +0800 Committer: MrRaindrop Committed: Mon Apr 17 11:13:11 2017 +0800 -- html5/render/vue/modules/animation.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eb79187c/html5/render/vue/modules/animation.js -- diff --git a/html5/render/vue/modules/animation.js b/html5/render/vue/modules/animation.js index 9efc4ba..a294896 100644 --- a/html5/render/vue/modules/animation.js +++ b/html5/render/vue/modules/animation.js @@ -19,8 +19,8 @@ import { nextFrame, toCSSText, autoPrefix, camelizeKeys, normalizeStyle } from '../utils' function transitionOnce (vnode, config, callback) { - const duration = config.duration || 1000 // ms - const timing = config.timingFunction || 'ease' + const duration = config.duration || 0 // ms + const timing = config.timingFunction || 'linear' const delay = config.delay || 0 // ms // TODO: parse transition properties
[49/50] [abbrv] incubator-weex git commit: Merge branch '0.12-dev' of https://github.com/apache/incubator-weex into 0.12-dev-web
Merge branch '0.12-dev' of https://github.com/apache/incubator-weex into 0.12-dev-web Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5e56f383 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5e56f383 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5e56f383 Branch: refs/heads/0.12-dev Commit: 5e56f383c2ce40de57834809bac0c8fc76073c1e Parents: 62c0efb 9381c91 Author: MrRaindropAuthored: Fri Apr 21 12:16:36 2017 +0800 Committer: MrRaindrop Committed: Fri Apr 21 12:16:36 2017 +0800 -- README.md | 2 +- WeexSDK.podspec | 2 +- .../java/com/alibaba/weex/WXPageActivity.java | 6 - android/sdk/build.gradle| 2 +- android/sdk/libs/armeabi/libweexjsc.so | Bin 0 -> 7816288 bytes android/sdk/libs/armeabi/libweexv8.so | Bin 3563544 -> 0 bytes .../main/java/com/taobao/weex/WXSDKEngine.java | 2 +- .../java/com/taobao/weex/bridge/WXParams.java | 6 + .../taobao/weex/utils/WXSoInstallMgrSdk.java| 2 +- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 4 +- .../WeexSDK/Sources/Component/WXListComponent.m | 13 +- .../WeexSDK/Sources/Component/WXTextComponent.h | 1 + .../WeexSDK/Sources/Component/WXTextComponent.m | 267 +++ ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +- ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 1 + .../Sources/View/WXComponent+ViewManagement.m | 4 +- ios/sdk/WeexSDK/Sources/WeexSDK.h | 32 +-- ios/sdk/buildScripts.sh | 25 +- package.json| 4 +- test/pages/components/text-layout.vue | 30 +++ test/scripts/components/recycler.test.js| 19 +- test/scripts/components/text.test.js| 131 + test/serve.sh | 2 +- 23 files changed, 447 insertions(+), 110 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5e56f383/package.json --
[20/50] [abbrv] incubator-weex git commit: * [all] update src-header
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/main/res/layout/hello_weex.xml -- diff --git a/android/playground/app/src/main/res/layout/hello_weex.xml b/android/playground/app/src/main/res/layout/hello_weex.xml index cd05460..2a60664 100644 --- a/android/playground/app/src/main/res/layout/hello_weex.xml +++ b/android/playground/app/src/main/res/layout/hello_weex.xml @@ -1,208 +1,22 @@ - + http://schemas.android.com/apk/res/android; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/main/res/layout/id_stub.xml -- diff --git a/android/playground/app/src/main/res/layout/id_stub.xml b/android/playground/app/src/main/res/layout/id_stub.xml index 719781c..fe829cf 100644 --- a/android/playground/app/src/main/res/layout/id_stub.xml +++ b/android/playground/app/src/main/res/layout/id_stub.xml @@ -1,4 +1,22 @@ + http://schemas.android.com/apk/res/android; android:orientation="vertical" android:layout_width="match_parent" http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/main/res/menu/main.xml -- diff --git a/android/playground/app/src/main/res/menu/main.xml b/android/playground/app/src/main/res/menu/main.xml index b6325ad..4e0533b 100755 --- a/android/playground/app/src/main/res/menu/main.xml +++ b/android/playground/app/src/main/res/menu/main.xml @@ -1,4 +1,22 @@ + http://schemas.android.com/apk/res/android; xmlns:app="http://schemas.android.com/apk/res-auto;> http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/main/res/menu/main_scan.xml -- diff --git a/android/playground/app/src/main/res/menu/main_scan.xml b/android/playground/app/src/main/res/menu/main_scan.xml index 925d7af..b4be73e 100755 --- a/android/playground/app/src/main/res/menu/main_scan.xml +++ b/android/playground/app/src/main/res/menu/main_scan.xml @@ -1,4 +1,22 @@ + http://schemas.android.com/apk/res/android; xmlns:app="http://schemas.android.com/apk/res-auto;> http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/main/res/menu/refresh.xml -- diff --git a/android/playground/app/src/main/res/menu/refresh.xml b/android/playground/app/src/main/res/menu/refresh.xml index dce7255..8e3805c 100755 --- a/android/playground/app/src/main/res/menu/refresh.xml +++ b/android/playground/app/src/main/res/menu/refresh.xml @@ -1,4 +1,22 @@ + http://schemas.android.com/apk/res/android; xmlns:app="http://schemas.android.com/apk/res-auto;> http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/main/res/values-v21/styles.xml -- diff --git a/android/playground/app/src/main/res/values-v21/styles.xml b/android/playground/app/src/main/res/values-v21/styles.xml index 251fb9f..f98bd65 100755 --- a/android/playground/app/src/main/res/values-v21/styles.xml +++ b/android/playground/app/src/main/res/values-v21/styles.xml @@ -1,4 +1,22 @@ -> + +
[07/50] [abbrv] incubator-weex git commit: * [html5] ignore build file.
* [html5] ignore build 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/eb0d6cf5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eb0d6cf5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eb0d6cf5 Branch: refs/heads/0.12-dev Commit: eb0d6cf5b511c5ddc4b6b1724d72f8f5331375cf Parents: 8e05345 Author: MrRaindropAuthored: Fri Apr 14 12:54:30 2017 +0800 Committer: MrRaindrop Committed: Fri Apr 14 12:54:30 2017 +0800 -- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eb0d6cf5/.gitignore -- diff --git a/.gitignore b/.gitignore index 334fdb8..c5a3be7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ examples/build web-entry test/build -data/build weex_tmp coverage dist @@ -32,6 +31,9 @@ html5/test/e2e/reports html5/test/e2e/screenshots html5/test/e2e/logs +# render test +html5/test/render/vue/data/build + # Created by Weex Web Packer html5/browser/extend/packer.js html5/render/browser/extend/packer.js
[10/50] [abbrv] incubator-weex git commit: * [html5] release 0.11.6
* [html5] release 0.11.6 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a68dab16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a68dab16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a68dab16 Branch: refs/heads/0.12-dev Commit: a68dab16dd953a5979bfccbbf6eafbef90737d04 Parents: 5215298 Author: MrRaindropAuthored: Fri Apr 14 13:53:21 2017 +0800 Committer: MrRaindrop Committed: Fri Apr 14 13:53:21 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/a68dab16/package.json -- diff --git a/package.json b/package.json index 3c0b799..6f2002a 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.20.3", -"vue-render": "0.11.5", +"vue-render": "0.11.6", "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/a68dab16/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index 01c241c..78d5a16 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.5", + "version": "0.11.6", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js",
[24/50] [abbrv] incubator-weex git commit: * [all] update src-header
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Switch_Border_Top_Right_Radius.java -- diff --git a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Switch_Border_Top_Right_Radius.java b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Switch_Border_Top_Right_Radius.java index 3e15d2e..e8941f7 100644 --- a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Switch_Border_Top_Right_Radius.java +++ b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Switch_Border_Top_Right_Radius.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package com.alibaba.weex.uitest.TC_AG; import com.alibaba.weex.WXPageActivity; import com.alibaba.weex.util.TestFlow; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Switch_Border_Top_Width.java -- diff --git a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Switch_Border_Top_Width.java b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Switch_Border_Top_Width.java index 5de2a2c..5c7ae67 100644 --- a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Switch_Border_Top_Width.java +++ b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Switch_Border_Top_Width.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package com.alibaba.weex.uitest.TC_AG; import com.alibaba.weex.WXPageActivity; import com.alibaba.weex.util.TestFlow; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Switch_Border_Width.java -- diff --git a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Switch_Border_Width.java b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Switch_Border_Width.java index ba8505e..e982f97 100644 --- a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Switch_Border_Width.java +++ b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Switch_Border_Width.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the
[34/50] [abbrv] incubator-weex git commit: * [html5] fix gradient.
* [html5] fix gradient. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/91468cf8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/91468cf8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/91468cf8 Branch: refs/heads/0.12-dev Commit: 91468cf8e70852e4edffec9931ecbe85582ffda8 Parents: 4c6c9ce Author: MrRaindropAuthored: Mon Apr 17 22:35:16 2017 +0800 Committer: MrRaindrop Committed: Mon Apr 17 22:35:16 2017 +0800 -- html5/render/vue/core/style.js | 33 ++-- html5/test/render/vue/core/style.js | 15 - .../render/vue/data/dotvue/scoped-style.vue | 12 +++ 3 files changed, 57 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/91468cf8/html5/render/vue/core/style.js -- diff --git a/html5/render/vue/core/style.js b/html5/render/vue/core/style.js index e370c0d..5383ff9 100644 --- a/html5/render/vue/core/style.js +++ b/html5/render/vue/core/style.js @@ -190,13 +190,42 @@ export function getComponentStyle (context, extract) { } return {} } - const style = {} + let style = {} let vnode = context.$vnode while (vnode) { extend(style, getStyle(vnode, extract)) vnode = vnode.parent } - return addPrefix(normalizeStyle(style)) + style = addPrefix(normalizeStyle(style)) + /** + * when prefixed value is a array, it should be applied to element + * during the next tick. + * e.g. + * background-image: linear-gradient(to top,#f5fefd,#ff); + * will generate: + * { + *backgroundImage: [ + * "-webkit-linear-gradient(to top,#f5fefd,#ff)", + * "-moz-linear-gradient(to top,#f5fefd,#ff)", + * "linear-gradient(to top,#f5fefd,#ff)"] + * } + */ + for (const k in style) { +if (Array.isArray(style[k])) { + const vals = style[k] + context.$nextTick(function () { +const el = context.$el +if (el) { + for (let i = 0; i < vals.length; i++) { +el.style[k] = vals[i] + } +} + }) + delete style[k] +} + } + return style + // return addPrefix(normalizeStyle(style)) } export function extractComponentStyle (context) { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/91468cf8/html5/test/render/vue/core/style.js -- diff --git a/html5/test/render/vue/core/style.js b/html5/test/render/vue/core/style.js index 4e1ac54..00bc59a 100644 --- a/html5/test/render/vue/core/style.js +++ b/html5/test/render/vue/core/style.js @@ -45,7 +45,7 @@ init('core style', (Vue, helper) => { helper.register('image', image) }) - it('should get normalized merged styles.', function () { + it('should get normalized merged styles.', function (done) { const vm = helper.createVm(scopedStyleBundle) const el = vm.$refs.foo.$el || vm.$refs.foo expect(el).to.be.ok @@ -79,5 +79,18 @@ init('core style', (Vue, helper) => { transformRes.push(el.style[k] === expectedTransform[k]) } expect(transformRes).to.include(true) + +const id = 'test-style' +helper.registerDone(id, () => { + expect(el.style.backgroundImage).to.match( +/(?:-webkit-|-moz-|-ms-|-o-)?linear-gradient\(to top, (?:rgb\(245, 254, 253\)|#f5fefd), (?:rgb\(255, 255, 255\)|#ff)\)/) + expect(['-webkit-box', +'-moz-box', +'-ms-flexbox', +'-webkit-flex', +'flex']).to.include(el.style.display) + helper.unregisterDone(id) + done() +}) }) }) http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/91468cf8/html5/test/render/vue/data/dotvue/scoped-style.vue -- diff --git a/html5/test/render/vue/data/dotvue/scoped-style.vue b/html5/test/render/vue/data/dotvue/scoped-style.vue index 67c1bb8..e8ceff8 100644 --- a/html5/test/render/vue/data/dotvue/scoped-style.vue +++ b/html5/test/render/vue/data/dotvue/scoped-style.vue @@ -6,8 +6,20 @@ .ct { + display: flex; width: 200px; flex-direction: row; transform: translate3d(100px, 100px, 0); + background-image: linear-gradient(to top, #f5fefd, #ff); } + + + module.exports = { +mounted () { + setTimeout(() => { +this.done('test-style') + }, 1000) +} + } +
[37/50] [abbrv] incubator-weex git commit: * [html5] add test for special comment with * in css.
* [html5] add test for special comment with * in css. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/88014abf Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/88014abf Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/88014abf Branch: refs/heads/0.12-dev Commit: 88014abf3732bcae4fe9d0b06004986b1320cea7 Parents: c10a0f0 Author: MrRaindropAuthored: Tue Apr 18 16:21:36 2017 +0800 Committer: MrRaindrop Committed: Tue Apr 18 16:21:36 2017 +0800 -- html5/test/render/vue/data/dotvue/scoped-style.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/88014abf/html5/test/render/vue/data/dotvue/scoped-style.vue -- diff --git a/html5/test/render/vue/data/dotvue/scoped-style.vue b/html5/test/render/vue/data/dotvue/scoped-style.vue index e8ceff8..4ff9dbb 100644 --- a/html5/test/render/vue/data/dotvue/scoped-style.vue +++ b/html5/test/render/vue/data/dotvue/scoped-style.vue @@ -7,8 +7,8 @@
[02/50] [abbrv] incubator-weex git commit: Merge branch 'dev-web-slider-neighbor' into 0.12-dev-web
Merge branch 'dev-web-slider-neighbor' into 0.12-dev-web Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b0404965 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b0404965 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b0404965 Branch: refs/heads/0.12-dev Commit: b0404965abf2d4873ed9963ca52ff8ee31bc0f53 Parents: bf99deb 1a53bcd Author: MrRaindropAuthored: Thu Apr 13 11:49:34 2017 +0800 Committer: MrRaindrop Committed: Thu Apr 13 11:49:34 2017 +0800 -- html5/render/vue/components/index.js| 8 +- .../render/vue/components/slider/slideMixin.js | 59 -- .../vue/components/slider/slider-neighbor.css | 21 +++ .../vue/components/slider/slider-neighbor.js| 182 +++ html5/render/vue/index.js | 2 +- html5/render/vue/utils/style.js | 41 + 6 files changed, 298 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0404965/html5/render/vue/components/index.js -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0404965/html5/render/vue/components/slider/slideMixin.js -- diff --cc html5/render/vue/components/slider/slideMixin.js index f887bfb,13285e8..6edb469 --- a/html5/render/vue/components/slider/slideMixin.js +++ b/html5/render/vue/components/slider/slideMixin.js @@@ -1,22 -1,4 +1,22 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ - import { createEvent/*, nextFrame*/, fireLazyload } from '../../utils' + import { createEvent/*, nextFrame*/, fireLazyload, addTransform } from '../../utils' const TRANSITION_TIME = 200 http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0404965/html5/render/vue/index.js -- diff --cc html5/render/vue/index.js index 8e06bb8,937092f..7f158dc --- a/html5/render/vue/index.js +++ b/html5/render/vue/index.js @@@ -1,24 -1,7 +1,24 @@@ -// import semver from 'semver' +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ import weex from './env' import { setVue } from './env' - import * as components from './components' + import components from './components' import { base, style } from './mixins' // import styleMixin from './mixins/style' http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0404965/html5/render/vue/utils/style.js --
[28/50] [abbrv] incubator-weex git commit: * [all] update license
* [all] update license Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/951f6549 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/951f6549 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/951f6549 Branch: refs/heads/0.12-dev Commit: 951f65492f2b37cd90bbac9fd0c30ba5866cc189 Parents: f17fe45 Author: sospartanAuthored: Mon Apr 17 11:12:10 2017 +0800 Committer: sospartan Committed: Mon Apr 17 11:12:10 2017 +0800 -- android/playground/codeStyleSettings.xml| 18 ++ android/sdk/src/main/AndroidManifest.xml| 18 ++ android/sdk/src/main/res/values/strings.xml | 222 ++- dangerfile.js | 18 ++ scripts/rat-ant-build.xml | 20 +- 5 files changed, 89 insertions(+), 207 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/951f6549/android/playground/codeStyleSettings.xml -- diff --git a/android/playground/codeStyleSettings.xml b/android/playground/codeStyleSettings.xml index 3b08f67..98d8430 100755 --- a/android/playground/codeStyleSettings.xml +++ b/android/playground/codeStyleSettings.xml @@ -1,4 +1,22 @@ + http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/951f6549/android/sdk/src/main/AndroidManifest.xml -- diff --git a/android/sdk/src/main/AndroidManifest.xml b/android/sdk/src/main/AndroidManifest.xml index 54d5f21..9897b6a 100755 --- a/android/sdk/src/main/AndroidManifest.xml +++ b/android/sdk/src/main/AndroidManifest.xml @@ -1,4 +1,22 @@ + http://schemas.android.com/apk/res/android; package="com.taobao.weappplus_sdk" android:versionCode="1" http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/951f6549/android/sdk/src/main/res/values/strings.xml -- diff --git a/android/sdk/src/main/res/values/strings.xml b/android/sdk/src/main/res/values/strings.xml index e077468..850d2b2 100755 --- a/android/sdk/src/main/res/values/strings.xml +++ b/android/sdk/src/main/res/values/strings.xml @@ -1,208 +1,20 @@ - http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/951f6549/dangerfile.js -- diff --git a/dangerfile.js b/dangerfile.js index 6d2ad4c..114571d 100644 --- a/dangerfile.js +++ b/dangerfile.js @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ import { danger, fail, warn } from "danger"; import fs from "fs"; import path from 'path'; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/951f6549/scripts/rat-ant-build.xml -- diff --git a/scripts/rat-ant-build.xml b/scripts/rat-ant-build.xml index 902f713..c909080 100644 --- a/scripts/rat-ant-build.xml +++ b/scripts/rat-ant-build.xml @@ -1,8 +1,23 @@ - + + + + + + + + + + + + + + + + + + \ No newline at end of file
[30/50] [abbrv] incubator-weex git commit: * [html5] rm test vue libs.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/01d5ee2e/html5/test/render/vue/vender/vue-2.1.0.js -- diff --git a/html5/test/render/vue/vender/vue-2.1.0.js b/html5/test/render/vue/vender/vue-2.1.0.js deleted file mode 100755 index e80e513..000 --- a/html5/test/render/vue/vender/vue-2.1.0.js +++ /dev/null @@ -1,8 +0,0 @@ -/*! - * Vue.js v2.1.0 - * (c) 2014-2016 Evan You - * Released under the MIT License. - */ -!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&?define(t):e.Vue=t()}(this,function(){"use strict";function e(e){return null==e?"":"object"==typeof e?JSON.stringify(e,null,2):String(e)}function t(e){var t=parseFloat(e,10);return t||0===t?t:e}function n(e,t){for(var n=Object.create(null),r=e.split(","),i=0;i-1)return e.splice(n,1)}}function i(e,t){return Ur.call(e,t)}function o(e){return"string"==typeof e||"number"==typeof e}function a(e){var t=Object.create(null);return function(n){var r=t[n];return r||(t[n]=e(n))}}function s(e,t){function n(n){var r=arguments.length;return r?r>1?e.apply(t,arguments):e.call(t,n):e.call(t)}return n._length=e.length,n}function c(e,t){t=t||0;for(var n=e.length-t,r=new Array(n);n--;)r[n]=e[n+t];return r}function l(e,t){for(var n i n t)e[n]=t[n];return e}function u(e){return null!==e&&"object"==typeof e}function f(e){return qr.call(e)===Wr}function d(e){for(var t={},n=0;n
[32/50] [abbrv] incubator-weex git commit: Merge branch '0.12-dev' into 0.12-dev-web
Merge branch '0.12-dev' into 0.12-dev-web Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ae9b7a3e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ae9b7a3e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ae9b7a3e Branch: refs/heads/0.12-dev Commit: ae9b7a3e0053289b655a4a588e31de0c8eaa491d Parents: 01d5ee2 951f654 Author: MrRaindropAuthored: Mon Apr 17 11:47:25 2017 +0800 Committer: MrRaindrop Committed: Mon Apr 17 11:47:25 2017 +0800 -- android/commons/src/main/AndroidManifest.xml| 18 ++ .../java/com/alibaba/weex/ApplicationTest.java | 4 +- .../com/alibaba/weex/WeappJsBaseTestCase.java | 4 +- .../benchmark/BenchmarkActivityTestRule.java| 4 +- .../alibaba/weex/benchmark/BenchmarkTest.java | 4 +- .../com/alibaba/weex/benchmark/BoxPlot.java | 4 +- .../java/com/alibaba/weex/benchmark/Repeat.java | 4 +- .../com/alibaba/weex/benchmark/RepeatRule.java | 4 +- .../weex/benchmark/WeexNativeCompareTest.java | 4 +- .../weex/uitest/TC_AG/AG_AHref_A_Href.java | 18 ++ .../TC_AG/AG_Border_A_Border_Bottom_Color.java | 18 ++ .../AG_Border_A_Border_Bottom_Left_Radius.java | 18 ++ .../AG_Border_A_Border_Bottom_Right_Radius.java | 18 ++ .../TC_AG/AG_Border_A_Border_Bottom_Width.java | 18 ++ .../uitest/TC_AG/AG_Border_A_Border_Color.java | 18 ++ .../TC_AG/AG_Border_A_Border_Left_Color.java| 18 ++ .../TC_AG/AG_Border_A_Border_Left_Width.java| 18 ++ .../uitest/TC_AG/AG_Border_A_Border_Radius.java | 18 ++ .../TC_AG/AG_Border_A_Border_Right_Color.java | 18 ++ .../TC_AG/AG_Border_A_Border_Right_Width.java | 18 ++ .../uitest/TC_AG/AG_Border_A_Border_Style.java | 18 ++ .../TC_AG/AG_Border_A_Border_Top_Color.java | 18 ++ .../AG_Border_A_Border_Top_Left_Radius.java | 18 ++ .../AG_Border_A_Border_Top_Right_Radius.java| 18 ++ .../TC_AG/AG_Border_A_Border_Top_Width.java | 18 ++ .../uitest/TC_AG/AG_Border_A_Border_Width.java | 18 ++ .../AG_Border_Div_Border_Bottom_Color.java | 18 ++ ...AG_Border_Div_Border_Bottom_Left_Radius.java | 18 ++ ...G_Border_Div_Border_Bottom_Right_Radius.java | 18 ++ .../AG_Border_Div_Border_Bottom_Width.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Color.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Left_Color.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Left_Width.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Radius.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Right_Color.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Right_Width.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Style.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Top_Color.java | 18 ++ .../AG_Border_Div_Border_Top_Left_Radius.java | 18 ++ .../AG_Border_Div_Border_Top_Right_Radius.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Top_Width.java | 18 ++ .../TC_AG/AG_Border_Div_Border_Width.java | 18 ++ .../AG_Border_Image_Border_Bottom_Color.java| 18 ++ ..._Border_Image_Border_Bottom_Left_Radius.java | 18 ++ ...Border_Image_Border_Bottom_Right_Radius.java | 18 ++ .../AG_Border_Image_Border_Bottom_Width.java| 18 ++ .../TC_AG/AG_Border_Image_Border_Color.java | 18 ++ .../AG_Border_Image_Border_Left_Color.java | 18 ++ .../AG_Border_Image_Border_Left_Width.java | 18 ++ .../TC_AG/AG_Border_Image_Border_Radius.java| 18 ++ .../AG_Border_Image_Border_Right_Color.java | 18 ++ .../AG_Border_Image_Border_Right_Width.java | 18 ++ .../TC_AG/AG_Border_Image_Border_Style.java | 18 ++ .../TC_AG/AG_Border_Image_Border_Top_Color.java | 18 ++ .../AG_Border_Image_Border_Top_Left_Radius.java | 18 ++ ...AG_Border_Image_Border_Top_Right_Radius.java | 18 ++ .../TC_AG/AG_Border_Image_Border_Top_Width.java | 18 ++ .../TC_AG/AG_Border_Image_Border_Width.java | 18 ++ .../AG_Border_Input_Border_Bottom_Color.java| 18 ++ ..._Border_Input_Border_Bottom_Left_Radius.java | 18 ++ ...Border_Input_Border_Bottom_Right_Radius.java | 18 ++ .../AG_Border_Input_Border_Bottom_Width.java| 18 ++ .../TC_AG/AG_Border_Input_Border_Color.java | 18 ++ .../AG_Border_Input_Border_Left_Color.java | 18 ++ .../AG_Border_Input_Border_Left_Width.java | 18 ++ .../TC_AG/AG_Border_Input_Border_Radius.java| 18 ++ .../AG_Border_Input_Border_Right_Color.java | 18 ++ .../AG_Border_Input_Border_Right_Width.java | 18 ++ .../TC_AG/AG_Border_Input_Border_Style.java | 18 ++ .../TC_AG/AG_Border_Input_Border_Top_Color.java | 18 ++ .../AG_Border_Input_Border_Top_Left_Radius.java | 18 ++ ...AG_Border_Input_Border_Top_Right_Radius.java | 18 ++ .../TC_AG/AG_Border_Input_Border_Top_Width.java | 18 ++ .../TC_AG/AG_Border_Input_Border_Width.java | 18 ++
[11/50] [abbrv] incubator-weex git commit: Merge branch '0.12-dev' into 0.12-dev-web
Merge branch '0.12-dev' into 0.12-dev-web Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/06b444b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/06b444b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/06b444b8 Branch: refs/heads/0.12-dev Commit: 06b444b8642214d4177a3ccc06f12985ffa1b995 Parents: a68dab1 93c5329 Author: MrRaindropAuthored: Fri Apr 14 13:56:01 2017 +0800 Committer: MrRaindrop Committed: Fri Apr 14 13:56:01 2017 +0800 -- android/sdk/assets/main.js | 16 +- android/sdk/libs/armeabi/libweexv8.so | Bin 3563544 -> 3563544 bytes android/sdk/libs/x86/libweexv8.so | Bin 4545544 -> 4545544 bytes .../java/com/taobao/weex/WXSDKInstance.java | 2 +- .../taobao/weex/ui/component/WXComponent.java | 7 +- .../java/com/taobao/weex/WXSDKInstanceTest.java | 1 - dangerfile.js | 7 +- html5/frameworks/legacy/app/ctrl/init.js| 42 +-- ios/sdk/WeexSDK/Resources/main.js | 16 +- .../WeexSDK/Sources/Component/WXTextComponent.h | 1 + .../WeexSDK/Sources/Component/WXTextComponent.m | 307 +-- .../Sources/Display/WXComponent+Display.m | 2 +- ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 2 + ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 55 +++- package.json| 4 +- 15 files changed, 366 insertions(+), 96 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/06b444b8/package.json -- diff --cc package.json index 6f2002a,53f65d8..04285af --- a/package.json +++ b/package.json @@@ -3,8 -3,8 +3,8 @@@ "version": "0.4.0", "subversion": { "browser": "0.5.0", - "framework": "0.20.3", + "framework": "0.20.4", -"vue-render": "0.11.5", +"vue-render": "0.11.6", "transformer": ">=0.1.5 <0.5" }, "description": "A framework for building Mobile cross-platform UI",
[08/50] [abbrv] incubator-weex git commit: * [html5] udpate pkg main.
* [html5] udpate pkg main. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6e08521a Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6e08521a Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6e08521a Branch: refs/heads/0.12-dev Commit: 6e08521a2dd544fbd05b51f1866689956bd26b53 Parents: eb0d6cf Author: MrRaindropAuthored: Fri Apr 14 13:51:54 2017 +0800 Committer: MrRaindrop Committed: Fri Apr 14 13:51:54 2017 +0800 -- packages/weex-vue-render/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e08521a/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index 9e28dc2..01c241c 100644 --- a/packages/weex-vue-render/package.json +++ b/packages/weex-vue-render/package.json @@ -3,7 +3,7 @@ "version": "0.11.5", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", - "main": "src/render/vue/index.js", + "main": "dist/index.js", "repository": { "type": "git", "url": "g...@github.com:alibaba/weex.git"
[04/50] [abbrv] incubator-weex git commit: * [html5] fix events bubble error.
* [html5] fix events bubble error. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a303f4fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a303f4fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a303f4fa Branch: refs/heads/0.12-dev Commit: a303f4fab7ceaf76c00d15026889914eac624c57 Parents: ca4f199 Author: MrRaindropAuthored: Thu Apr 13 17:38:13 2017 +0800 Committer: MrRaindrop Committed: Thu Apr 13 17:38:13 2017 +0800 -- html5/render/vue/core/node.js | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a303f4fa/html5/render/vue/core/node.js -- diff --git a/html5/render/vue/core/node.js b/html5/render/vue/core/node.js index ad42198..a780645 100644 --- a/html5/render/vue/core/node.js +++ b/html5/render/vue/core/node.js @@ -23,7 +23,10 @@ const supportedEvents = [ export function createEventMap (context, extras = []) { const eventMap = {} supportedEvents.concat(extras).forEach(name => { -eventMap[name] = event => context.$emit(name, event) +eventMap[name] = function (e) { + e.stopPropagation() + context.$emit(name, e) +} }) return eventMap }
[36/50] [abbrv] incubator-weex git commit: * [html5] fix trimComment.
* [html5] fix trimComment. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c10a0f0b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c10a0f0b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c10a0f0b Branch: refs/heads/0.12-dev Commit: c10a0f0b30c94ee3ed0843b3ced2e4f41e29f92b Parents: 944e9b1 Author: MrRaindropAuthored: Tue Apr 18 16:19:31 2017 +0800 Committer: MrRaindrop Committed: Tue Apr 18 16:19:31 2017 +0800 -- html5/render/vue/utils/style.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c10a0f0b/html5/render/vue/utils/style.js -- diff --git a/html5/render/vue/utils/style.js b/html5/render/vue/utils/style.js index 41530d3..7b51f29 100644 --- a/html5/render/vue/utils/style.js +++ b/html5/render/vue/utils/style.js @@ -34,7 +34,7 @@ const noUnitsNumberKeys = [ * remove comments from a cssText. */ export function trimComment (cssText: string): string { - return cssText.replace(/(?:\/\*)[^*]*\*\//g, '') + return cssText.replace(/(?:\/\*).*\*\//g, '') } let support: boolean | null = null
[14/50] [abbrv] incubator-weex git commit: * [html5] fix lint.
* [html5] fix lint. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a93240c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a93240c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a93240c9 Branch: refs/heads/0.12-dev Commit: a93240c9bbbc85d1e8090110caa3e3266b7f7510 Parents: 57afc02 Author: MrRaindropAuthored: Fri Apr 14 17:21:48 2017 +0800 Committer: MrRaindrop Committed: Fri Apr 14 17:21:48 2017 +0800 -- html5/test/render/vue/core/node.js | 12 ++-- html5/test/render/vue/helper/main.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a93240c9/html5/test/render/vue/core/node.js -- diff --git a/html5/test/render/vue/core/node.js b/html5/test/render/vue/core/node.js index 936dca0..910e390 100644 --- a/html5/test/render/vue/core/node.js +++ b/html5/test/render/vue/core/node.js @@ -1,3 +1,5 @@ +/* global Event */ + import { init } from '../helper/runtime' import div from '../../../../render/vue/components/div' @@ -9,21 +11,20 @@ init('core node', (Vue, helper) => { before(() => { helper.register('div', div) }) - + describe('stop event bubble', function () { let infoStr = '' -let i = 0 function trackerShouldBe (tracker, shouldBe) { shouldBe = infoStr + shouldBe expect(tracker).to.equal(shouldBe) infoStr = shouldBe } - + it('should trigger the closest parent.', function (done) { const vm = helper.createVm(eventBubbleBundle, id) const el = vm.$el.querySelector('.event-bubble-outter') expect(vm.tracker).to.equal('') - + /** * click outter div. should trigget event on the outter div. * and should execute handlers by the priority of: @@ -40,8 +41,7 @@ init('core node', (Vue, helper) => { }) }) -it ('should not bubble if already triggered.', function (done) { - +it('should not bubble if already triggered.', function (done) { const vm = helper.createVm(eventBubbleBundle, id) const inner = vm.$el.querySelector('.event-bubble-inner') http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a93240c9/html5/test/render/vue/helper/main.js -- diff --git a/html5/test/render/vue/helper/main.js b/html5/test/render/vue/helper/main.js index 5b71013..cff3ec8 100644 --- a/html5/test/render/vue/helper/main.js +++ b/html5/test/render/vue/helper/main.js @@ -62,7 +62,7 @@ const helper = { this._done[id] = cb }, - unregisterDone(id) { + unregisterDone (id) { if (!id) { return } delete this._done[id] },
[39/50] [abbrv] incubator-weex git commit: Merge branch '0.12-dev' of https://github.com/apache/incubator-weex into 0.12-dev-web
Merge branch '0.12-dev' of https://github.com/apache/incubator-weex into 0.12-dev-web Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8cd9157b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8cd9157b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8cd9157b Branch: refs/heads/0.12-dev Commit: 8cd9157ba8df4cc693e3f2845adb1134d9dbe724 Parents: d038a93 8ce111a Author: MrRaindropAuthored: Tue Apr 18 16:37:59 2017 +0800 Committer: MrRaindrop Committed: Tue Apr 18 16:37:59 2017 +0800 -- .travis.yml | 42 +-- NOTICE | 75 WeexSDK.podspec | 45 android/run-ci.sh | 2 +- .../com/taobao/weex/ui/component/WXEmbed.java | 2 +- examples/component/input-demo.we| 14 ++-- examples/index.we | 5 +- examples/vue/components/input.vue | 14 ++-- examples/vue/index.vue | 3 + examples/vue/market/gcanvas.vue | 40 +++ ios/playground/Podfile | 5 +- .../WeexDemo.xcodeproj/project.pbxproj | 4 +- ios/sdk/WeexSDK.podspec | 47 .../WeexSDK/Sources/Bridge/WXBridgeContext.m| 2 +- .../Sources/Component/WXSliderComponent.m | 53 +++--- .../Sources/Controller/WXBaseViewController.h | 2 +- .../Sources/Controller/WXBaseViewController.m | 16 - .../Sources/Controller/WXRootViewController.m | 17 - ios/sdk/WeexSDKTests/WXRootViewTests.m | 4 +- package.json| 4 +- test/ci-funcs.sh| 75 +++- test/run.sh | 41 ++- test/scripts/components/image-onload.test.js| 2 +- test/scripts/components/recycler.test.js| 2 +- 24 files changed, 294 insertions(+), 222 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8cd9157b/package.json --
[16/50] [abbrv] incubator-weex git commit: * [all] update src-header
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/test/scripts/components/scroll-event.test.js -- diff --git a/test/scripts/components/scroll-event.test.js b/test/scripts/components/scroll-event.test.js index 78f67fd..17d94f4 100644 --- a/test/scripts/components/scroll-event.test.js +++ b/test/scripts/components/scroll-event.test.js @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ 'use strict'; var _ = require('macaca-utils'); http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/test/scripts/components/scroller-fixed.test.js -- diff --git a/test/scripts/components/scroller-fixed.test.js b/test/scripts/components/scroller-fixed.test.js index c1db923..7add2a5 100644 --- a/test/scripts/components/scroller-fixed.test.js +++ b/test/scripts/components/scroller-fixed.test.js @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ 'use strict'; var _ = require('macaca-utils'); @@ -36,4 +54,4 @@ describe('scroller fixed position item ', function () { assert.equal(parts[2],0); }) }) -}); \ No newline at end of file +}); http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/test/scripts/components/slider-infinite.test.js -- diff --git a/test/scripts/components/slider-infinite.test.js b/test/scripts/components/slider-infinite.test.js index b3f37a4..8377d59 100644 --- a/test/scripts/components/slider-infinite.test.js +++ b/test/scripts/components/slider-infinite.test.js @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ 'use strict'; var _ = require('macaca-utils'); http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/test/scripts/components/textarea-maxlength.test.js -- diff --git a/test/scripts/components/textarea-maxlength.test.js b/test/scripts/components/textarea-maxlength.test.js index e2bb3cc..8eefa58 100644 --- a/test/scripts/components/textarea-maxlength.test.js +++ b/test/scripts/components/textarea-maxlength.test.js @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License.
[12/50] [abbrv] incubator-weex git commit: * [html5] fix event bubbles.
* [html5] fix event bubbles. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f96ad274 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f96ad274 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f96ad274 Branch: refs/heads/0.12-dev Commit: f96ad2745f3a8048f1e46a70f9ac5b0859756b05 Parents: 06b444b Author: MrRaindropAuthored: Fri Apr 14 17:12:43 2017 +0800 Committer: MrRaindrop Committed: Fri Apr 14 17:12:43 2017 +0800 -- html5/render/vue/core/node.js | 49 +++- html5/test/render/vue/core/node.js | 62 .../render/vue/data/dotvue/event-bubble-bar.vue | 20 +++ .../render/vue/data/dotvue/event-bubble.vue | 25 .../vue/data/dotvue/first-screen-appear-foo.vue | 27 + .../vue/data/dotvue/first-screen-appear.vue | 2 +- html5/test/render/vue/data/dotvue/foo.vue | 27 - html5/test/render/vue/helper/main.js| 5 ++ html5/test/render/vue/utils/component.js| 4 +- 9 files changed, 190 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f96ad274/html5/render/vue/core/node.js -- diff --git a/html5/render/vue/core/node.js b/html5/render/vue/core/node.js index a780645..69a0269 100644 --- a/html5/render/vue/core/node.js +++ b/html5/render/vue/core/node.js @@ -10,9 +10,31 @@ export function trimTextVNodes (vnodes) { return vnodes } +/** + * get listeners from on config and v-on binding. + * v-on binding has a priority over on config. + * @param {vnode} vnode + * @param {String} evt: event name. + */ +function getListeners (vnode, evt) { + const handlers = [] + while (vnode) { +if (vnode.data && vnode.data.on) { + const handler = vnode.data.on[evt] + handler && handlers.push(handler) +} +if (vnode.componentOptions && vnode.componentOptions.listeners) { + const handler = vnode.componentOptions.listeners[evt] + handler && handlers.push(handler) +} +vnode = vnode.parent + } + return handlers +} + const supportedEvents = [ 'click', 'longpress', 'appear', 'disappear', - 'touchstart', 'touchmove', 'touchend', + // 'touchstart', 'touchmove', 'touchend', 'panstart', 'panmove', 'panend', 'swipe', 'longpress' ] /** @@ -24,8 +46,31 @@ export function createEventMap (context, extras = []) { const eventMap = {} supportedEvents.concat(extras).forEach(name => { eventMap[name] = function (e) { + // no original bubbling. e.stopPropagation() - context.$emit(name, e) + // but should trigger the closest parent which has bound the + // event handler. + let vm = context + while (vm) { +const ons = getListeners(vm.$vnode, name) +const len = ons.length +let idx = 0 +while (idx < len) { + let on = ons[idx] + if (on && on.fn) { +on = on.fn + } + on && on.call(vm, e) + idx++ +} + +// once a parent node (or self node) has triggered the handler, +// then it stops bubble immediately. +if (len > 0) { + return +} +vm = vm.$parent + } } }) return eventMap http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f96ad274/html5/test/render/vue/core/node.js -- diff --git a/html5/test/render/vue/core/node.js b/html5/test/render/vue/core/node.js new file mode 100644 index 000..936dca0 --- /dev/null +++ b/html5/test/render/vue/core/node.js @@ -0,0 +1,62 @@ +import { init } from '../helper/runtime' +import div from '../../../../render/vue/components/div' + +import eventBubbleBundle from '../data/build/dotvue/event-bubble.js' + +init('core node', (Vue, helper) => { + const id = 'test-event-bubble' + + before(() => { +helper.register('div', div) + }) + + describe('stop event bubble', function () { +let infoStr = '' +let i = 0 +function trackerShouldBe (tracker, shouldBe) { + shouldBe = infoStr + shouldBe + expect(tracker).to.equal(shouldBe) + infoStr = shouldBe +} + +it('should trigger the closest parent.', function (done) { + const vm = helper.createVm(eventBubbleBundle, id) + const el = vm.$el.querySelector('.event-bubble-outter') + expect(vm.tracker).to.equal('') + + /** + * click outter div. should trigget event on the outter div. + * and should execute handlers by the priority of: + * child vnode -> parent vnode. + * e.g. div -> foo (whoes root element is the div.) + */ + const
[42/50] [abbrv] incubator-weex git commit: * [html5] update perf time.
* [html5] update perf time. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/bd794e5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bd794e5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bd794e5e Branch: refs/heads/0.12-dev Commit: bd794e5e81b97d9503dc0166801c585dbcb5e98d Parents: f13c453 Author: MrRaindropAuthored: Wed Apr 19 12:17:02 2017 +0800 Committer: MrRaindrop Committed: Wed Apr 19 12:17:02 2017 +0800 -- html5/render/vue/mixins/base.js | 16 ++-- html5/render/vue/utils/perf.js | 76 +--- 2 files changed, 65 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bd794e5e/html5/render/vue/mixins/base.js -- diff --git a/html5/render/vue/mixins/base.js b/html5/render/vue/mixins/base.js index c8185d5..819146e 100644 --- a/html5/render/vue/mixins/base.js +++ b/html5/render/vue/mixins/base.js @@ -24,7 +24,9 @@ import { import { tagBeforeCreate, - tagMounted, + // tagMounted, + tagRootMounted, + tagFirstScreen, tagBeforeUpdate, tagUpdated, tagBegin, @@ -61,14 +63,20 @@ export default { }, mounted () { +if (this.$options._componentTag === 'image') { + global._has_image_in_first_screen = true +} +if (this === this.$root) { + tagRootMounted() + if (!global._has_image_in_first_screen) { +tagFirstScreen() + } +} if (!weex._root) { weex._root = this.$root.$el weex._root.classList.add('weex-root') } watchAppear(this) -if (process.env.NODE_ENV === 'development') { - tagMounted() -} }, beforeUpdate () { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bd794e5e/html5/render/vue/utils/perf.js -- diff --git a/html5/render/vue/utils/perf.js b/html5/render/vue/utils/perf.js index f8540eb..13be79f 100644 --- a/html5/render/vue/utils/perf.js +++ b/html5/render/vue/utils/perf.js @@ -73,6 +73,45 @@ function getEntries (): Array { : [{ responseEnd: getNow() - IMG_REC_INDENT }] } +function _d (func: Function, wait: number) { + let timerId + let now + function later (now) { +timerId = null +func(now) + } + return function () { +now = getNow() +clearTimeout(timerId) +timerId = setTimeout(later.bind(null, now), wait) + } +} + +export function tagFirstScreen (time?: number): void { + if (!time) { +time = getNow() + } + perf.latestRenderFinishes.push(time) + const start = Math.max(earliestBeforeCreateTime, earliestBeforeUpdateTime) + perf.renderTime.push({ +start, +end: time, +duration: time - start + }) + + const num = perf.renderTime.length + perf[`screenTime${num}`] = time + window.weex.emit('renderfinish', time) + if (!isFirstScreenDetected) { +isFirstScreenDetected = true +window.weex.emit('firstscreenfinish', time) + } + if (process.env.NODE_ENV === 'development') { +console.log(`screenTime[${num}]: ${time} ms.`) +console.log('_weex_perf:', window._weex_perf) + } +} + /** * get first screen time. */ @@ -90,25 +129,7 @@ const debouncedTagImg = debounce(function () { }) i++ } - perf.latestRenderFinishes.push(end) - const start = Math.max(earliestBeforeCreateTime, earliestBeforeUpdateTime) - perf.renderTime.push({ -start, -end, -duration: end - start - }) - - const num = perf.renderTime.length - perf[`screenTime${num}`] = end - window.weex.emit('renderfinish', end) - if (!isFirstScreenDetected) { -isFirstScreenDetected = true -window.weex.emit('firstscreenfinish', end) - } - if (process.env.NODE_ENV === 'development') { -console.log(`screenTime[${num}]: ${end} ms.`) -console.log('_weex_perf:', window._weex_perf) - } + tagFirstScreen(end) }, IMG_REC_INDENT) export function tagImg (): void { @@ -128,11 +149,21 @@ export function tagBeforeCreate (): void { depressedTagBeforeCreate() } +export function tagRootMounted (): void { + const now = getNow() + perf.latestMounts.push(now) + if (!perf.firstAllMountedTime) { +perf.firstAllMountedTime = now +if (process.env.NODE_ENV === 'development') { + console.log(`first all mounted time: ${now} ms.`) +} + } +} + /** * recording the latest 'mounted' time. */ -const debouncedTagMounted = debounce(function () { - const now = getNow() +const debouncedTagMounted = _d(function (now) { perf.latestMounts.push(now) perf.createTime.push({ start: earliestBeforeCreateTime, @@ -168,8 +199,7 @@ export function tagBeforeUpdate (): void { /** * recording the latest 'updated'
[06/50] [abbrv] incubator-weex git commit: + [html5] add web platform only event: firstscreenfinish.
+ [html5] add web platform only event: firstscreenfinish. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8e053458 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8e053458 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8e053458 Branch: refs/heads/0.12-dev Commit: 8e0534589a76e75132075c43b675be179c480740 Parents: 8dd79bd Author: MrRaindropAuthored: Fri Apr 14 11:52:44 2017 +0800 Committer: MrRaindrop Committed: Fri Apr 14 11:52:44 2017 +0800 -- html5/render/vue/utils/perf.js | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8e053458/html5/render/vue/utils/perf.js -- diff --git a/html5/render/vue/utils/perf.js b/html5/render/vue/utils/perf.js index 4804815..f8540eb 100644 --- a/html5/render/vue/utils/perf.js +++ b/html5/render/vue/utils/perf.js @@ -61,6 +61,8 @@ const IMG_REC_INDENT: number = 500 // record loading events after 500ms towards let earliestBeforeUpdateTime: number = 0 let earliestBeforeCreateTime: number = 0 +let isFirstScreenDetected = false + function getNow (): number { return performance.now ? performance.now() : new Date().getTime() } @@ -99,6 +101,10 @@ const debouncedTagImg = debounce(function () { const num = perf.renderTime.length perf[`screenTime${num}`] = end window.weex.emit('renderfinish', end) + if (!isFirstScreenDetected) { +isFirstScreenDetected = true +window.weex.emit('firstscreenfinish', end) + } if (process.env.NODE_ENV === 'development') { console.log(`screenTime[${num}]: ${end} ms.`) console.log('_weex_perf:', window._weex_perf)
[17/50] [abbrv] incubator-weex git commit: * [all] update src-header
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/ios/playground/WeexDemoTests/WeexDemoTests.m -- diff --git a/ios/playground/WeexDemoTests/WeexDemoTests.m b/ios/playground/WeexDemoTests/WeexDemoTests.m index 0596cb1..c143038 100644 --- a/ios/playground/WeexDemoTests/WeexDemoTests.m +++ b/ios/playground/WeexDemoTests/WeexDemoTests.m @@ -1,9 +1,20 @@ -/** - * Created by Weex. - * Copyright (c) 2016, Alibaba, Inc. All rights reserved. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * This source code is licensed under the Apache Licence 2.0. - * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ #import http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/ios/playground/WeexUITestDemoUITests/WeexUITestDemoUITests.m -- diff --git a/ios/playground/WeexUITestDemoUITests/WeexUITestDemoUITests.m b/ios/playground/WeexUITestDemoUITests/WeexUITestDemoUITests.m index e5be497..cbeca46 100644 --- a/ios/playground/WeexUITestDemoUITests/WeexUITestDemoUITests.m +++ b/ios/playground/WeexUITestDemoUITests/WeexUITestDemoUITests.m @@ -1,9 +1,20 @@ -/** - * Created by Weex. - * Copyright (c) 2016, Alibaba, Inc. All rights reserved. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * This source code is licensed under the Apache Licence 2.0. - * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ #import http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.h -- diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.h b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.h index 25428a4..4ad4a9b 100644 --- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.h +++ b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.h @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m -- diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m index 51bcd58..e99e88f 100644 --- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m +++ b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in
[13/50] [abbrv] incubator-weex git commit: * [html5] release 0.11.7
* [html5] release 0.11.7 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/57afc02c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/57afc02c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/57afc02c Branch: refs/heads/0.12-dev Commit: 57afc02c41f4c6d2294c7110dc0ba4a667677269 Parents: f96ad27 Author: MrRaindropAuthored: Fri Apr 14 17:15:37 2017 +0800 Committer: MrRaindrop Committed: Fri Apr 14 17:15:37 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/57afc02c/package.json -- diff --git a/package.json b/package.json index 04285af..af10f15 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.20.4", -"vue-render": "0.11.6", +"vue-render": "0.11.7", "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/57afc02c/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index 78d5a16..093b775 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.6", + "version": "0.11.7", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js",
[35/50] [abbrv] incubator-weex git commit: * [html5] fix updating rendering without processing children's render function.
* [html5] fix updating rendering without processing children's render function. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/944e9b18 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/944e9b18 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/944e9b18 Branch: refs/heads/0.12-dev Commit: 944e9b18ac2322e3c23e0f5148626d0d2fae90e1 Parents: 91468cf Author: MrRaindropAuthored: Tue Apr 18 16:18:58 2017 +0800 Committer: MrRaindrop Committed: Tue Apr 18 16:18:58 2017 +0800 -- html5/render/vue/mixins/base.js | 25 +++-- 1 file changed, 23 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/944e9b18/html5/render/vue/mixins/base.js -- diff --git a/html5/render/vue/mixins/base.js b/html5/render/vue/mixins/base.js index 0bfd2ad..c8185d5 100644 --- a/html5/render/vue/mixins/base.js +++ b/html5/render/vue/mixins/base.js @@ -16,8 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -import { getThrottleLazyload, watchAppear } from '../utils' -import { tagBeforeCreate, tagMounted, tagBeforeUpdate, tagUpdated, tagBegin, tagEnd } from '../utils/perf' +import { + getThrottleLazyload, + watchAppear, + toCSSText +} from '../utils' + +import { + tagBeforeCreate, + tagMounted, + tagBeforeUpdate, + tagUpdated, + tagBegin, + tagEnd +} from '../utils/perf' + +import { extractComponentStyle } from '../core' const scrollableTypes = ['scroller', 'list'] @@ -67,6 +81,13 @@ export default { if (process.env.NODE_ENV === 'development') { tagUpdated() } +if (this.$vnode && this.$vnode.data) { + const style = extractComponentStyle(this) + const el = this.$el + if (style && el && el.nodeType !== 8) { +this.$el.style.cssText += toCSSText(style) + } +} watchAppear(this) },
[40/50] [abbrv] incubator-weex git commit: * [html5] ref in v-if is a array.
* [html5] ref in v-if is a 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/a38e2899 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a38e2899 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a38e2899 Branch: refs/heads/0.12-dev Commit: a38e28998d411959ae03dd53f77c413ee100a709 Parents: 8cd9157 Author: MrRaindropAuthored: Tue Apr 18 18:52:49 2017 +0800 Committer: MrRaindrop Committed: Tue Apr 18 18:52:49 2017 +0800 -- html5/render/vue/modules/animation.js | 16 +++- html5/render/vue/modules/dom.js | 16 +++- html5/render/vue/modules/webview.js | 20 +++- 3 files changed, 49 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a38e2899/html5/render/vue/modules/animation.js -- diff --git a/html5/render/vue/modules/animation.js b/html5/render/vue/modules/animation.js index a294896..07542bb 100644 --- a/html5/render/vue/modules/animation.js +++ b/html5/render/vue/modules/animation.js @@ -16,9 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -import { nextFrame, toCSSText, autoPrefix, camelizeKeys, normalizeStyle } from '../utils' +import { + nextFrame, + toCSSText, + autoPrefix, + camelizeKeys, + normalizeStyle, + isArray +} from '../utils' function transitionOnce (vnode, config, callback) { + if (isArray(vnode)) { +if (process.env.NODE_ENV === 'development') { + console.warn('[vue-render] the ref passed to animation.transitionOnce is a array.') +} +vnode = vnode[0] + } + const duration = config.duration || 0 // ms const timing = config.timingFunction || 'linear' const delay = config.delay || 0 // ms http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a38e2899/html5/render/vue/modules/dom.js -- diff --git a/html5/render/vue/modules/dom.js b/html5/render/vue/modules/dom.js index 61f30dd..117eaeb 100644 --- a/html5/render/vue/modules/dom.js +++ b/html5/render/vue/modules/dom.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { camelToKebab, appendCss } from '../utils' +import { camelToKebab, appendCss, isArray } from '../utils' function getParentScroller (vnode) { if (!vnode) return null @@ -83,6 +83,13 @@ export default { * ps: scroll-to has 'ease' and 'duration'(ms) as options. */ scrollToElement: function (vnode, options) { +if (isArray(vnode)) { + if (process.env.NODE_ENV === 'development') { +console.warn('[vue-render] the ref passed to animation.transitionOnce is a array.') + } + vnode = vnode[0] +} + const scroller = getParentScroller(vnode) const scrollDirection = scroller.scrollDirection || 'vertical' @@ -126,6 +133,13 @@ export default { * @param {Function} callback */ getComponentRect: function (vnode, callback) { +if (isArray(vnode)) { + if (process.env.NODE_ENV === 'development') { +console.warn('[vue-render] the ref passed to animation.transitionOnce is a array.') + } + vnode = vnode[0] +} + const info = { result: false } if (vnode && vnode === 'viewport') { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a38e2899/html5/render/vue/modules/webview.js -- diff --git a/html5/render/vue/modules/webview.js b/html5/render/vue/modules/webview.js index b5bfe9f..f4aec49 100644 --- a/html5/render/vue/modules/webview.js +++ b/html5/render/vue/modules/webview.js @@ -20,19 +20,37 @@ /** * Webview module */ - +import { isArray } from '../utils' export default { goBack (vnode) { +if (isArray(vnode)) { + if (process.env.NODE_ENV === 'development') { +console.warn('[vue-render] the ref passed to animation.transitionOnce is a array.') + } + vnode = vnode[0] +} if (vnode && typeof vnode.goBack === 'function') { vnode.goBack() } }, goForward (vnode) { +if (isArray(vnode)) { + if (process.env.NODE_ENV === 'development') { +console.warn('[vue-render] the ref passed to animation.transitionOnce is a array.') + } + vnode = vnode[0] +} if (vnode && typeof vnode.goForward === 'function') { vnode.goForward() } }, reload (vnode) { +if (isArray(vnode)) { + if (process.env.NODE_ENV === 'development') { +console.warn('[vue-render] the ref passed to animation.transitionOnce is a array.') + } + vnode =
[47/50] [abbrv] incubator-weex git commit: * [html5] fix scroll to element for window scroll.
* [html5] fix scroll to element for window scroll. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7eb86571 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7eb86571 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7eb86571 Branch: refs/heads/0.12-dev Commit: 7eb865715bf7b08eadf37f2965f3457dd5a0a176 Parents: 5ce1c11 Author: MrRaindropAuthored: Fri Apr 21 12:12:40 2017 +0800 Committer: MrRaindrop Committed: Fri Apr 21 12:12:40 2017 +0800 -- html5/render/vue/modules/dom.js | 26 ++ 1 file changed, 18 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7eb86571/html5/render/vue/modules/dom.js -- diff --git a/html5/render/vue/modules/dom.js b/html5/render/vue/modules/dom.js index 117eaeb..43db8a6 100644 --- a/html5/render/vue/modules/dom.js +++ b/html5/render/vue/modules/dom.js @@ -91,20 +91,30 @@ export default { } const scroller = getParentScroller(vnode) -const scrollDirection = scroller.scrollDirection || 'vertical' +const scrollDirection = scroller && scroller.scrollDirection || 'vertical' -if (scroller && scroller.$el && vnode.$el) { +const isWindow = !scroller +const ct = isWindow ? document.body : scroller.$el +const el = vnode.$el + +if (ct && el) { // if it's a list, then the listVnode.scrollDirection is undefined. just // assum it is the default value 'vertical'. const dSuffix = ({ horizontal: 'Left', vertical: 'Top' })[scrollDirection] - let offset = vnode.$el[`offset${dSuffix}`] + + const ctRect = ct.getBoundingClientRect() + const elRect = el.getBoundingClientRect() + + const dir = dSuffix.toLowerCase() + let offset = el[`scroll${dSuffix}`] + elRect[dir] - ctRect[dir] + // let offset = el[`offset${dSuffix}`] if (options) { -offset += Number(options.offset) || 0 -offset *= weex.config.env.scale /* adapt offset to different screen scales. */ +offset += options.offset && options.offset * weex.config.env.scale || 0 +// offset *= weex.config.env.scale /* adapt offset to different screen scales. */ } else if (process.env.NODE_ENV === 'development') { console.warn('[Vue Render] The second parameter of "scrollToElement" is required, ' @@ -112,14 +122,14 @@ export default { } if (options && options.animated === false) { -return scrollElement.call(scroller.$el, dSuffix, offset) +return scrollElement.call(ct, dSuffix, offset) } step({ -scrollable: scroller.$el, +scrollable: ct, startTime: now(), frame: null, -startPosition: scroller.$el[`scroll${dSuffix}`], +startPosition: ct[`scroll${dSuffix}`], position: offset, method: scrollElement, dSuffix: dSuffix
[46/50] [abbrv] incubator-weex git commit: * [html5] fix updating children style error.
* [html5] fix updating children style error. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5ce1c113 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5ce1c113 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5ce1c113 Branch: refs/heads/0.12-dev Commit: 5ce1c113138937c177d9266c953b023f292ad05f Parents: afed7f7 Author: MrRaindropAuthored: Fri Apr 21 11:08:14 2017 +0800 Committer: MrRaindrop Committed: Fri Apr 21 11:08:14 2017 +0800 -- html5/render/vue/mixins/base.js | 16 1 file changed, 12 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ce1c113/html5/render/vue/mixins/base.js -- diff --git a/html5/render/vue/mixins/base.js b/html5/render/vue/mixins/base.js index 819146e..f2ef32b 100644 --- a/html5/render/vue/mixins/base.js +++ b/html5/render/vue/mixins/base.js @@ -89,13 +89,21 @@ export default { if (process.env.NODE_ENV === 'development') { tagUpdated() } -if (this.$vnode && this.$vnode.data) { - const style = extractComponentStyle(this) - const el = this.$el +function remergeStyle (vm) { + const style = extractComponentStyle(vm) + const el = vm.$el if (style && el && el.nodeType !== 8) { -this.$el.style.cssText += toCSSText(style) +vm.$el.style.cssText += toCSSText(style) } } +const children = this.$children +if (children) { + children.forEach((childVm) => { +this.$nextTick(function () { + remergeStyle(childVm) +}) + }) +} watchAppear(this) },
[22/50] [abbrv] incubator-weex git commit: * [all] update src-header
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Margin_A_Margin_Bottom.java -- diff --git a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Margin_A_Margin_Bottom.java b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Margin_A_Margin_Bottom.java index 5dd8328..a06c92a 100644 --- a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Margin_A_Margin_Bottom.java +++ b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Margin_A_Margin_Bottom.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package com.alibaba.weex.uitest.TC_AG; import com.alibaba.weex.WXPageActivity; import com.alibaba.weex.util.TestFlow; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Margin_A_Margin_Left.java -- diff --git a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Margin_A_Margin_Left.java b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Margin_A_Margin_Left.java index 6b1086e..869115e 100644 --- a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Margin_A_Margin_Left.java +++ b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Margin_A_Margin_Left.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package com.alibaba.weex.uitest.TC_AG; import com.alibaba.weex.WXPageActivity; import com.alibaba.weex.util.TestFlow; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Margin_A_Margin_Right.java -- diff --git a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Margin_A_Margin_Right.java b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Margin_A_Margin_Right.java index 2545688..f2b9ac0 100644 --- a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Margin_A_Margin_Right.java +++ b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Margin_A_Margin_Right.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package com.alibaba.weex.uitest.TC_AG; import
[09/50] [abbrv] incubator-weex git commit: * [html5] rm src from dist pkg.
* [html5] rm src from dist pkg. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/52152986 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/52152986 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/52152986 Branch: refs/heads/0.12-dev Commit: 5215298630922e3d92f1852ad40926657631a5bd Parents: 6e08521 Author: MrRaindropAuthored: Fri Apr 14 13:52:15 2017 +0800 Committer: MrRaindrop Committed: Fri Apr 14 13:52:15 2017 +0800 -- bin/dist-vue.sh | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52152986/bin/dist-vue.sh -- diff --git a/bin/dist-vue.sh b/bin/dist-vue.sh index 5884f8e..7edc254 100644 --- a/bin/dist-vue.sh +++ b/bin/dist-vue.sh @@ -1,24 +1,25 @@ #!/user/bin/env bash echo '' -echo ' => cping files for vue dist...' +# echo ' => cping files for vue dist...' base_dir=./packages/weex-vue-render src_dir=./html5 vue_dir=${src_dir}/render/vue -browser_dir=${src_dir}/render/browser -shared_dir=${src_dir}/shared -dist_dir=./packages/weex-vue-render/src +# browser_dir=${src_dir}/render/browser +# shared_dir=${src_dir}/shared -rm -rf ${dist_dir} +# dist_dir=./packages/weex-vue-render/src -mkdir $dist_dir -mkdir $dist_dir/render +# rm -rf ${dist_dir} -cp -fR ${browser_dir} ${dist_dir}/render/ -cp -fR ${vue_dir} ${dist_dir}/render/ -cp -fR ${shared_dir} ${dist_dir}/ +# mkdir $dist_dir +# mkdir $dist_dir/render + +# cp -fR ${browser_dir} ${dist_dir}/render/ +# cp -fR ${vue_dir} ${dist_dir}/render/ +# cp -fR ${shared_dir} ${dist_dir}/ echo " => cp READEME.md to dist path..."
[25/50] [abbrv] incubator-weex git commit: * [all] update src-header
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Div_Border_Right_Width.java -- diff --git a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Div_Border_Right_Width.java b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Div_Border_Right_Width.java index 2c94cba..e84210f 100644 --- a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Div_Border_Right_Width.java +++ b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Div_Border_Right_Width.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package com.alibaba.weex.uitest.TC_AG; import com.alibaba.weex.WXPageActivity; import com.alibaba.weex.util.TestFlow; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Div_Border_Style.java -- diff --git a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Div_Border_Style.java b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Div_Border_Style.java index 64a2a63..ed84cc6 100644 --- a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Div_Border_Style.java +++ b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Div_Border_Style.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package com.alibaba.weex.uitest.TC_AG; import com.alibaba.weex.WXPageActivity; import com.alibaba.weex.util.TestFlow; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Div_Border_Top_Color.java -- diff --git a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Div_Border_Top_Color.java b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Div_Border_Top_Color.java index 3ba6425..f136dfc 100644 --- a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Div_Border_Top_Color.java +++ b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Border_Div_Border_Top_Color.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under
[21/50] [abbrv] incubator-weex git commit: * [all] update src-header
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Video_Video_Src.java -- diff --git a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Video_Video_Src.java b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Video_Video_Src.java index 5d738a9..fd59a74 100644 --- a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Video_Video_Src.java +++ b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Video_Video_Src.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package com.alibaba.weex.uitest.TC_AG; import com.alibaba.weex.WXPageActivity; import com.alibaba.weex.util.TestFlow; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Web_Web_Event.java -- diff --git a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Web_Web_Event.java b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Web_Web_Event.java index 3849bc3..02dc357 100644 --- a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Web_Web_Event.java +++ b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Web_Web_Event.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package com.alibaba.weex.uitest.TC_AG; import com.alibaba.weex.WXPageActivity; import com.alibaba.weex.util.TestFlow; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/808d9eba/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Web_Web_Src.java -- diff --git a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Web_Web_Src.java b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Web_Web_Src.java index 97c5ff3..c3e1fa3 100644 --- a/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Web_Web_Src.java +++ b/android/playground/app/src/androidTest/java/com/alibaba/weex/uitest/TC_AG/AG_Web_Web_Src.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package com.alibaba.weex.uitest.TC_AG; import com.alibaba.weex.WXPageActivity; import com.alibaba.weex.util.TestFlow;
[44/50] [abbrv] incubator-weex git commit: * [html5] release vue-render 0.11.9
* [html5] release vue-render 0.11.9 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3c5a64f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3c5a64f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3c5a64f3 Branch: refs/heads/0.12-dev Commit: 3c5a64f3a5fd74346b949a7d24457fbc722ad856 Parents: 8ba4954 Author: MrRaindropAuthored: Wed Apr 19 12:19:42 2017 +0800 Committer: MrRaindrop Committed: Wed Apr 19 12:19:42 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/3c5a64f3/package.json -- diff --git a/package.json b/package.json index 091e649..37ba94b 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.20.4", -"vue-render": "0.11.8", +"vue-render": "0.11.9", "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/3c5a64f3/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index f8150cf..a072b05 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.8", + "version": "0.11.9", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js",
[45/50] [abbrv] incubator-weex git commit: * [html5] fix image loading event.
* [html5] fix image loading event. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/afed7f73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/afed7f73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/afed7f73 Branch: refs/heads/0.12-dev Commit: afed7f73189a18cae6445a9c40d18fbde61b0a24 Parents: 3c5a64f Author: MrRaindropAuthored: Fri Apr 21 11:07:13 2017 +0800 Committer: MrRaindrop Committed: Fri Apr 21 11:07:13 2017 +0800 -- html5/render/vue/utils/lazyload.js | 24 +++- 1 file changed, 19 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/afed7f73/html5/render/vue/utils/lazyload.js -- diff --git a/html5/render/vue/utils/lazyload.js b/html5/render/vue/utils/lazyload.js index e39efcb..04ff7c6 100644 --- a/html5/render/vue/utils/lazyload.js +++ b/html5/render/vue/utils/lazyload.js @@ -36,10 +36,12 @@ function preLoadImg (src: string, img.src = src } -export function applySrc (item: HTMLElement, src: ?string, placeholderSrc: ?string): void { +export function applySrc (item: any, src: ?string, placeholderSrc: ?string): void { if (!src) { return } function finallCb () { item.removeAttribute('img-src') +delete item._src_loading +item._src_loaded = true if (doRecord) { if (window._weex_perf.renderTime.length < SCREEN_REC_LIMIT) { tagImg() // tag lastest img onload time. @@ -49,13 +51,25 @@ export function applySrc (item: HTMLElement, src: ?string, placeholderSrc: ?stri } } } + if (item._src_loading || item._src_loaded) { +return + } + item._src_loading = true preLoadImg(src, function (evt) { item.style.backgroundImage = `url(${src || ''})` const { width: naturalWidth, height: naturalHeight } = this -dispatchEvent(item, createEvent(item, 'load', { naturalWidth, naturalHeight })) +const params = { + success: true, + size: { naturalWidth, naturalHeight } +} +dispatchEvent(item, createEvent(item, 'load', params)) finallCb() }, function (evt) { -dispatchEvent(item, createEvent(item, 'error')) +const params = { + success: false, + size: { naturalWidth: 0, naturalHeight: 0 } +} +dispatchEvent(item, createEvent(item, 'load', params)) if (placeholderSrc) { preLoadImg(placeholderSrc, function () { item.style.backgroundImage = `url(${placeholderSrc || ''})` @@ -65,7 +79,7 @@ export function applySrc (item: HTMLElement, src: ?string, placeholderSrc: ?stri }) } -export function fireLazyload (el: Array | HTMLElement | null, ignoreVisibility: ?boolean): void { +export function fireLazyload (el: Array | any | null, ignoreVisibility: ?boolean): void { if (Array.isArray(el)) { return el.forEach(ct => fireLazyload(ct)) } @@ -101,7 +115,7 @@ export function fireLazyload (el: Array | HTMLElement | null, ignor */ const cache = {} let _uid: number = 1 -export function getThrottleLazyload (wait: number = 16, el: HTMLElement | null = document.body) { +export function getThrottleLazyload (wait: number = 16, el: any | null = document.body) { let id: number = +(el && el.dataset.throttleId) if (isNaN(id) || id <= 0) { id = _uid++
[48/50] [abbrv] incubator-weex git commit: * [html5] release vue-render 0.11.10
* [html5] release vue-render 0.11.10 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/62c0efb3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/62c0efb3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/62c0efb3 Branch: refs/heads/0.12-dev Commit: 62c0efb38aa1a406f60ec6565d6ca76155182071 Parents: 7eb8657 Author: MrRaindropAuthored: Fri Apr 21 12:13:55 2017 +0800 Committer: MrRaindrop Committed: Fri Apr 21 12:13:55 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/62c0efb3/package.json -- diff --git a/package.json b/package.json index 37ba94b..6065d45 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.20.4", -"vue-render": "0.11.9", +"vue-render": "0.11.10", "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/62c0efb3/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index a072b05..e0eac5e 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.9", + "version": "0.11.10", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js",
[41/50] [abbrv] incubator-weex git commit: * [html5] fix removing stylesheet links.
* [html5] fix removing stylesheet links. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f13c4534 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f13c4534 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f13c4534 Branch: refs/heads/0.12-dev Commit: f13c4534fe99c70ef3d998f68f9001be946b7c31 Parents: a38e289 Author: MrRaindropAuthored: Wed Apr 19 12:14:06 2017 +0800 Committer: MrRaindrop Committed: Wed Apr 19 12:14:06 2017 +0800 -- html5/render/vue/core/style.js | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f13c4534/html5/render/vue/core/style.js -- diff --git a/html5/render/vue/core/style.js b/html5/render/vue/core/style.js index 5383ff9..b324cde 100644 --- a/html5/render/vue/core/style.js +++ b/html5/render/vue/core/style.js @@ -42,9 +42,11 @@ export function getHeadStyleMap () { * because weex's components defined non-standard style attributes, which is * auto ignored when access rule.cssText. */ - if (!styleSheet.cssRules) { + if (!styleSheet.cssRules +|| (styleSheet.ownerNode.tagName.toLowerCase() === 'link') +|| !styleSheet.ownerNode.textContent) { /** - * no rules. just ignore this. probably a link stylesheet. + * no rules, or in a link. just ignore this. probably a link stylesheet. */ return pre }
incubator-weex git commit: *[doc]fix blog name
Repository: incubator-weex Updated Branches: refs/heads/dev 476cc3af1 -> af717020c *[doc]fix blog name Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/af717020 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/af717020 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/af717020 Branch: refs/heads/dev Commit: af717020ccb138755b28449780ed940a689caf9e Parents: 476cc3a Author: tancy <ron...@gmail.com> Authored: Fri Jul 28 22:38:06 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Fri Jul 28 22:38:06 2017 +0800 -- doc/source/_posts/arkit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/af717020/doc/source/_posts/arkit.md -- diff --git a/doc/source/_posts/arkit.md b/doc/source/_posts/arkit.md index 2b97c6e..5da0e92 100644 --- a/doc/source/_posts/arkit.md +++ b/doc/source/_posts/arkit.md @@ -1,4 +1,4 @@ -title: Weex â¤ï¸ iOS 11 ç³»åä¹ä¸ï¼ARKitåæ¢ +title: Weex â¤ï¸ iOS 11 ç³»åä¹äºï¼ARKitåæ¢ type: blog date: 2017-06-27 14:32:10
incubator-weex git commit: *[doc] add ga
Repository: incubator-weex Updated Branches: refs/heads/dev 778c0f6ad -> a52c861e1 *[doc] add ga Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a52c861e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a52c861e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a52c861e Branch: refs/heads/dev Commit: a52c861e11b6f89cce78ae172f3578efa5e98ac2 Parents: 778c0f6 Author: tancy <ron...@gmail.com> Authored: Mon Aug 14 16:39:41 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Mon Aug 14 16:39:41 2017 +0800 -- doc/themes/weex/layout/_partial/after-footer.ejs | 10 ++ 1 file changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a52c861e/doc/themes/weex/layout/_partial/after-footer.ejs -- diff --git a/doc/themes/weex/layout/_partial/after-footer.ejs b/doc/themes/weex/layout/_partial/after-footer.ejs index babfb3c..b945034 100644 --- a/doc/themes/weex/layout/_partial/after-footer.ejs +++ b/doc/themes/weex/layout/_partial/after-footer.ejs @@ -1,3 +1,13 @@ + + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','<a rel="nofollow" href="https://www.google-analytics.com/analytics.js">https://www.google-analytics.com/analytics.js</a>','ga'); + + ga('create', 'UA-104559823-1', 'auto'); + ga('send', 'pageview'); + +
[1/2] incubator-weex git commit: Update common-style.md
Repository: incubator-weex Updated Branches: refs/heads/dev 179437521 -> 4742d5d09 Update common-style.md ææ¡æ ¡å¯¹ Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4bcf7cc8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4bcf7cc8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4bcf7cc8 Branch: refs/heads/dev Commit: 4bcf7cc8d2bc19fbb7fe24c34f23abaa16cda48a Parents: 92399a4 Author: miyaleeAuthored: Thu Jul 6 11:27:57 2017 +0800 Committer: GitHub Committed: Thu Jul 6 11:27:57 2017 +0800 -- doc/source/cn/references/common-style.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4bcf7cc8/doc/source/cn/references/common-style.md -- diff --git a/doc/source/cn/references/common-style.md b/doc/source/cn/references/common-style.md index 8ba1a8a..a36d2cd 100644 --- a/doc/source/cn/references/common-style.md +++ b/doc/source/cn/references/common-style.md @@ -343,11 +343,11 @@ transform å±æ§åå ç´ åºç¨ 2D 转æ¢ã该å±æ§å 许æ们对å ç´ è¿è¡ Weex æ¯æåç§ä¼ªç±»ï¼`active`, `focus`, `disabled`, `enabled` -ææç»ä»¶é½æ¯æ `active`, ä½åªæ `input` ç»ä»¶å `textarea` ç»ä»¶æ¯æ `focus`, `enabled`, `diabled`ã +ææç»ä»¶é½æ¯æ `active`, ä½åªæ `input` ç»ä»¶å `textarea` ç»ä»¶æ¯æ `focus`, `enabled`, `disabled`ã ### è§å -- åæ¶çæçæçæ¶åï¼ä¼å 级é«è¦çä¼å çº§ä½ +- åæ¶çæçæ¶åï¼ä¼å 级é«è¦çä¼å çº§ä½ - ä¾å¦ï¼`input:active:enabled` å `input:active` åæ¶çæï¼åè è¦çåè
[1/2] incubator-weex git commit: Update write-once.md
Repository: incubator-weex Updated Branches: refs/heads/dev 515b003ba -> a4931a68a Update write-once.md Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3d4a52d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3d4a52d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3d4a52d5 Branch: refs/heads/dev Commit: 3d4a52d52ba0d24d32ec13703d5dd73ddb65d90d Parents: 88828c2 Author: Lukasz BalcerzakAuthored: Wed Jun 7 10:29:58 2017 +0200 Committer: GitHub Committed: Wed Jun 7 10:29:58 2017 +0200 -- doc/source/guide/intro/write-once.md | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3d4a52d5/doc/source/guide/intro/write-once.md -- diff --git a/doc/source/guide/intro/write-once.md b/doc/source/guide/intro/write-once.md index 382b7b4..673b302 100644 --- a/doc/source/guide/intro/write-once.md +++ b/doc/source/guide/intro/write-once.md @@ -9,15 +9,15 @@ version: 2.1 Weex is a "Write Once, Run Everywhere" solution. -* First, Weex is based on web dev experience, which including syntax and project management. -* Second, all components & modules in Weex is discussed by iOS, Android, web developers together to ensure it's common enough to satisfy every platforms. +* First, Weex is based on web dev experience, which includes syntax and project management. +* Second, all components & modules in Weex are discussed by iOS, Android, web developers together to ensure it's common enough to satisfy every platforms. * You only need write the same Weex code for each platforms. We think about it in these aspects below: -1. Today for almost mobile apps, one app solves the same problem in different platforms. Weex hope to supply a lightweight way to describe your business logic which works well in all platforms you need. -2. For the differences of all mobile platforms, we are willing to fill the gap in 2 points: -1. Design the same APIs for all platforms to ensure different platforms the same business logic description. -2. Implement the APIs with different style or behaviors to ensure the implementation and user experience matching different platforms. -3. If there are definitely some different features in different platforms. We also have some environment variables to help developers in certain detail situations. +1. Today for almost all mobile apps, one app solves the same problem in different platforms. Weex hope to supply a lightweight way to describe your business logic which works well in all platforms you need. +2. For the differences of all mobile platforms, we are willing to fill the gap in 3 points: +1. Design the same APIs for all platforms to ensure different platforms have the same business logic description. +2. Implement the APIs with different style or behaviors to ensure the implementation and user experience matches different platforms. +3. Platforms obviously differ among each other. We also have some environment variables to help developers in certain situations. 3. We trust (web) standard is the best for all features in all platforms.
[2/2] incubator-weex git commit: Merge branch 'miyalee-patch-1' of https://github.com/miyalee/incubator-weex into dev
Merge branch 'miyalee-patch-1' of https://github.com/miyalee/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/4742d5d0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4742d5d0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4742d5d0 Branch: refs/heads/dev Commit: 4742d5d098823120d2313016276cc5a27929a822 Parents: 1794375 4bcf7cc Author: tancy <ron...@gmail.com> Authored: Mon Jul 10 14:14:18 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Mon Jul 10 14:14:18 2017 +0800 -- doc/source/cn/references/common-style.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[6/6] incubator-weex git commit: Merge branch 'master' of https://github.com/dennythecoder/incubator-weex into dev
Merge branch 'master' of https://github.com/dennythecoder/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/17943752 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/17943752 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/17943752 Branch: refs/heads/dev Commit: 179437521b97d2a2a703edb8910763f3d302e15f Parents: a4931a6 5fcb08d Author: tancy <ron...@gmail.com> Authored: Mon Jul 10 11:24:48 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Mon Jul 10 11:24:48 2017 +0800 -- doc/source/guide/set-up-env.md | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) --
[2/6] incubator-weex git commit: Closes #10: invalid.
Closes #10: invalid. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5f96a2ce Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5f96a2ce Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5f96a2ce Branch: refs/heads/dev Commit: 5f96a2ceb656aaa2df1690af9d325922fee3d851 Parents: efc74a4 Author: MrRaindropAuthored: Mon Jul 3 11:49:36 2017 +0800 Committer: MrRaindrop Committed: Mon Jul 3 11:49:36 2017 +0800 -- --
[1/6] incubator-weex git commit: Closes #81: invalid.
Repository: incubator-weex Updated Branches: refs/heads/dev a4931a68a -> 179437521 Closes #81: invalid. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/efc74a49 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/efc74a49 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/efc74a49 Branch: refs/heads/dev Commit: efc74a49713c844da88ed9e06f35b222b05d17b4 Parents: 25d52bd Author: MrRaindropAuthored: Mon Jul 3 11:47:25 2017 +0800 Committer: MrRaindrop Committed: Mon Jul 3 11:47:25 2017 +0800 -- --
[4/6] incubator-weex git commit: Updated grammar in set-up-env.md
Updated grammar in set-up-env.md Updated grammar in set-up-env.md Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/87dac9fe Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/87dac9fe Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/87dac9fe Branch: refs/heads/dev Commit: 87dac9fed6dd3f8b90904d7fed0a4bb75865a9f7 Parents: 6d395f5 Author: DennyAuthored: Fri Jul 7 20:34:03 2017 -0500 Committer: GitHub Committed: Fri Jul 7 20:34:03 2017 -0500 -- doc/source/guide/set-up-env.md | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/87dac9fe/doc/source/guide/set-up-env.md -- diff --git a/doc/source/guide/set-up-env.md b/doc/source/guide/set-up-env.md index 702c347..6aac518 100644 --- a/doc/source/guide/set-up-env.md +++ b/doc/source/guide/set-up-env.md @@ -8,11 +8,11 @@ has_chapter_content: true # Set up development environment -Use dotWe is a good choice, But if you want to develop locally on your own machine, you will set up your development environment. +Using [dotWe](http://dotwe.org/vue) is a good choice, but if you want to develop locally on your own machine, you will need to set up your development environment. -You will need Node.js and the [Weex CLi](https://github.com/weexteam/weex-toolkit). +You will need Node.js and the [Weex CLI](https://github.com/weexteam/weex-toolkit). -You can installing Node using [nvm](https://github.com/creationix/nvm) (Simple bash script to manage multiple active node.js versions). Run the following commands in a Terminal after installing nvm: +You can install Node using [nvm](https://github.com/creationix/nvm) (Simple bash script to manage multiple active node.js versions). Run the following commands in a Terminal after installing nvm: ```bash $ nvm install 6.10.0 @@ -41,13 +41,13 @@ Then you can use the weex command to verify that the installation is successful: ### Generate a new Weex project -You can use CLi to generate a Weex project called "awesome-project". Run the following command in a Terminal: +You can use CLI to generate a Weex project called "awesome-project". Run the following command in a Terminal: ```bash $ weex init awesome-project ``` -Then we enter the awesome-project folder, the CLi has been for us to generate a standard project structure. +Then enter the awesome-project folder, the CLI has been for us to generate a standard project structure. ### Usage @@ -57,7 +57,7 @@ We enter the awesome-project folder and install dependencies with the following npm install ``` -Then we run `npm run dev` and `npm run serve` to start watch mode and static server. +Then run `npm run dev` and `npm run serve` to start watch mode and static server. Finally, we can see the Weex page in `http://localhost:8080/index.html`. @@ -66,8 +66,8 @@ You can modify this page in `src/foo.vue`. The code is shown below: ```html -Hello Weex ! -Hello Vue ! +Hello Weex! +Hello Vue! @@ -90,4 +90,4 @@ You can modify this page in `src/foo.vue`. The code is shown below: ``` -If you're curious to learn more about technical details, continue on to the next. And don't forget to write code at [dotWe](https://dotwe.org) and preview at anytime. +If you're curious to learn more about technical details, continue on to the next section. And don't forget to write code at [dotWe](https://dotwe.org) and preview at anytime.
[2/2] incubator-weex git commit: Merge branch 'patch-1' of https://github.com/lukaszb/incubator-weex into dev
Merge branch 'patch-1' of https://github.com/lukaszb/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/a4931a68 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a4931a68 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a4931a68 Branch: refs/heads/dev Commit: a4931a68abedede5ef0fb62f4ad578c8f0273b52 Parents: 515b003 3d4a52d Author: tancy <ron...@gmail.com> Authored: Mon Jul 10 11:10:56 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Mon Jul 10 11:10:56 2017 +0800 -- doc/source/guide/intro/write-once.md | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) --
incubator-weex git commit: * [doc] update docsearch apiKey
Repository: incubator-weex Updated Branches: refs/heads/dev 4742d5d09 -> 081b7a3de * [doc] update docsearch apiKey Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/081b7a3d Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/081b7a3d Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/081b7a3d Branch: refs/heads/dev Commit: 081b7a3de3dd5c6d472773cd07b436bd09328449 Parents: 4742d5d Author: parryworldAuthored: Thu Jul 13 10:56:59 2017 +0800 Committer: parryworld Committed: Thu Jul 13 10:56:59 2017 +0800 -- doc/_config.yml | 6 -- doc/_config_cn.yml| 6 -- doc/themes/weex/layout/layout.ejs | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/081b7a3d/doc/_config.yml -- diff --git a/doc/_config.yml b/doc/_config.yml index dd564d7..e262984 100644 --- a/doc/_config.yml +++ b/doc/_config.yml @@ -125,8 +125,10 @@ autoprefixer: # docsearch docsearch: enable: true - en: weex - cn: weex_cn + index_name_en: weex + index_name_cn: weex_cn + api_key_en: a6896fe3619315a7f04e9a76bfcb + api_key_cn: db5b2379e5ffbc33509585c35ccabba8 alias: doc/index.html: index.html http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/081b7a3d/doc/_config_cn.yml -- diff --git a/doc/_config_cn.yml b/doc/_config_cn.yml index c98a00b..ef5679f 100644 --- a/doc/_config_cn.yml +++ b/doc/_config_cn.yml @@ -123,8 +123,10 @@ autoprefixer: # docsearch docsearch: enable: true - en: weex_io - cn: weex_io_cn + index_name_en: weex_io + index_name_cn: weex_io_cn + api_key_en: e487bb3d17e4fa1787db9976b086792c + api_key_cn: ce50ba9d18b3295d568b305a7171ceef alias: doc/index.html: index.html http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/081b7a3d/doc/themes/weex/layout/layout.ejs -- diff --git a/doc/themes/weex/layout/layout.ejs b/doc/themes/weex/layout/layout.ejs index 9e5ee1f..df3b12b 100644 --- a/doc/themes/weex/layout/layout.ejs +++ b/doc/themes/weex/layout/layout.ejs @@ -14,12 +14,12 @@ <%- js('js/reqwest.js') %> <%- js('js/common.js') %> <% if (config.docsearch.enable){ %> -<% index_name = page.path.indexOf('cn/') === 0 ? config.docsearch.cn : config.docsearch.en %> +<% index_name = page.path.indexOf('cn/') === 0 ? config.docsearch.index_name_cn : config.docsearch.index_name_en %> +<% api_key = page.path.indexOf('cn/') === 0 ? config.docsearch.api_key_cn : config.docsearch.api_key_en %> <%- js('js/docsearch.min.js') %>
[2/2] incubator-weex git commit: Merge branch '0.15-dev' of https://github.com/MrRaindrop/incubator-weex into 0.15-dev
Merge branch '0.15-dev' of https://github.com/MrRaindrop/incubator-weex into 0.15-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/59f54f9c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/59f54f9c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/59f54f9c Branch: refs/heads/0.15-dev Commit: 59f54f9c710849543a7d9071f69bf1ce679b7e89 Parents: ba53cd4 5537878 Author: tancy <ron...@gmail.com> Authored: Fri Jul 14 17:39:44 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Fri Jul 14 17:39:44 2017 +0800 -- .../vue/components/scrollable/list/index.js | 3 +- .../vue/components/scrollable/scroller.js | 3 +- .../vue/components/scrollable/waterfall.js | 3 +- .../render/vue/components/slider/slideMixin.js | 17 +- html5/render/vue/core/node.js | 172 ++- html5/render/vue/env/wx-env.js | 2 +- html5/render/vue/mixins/base.js | 16 +- html5/render/vue/mixins/scrollable.js | 18 +- html5/render/vue/utils/style.js | 30 +++- html5/test/render/vue/core/node.js | 22 ++- package.json| 2 +- packages/weex-vue-render/package.json | 8 +- 12 files changed, 215 insertions(+), 81 deletions(-) --
incubator-weex git commit: add weex-project.io website host by aliyun
Repository: incubator-weex Updated Branches: refs/heads/dev 081b7a3de -> b397774a8 add weex-project.io website host by aliyun Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b397774a Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b397774a Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b397774a Branch: refs/heads/dev Commit: b397774a8570c981c8a51c0eebb5ac8feb6e2591 Parents: 081b7a3 Author: tancy <ron...@gmail.com> Authored: Fri Jul 14 17:37:15 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Fri Jul 14 17:37:15 2017 +0800 -- doc/themes/weex/layout/_partial/footer.ejs | 2 +- doc/themes/weex/layout/_partial/post/summary.ejs | 6 ++ doc/themes/weex/layout/_partial/slider.ejs | 2 +- doc/themes/weex/source/css/partial/footer.scss | 1 + doc/themes/weex/source/css/partial/summary.scss | 6 ++ doc/themes/weex/source/js/common.js | 16 6 files changed, 31 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b397774a/doc/themes/weex/layout/_partial/footer.ejs -- diff --git a/doc/themes/weex/layout/_partial/footer.ejs b/doc/themes/weex/layout/_partial/footer.ejs index 289cfb8..0cbe7b2 100644 --- a/doc/themes/weex/layout/_partial/footer.ejs +++ b/doc/themes/weex/layout/_partial/footer.ejs @@ -27,4 +27,4 @@ - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b397774a/doc/themes/weex/layout/_partial/post/summary.ejs -- diff --git a/doc/themes/weex/layout/_partial/post/summary.ejs b/doc/themes/weex/layout/_partial/post/summary.ejs index f6c6313..e81308d 100644 --- a/doc/themes/weex/layout/_partial/post/summary.ejs +++ b/doc/themes/weex/layout/_partial/post/summary.ejs @@ -1,5 +1,6 @@ <% var result = page.path.match(/(v-)(\d+(\.\d+))/) %> <% var version = result ? +result[2] : 2.1 %> + <% if (version == 2.1) { %> @@ -45,4 +46,9 @@ <% }) %> + + + https://render.alipay.com/p/s/taobaonpm_click/weex_banner_click;> +https://render.alipay.com/p/s/taobaonpm_click/weex_banner; alt="" width="180px"> + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b397774a/doc/themes/weex/layout/_partial/slider.ejs -- diff --git a/doc/themes/weex/layout/_partial/slider.ejs b/doc/themes/weex/layout/_partial/slider.ejs index f35c58f..6ddf55e 100644 --- a/doc/themes/weex/layout/_partial/slider.ejs +++ b/doc/themes/weex/layout/_partial/slider.ejs @@ -6,7 +6,7 @@ <%= _p('index.page_title') %> <%= _p('index.get_started') %> -https://github.com/apache/incubator-weex/; class="button get-started" target="_blank"><%= _p('menu.github') %> +<%= _p('menu.invovled') %> http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b397774a/doc/themes/weex/source/css/partial/footer.scss -- diff --git a/doc/themes/weex/source/css/partial/footer.scss b/doc/themes/weex/source/css/partial/footer.scss index 922eb0b..1bc4c69 100644 --- a/doc/themes/weex/source/css/partial/footer.scss +++ b/doc/themes/weex/source/css/partial/footer.scss @@ -71,3 +71,4 @@ margin-bottom: 10px; } } + http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b397774a/doc/themes/weex/source/css/partial/summary.scss -- diff --git a/doc/themes/weex/source/css/partial/summary.scss b/doc/themes/weex/source/css/partial/summary.scss index 1b78b55..d9d4609 100644 --- a/doc/themes/weex/source/css/partial/summary.scss +++ b/doc/themes/weex/source/css/partial/summary.scss @@ -45,4 +45,10 @@ .lang-en .summary h3.chapter-title{ font-weight: 600; +} + +.hostbyaliyun { + width: 180px; + z-index: 99; + display: none; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b397774a/doc/themes/weex/source/js/common.js -- diff --git a/doc/themes/weex/source/js/common.js b/doc/themes/weex/source/js/common.js index d45df41..3e92ba4 100644 --- a/doc/themes/weex/source/js/common.js +++ b/doc/themes/weex/source/js/common.js @@ -273,6 +273,22 @@ } initSearch() + + + function hostbyaliyun(){ +if(location.hostname === "
[1/2] incubator-weex git commit: * [html5] bind click listener to event tap.
Repository: incubator-weex Updated Branches: refs/heads/0.15-dev ba53cd43d -> 59f54f9c7 * [html5] bind click listener to event tap. * [html5] osName on android should be in lowercase * [html5] release vue-render 0.11.53 * [html5] release v0.11.54 & rm click event object's tow methods. * [html5] add touch events & fix event mapping. * [html5] release v0.11.55 * [html5] update * [html5] fix loading & release v0.11.56 * [html5] use hairlines if 0.5px width is supported. * [html5] fix danger. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/55378786 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/55378786 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/55378786 Branch: refs/heads/0.15-dev Commit: 55378786c0bb714a6e3a172a89f0ef9345546801 Parents: cc9ca19 Author: MrRaindropAuthored: Thu Jun 29 17:37:02 2017 +0800 Committer: MrRaindrop Committed: Thu Jul 13 17:18:52 2017 +0800 -- .../vue/components/scrollable/list/index.js | 3 +- .../vue/components/scrollable/scroller.js | 3 +- .../vue/components/scrollable/waterfall.js | 3 +- .../render/vue/components/slider/slideMixin.js | 17 +- html5/render/vue/core/node.js | 172 ++- html5/render/vue/env/wx-env.js | 2 +- html5/render/vue/mixins/base.js | 16 +- html5/render/vue/mixins/scrollable.js | 18 +- html5/render/vue/utils/style.js | 30 +++- html5/test/render/vue/core/node.js | 22 ++- package.json| 2 +- packages/weex-vue-render/package.json | 8 +- 12 files changed, 215 insertions(+), 81 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/55378786/html5/render/vue/components/scrollable/list/index.js -- diff --git a/html5/render/vue/components/scrollable/list/index.js b/html5/render/vue/components/scrollable/list/index.js index e781fe9..79e6d7d 100644 --- a/html5/render/vue/components/scrollable/list/index.js +++ b/html5/render/vue/components/scrollable/list/index.js @@ -19,7 +19,6 @@ import { extractComponentStyle, createEventMap } from '../../../core' import { scrollable } from '../../../mixins' // import { validateStyles } from '../../../validator' -import { extend } from '../../../utils' import listMixin from './listMixin' export default { @@ -66,7 +65,7 @@ export default { ref: 'wrapper', attrs: { 'weex-type': 'list' }, staticClass: this.wrapperClass, - on: extend(createEventMap(this), { + on: createEventMap(this, { scroll: this.handleListScroll, touchstart: this.handleTouchStart, touchmove: this.handleTouchMove, http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/55378786/html5/render/vue/components/scrollable/scroller.js -- diff --git a/html5/render/vue/components/scrollable/scroller.js b/html5/render/vue/components/scrollable/scroller.js index 3151fae..1eebab3 100644 --- a/html5/render/vue/components/scrollable/scroller.js +++ b/html5/render/vue/components/scrollable/scroller.js @@ -19,7 +19,6 @@ import { extractComponentStyle, createEventMap } from '../../core' import { scrollable } from '../../mixins' // import { validateStyles } from '../../validator' -import { extend } from '../../utils' import listMixin from './list/listMixin' export default { @@ -80,7 +79,7 @@ export default { return createElement('main', { ref: 'wrapper', attrs: { 'weex-type': 'scroller' }, - on: extend(createEventMap(this), { + on: createEventMap(this, { scroll: this.handleScroll, touchstart: this.handleTouchStart, touchmove: this.handleTouchMove, http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/55378786/html5/render/vue/components/scrollable/waterfall.js -- diff --git a/html5/render/vue/components/scrollable/waterfall.js b/html5/render/vue/components/scrollable/waterfall.js index 2239f00..012c1d2 100644 --- a/html5/render/vue/components/scrollable/waterfall.js +++ b/html5/render/vue/components/scrollable/waterfall.js @@ -23,7 +23,6 @@ */ import { extractComponentStyle, createEventMap } from '../../core' import { scrollable } from '../../mixins' -import { extend } from '../../utils' const NORMAL_GAP_SIZE = 32 const DEFAULT_COLUMN_COUNT = 1 @@ -325,7 +324,7 @@ export default { return createElement('main', { ref: 'wrapper', attrs: { 'weex-type': 'waterfall' }, - on:
incubator-weex git commit: * [doc] update input components document & bubble document
Repository: incubator-weex Updated Branches: refs/heads/dev 3b9b5a542 -> bf874113e * [doc] update input components document & bubble document Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/bf874113 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bf874113 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bf874113 Branch: refs/heads/dev Commit: bf874113e47186bf11903db829d1a77765ad18c3 Parents: 3b9b5a5 Author: tancy <ron...@gmail.com> Authored: Wed Jul 19 15:12:22 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Wed Jul 19 15:12:22 2017 +0800 -- doc/source/_posts/coreml.md | 79 +++ doc/source/_posts/hello_world.md | 3 +- doc/source/_posts/test.md| 14 doc/source/cn/references/bubble.md | 4 +- doc/source/cn/references/components/input.md | 34 +- doc/source/cn/v-0.10/references/bubble.md| 6 +- doc/source/references/bubble.md | 4 +- doc/source/references/components/input.md| 34 +- doc/source/v-0.10/references/bubble.md | 8 +-- 9 files changed, 142 insertions(+), 44 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bf874113/doc/source/_posts/coreml.md -- diff --git a/doc/source/_posts/coreml.md b/doc/source/_posts/coreml.md new file mode 100644 index 000..c628fb3 --- /dev/null +++ b/doc/source/_posts/coreml.md @@ -0,0 +1,79 @@ +title: Weex â¤ï¸ iOS 11 ç³»åä¹ä¸ï¼Core ML åæ¢ +type: blog +date: 2017-06-21 15:46:44 + +--- + +## èæ¯ + +WWDC 2017 æä¸ä¸ªé常æç¡®çä¿¡å·ï¼**端ä¸æºå¨å¦ä¹ å°ä¼æ¯æªæ¥è¹æçä¸ä¸ªéè¦ååç¹ï¼åæ¶å¼åè ç使ç¨é¨æ§å¨ä¸æéä½**ã + +Core ML æ¯ä»å¹´ WWDC ä¸è¹æåå¸çæºå¨å¦ä¹ æ¡æ¶ãå®å 许å¼åè å¨èªå·±å¼åç app ä¸ä½¿ç¨æºå¨å¦ä¹ ï¼åæ¶ä¸éè¦æ¶éç¨æ·æ°æ®ã æäº Core MLï¼ä½ å¯ä»¥å°èªå·±è®ç»å¾å°ç模åï¼åå©è¹ææä¾ç转æ¢å·¥å ·ï¼è½¬åæ Core ML ç±»åç模åæ件ï¼ä½ å¯ä»¥é常轻æ¾å°ç´æ¥å®ç°æ¨¡åå app æ°æ®çäºéã + +WWDC ä¸å±ç¤ºäºä¸å¼ ç®åçæ¶æå¾ï¼ + +![å±å¹å¿«ç § 2017-06-20 ä¸å8.50.21](https://gw.alicdn.com/tfs/TB1YT5dRVc1XFXX-498-392.png) + +æåºå±ç Accelerate å MPSï¼å ¶å®æ¯è¹æå»å¹´æ¨åºçæ¥å£ï¼åè å¯ä»¥ç´æ¥è°ç¨ CPUï¼åè åç´æ¥è°ç¨ GPUã Core ML ä¼èªè¡å³å®å°åºä½¿ç¨ CPU è¿æ¯ GPU æ¥è¿è¡è¿ç®ï¼å¯ä»¥æ大ç¨åº¦å°å©ç¨ç¡¬ä»¶èµæºæ¥å¤ç模åæ°æ®ã + +è Core ML å¾ä¸ä¸å±åæ¯åºç¨å±ãVision 主è¦è´è´£å¾åç¸å ³ç人工æºè½å¤çï¼å¦äººè¸è¯å«ãé¢é¨è¿½è¸ªãæåè¯å«ççï¼NLP åæä¾è¯ä¹åæç¸å ³ APIãè¿é¨åå 容å¨ä»¥åçæ¬ç SDK ä¸ä¹åå¨ï¼è¿æ¬¡è¢«éæå°äºæ°æ¡æ¶å½ä¸ã好å¤å¨äºï¼å¼åè æ¥æäºæ´å¤§çèªç±åº¦ãå¨ä»¥åï¼å¼åè ç app è°ç¨è¿äºé«çº§æ¥å£ï¼å¯¹åºå±çå®ç°ç»èçææ§å度é常å°ãç°å¨ï¼ä½ å¯ä»¥éè¿èªå®ä¹åºå±æ使ç¨çæºå¨å¦ä¹ 模åï¼ä»èå®ç°æ´ä¸ªæ§åçéæ±ã + +## Weex-ML + +Weex 交äºè§è§è½åå°ç»ä¸æå°ï¼**Weex æ大çç¹å«ä¹å¤å¨äºå ¶ native çè½åï¼ æ们è¦æ大åå©ç¨ native çç¹æ§ï¼ èä¸æ¯å»æ¨¡ä»¿å®**ã + +ä½ä¸ºæ¬æ¬¡ iOS 11 çä¸ä¸ªéè¦ native è½åï¼æä¹ç¬¬ä¸æ¶é´å°è¯å° Core ML éä¼ å°äº Weex ä¸ãææ代ç å Demo é½å·²å¼æºå° [Github](https://github.com/cxfeng1/Weex-ML)ï¼åç»ä¹ä¼å°æºå¨å¦ä¹ ç¸å ³çWeex 模åç»ä¸æ¾å° Weex Market ä¸ã + +å¾çäº Core ML API çç®æ´ï¼å¨ Weex ä¸ä½¿ç¨ Core ML ç¸å ³è½ååå¾é常ç®å: + +```javascript +let imageRecognition = weex.requireModule('imageRecognition') +imageRecognition.predictWithImage(this.$refs.image.ref, (results)=>{ + this.results = results.slice(0,5); +}) +``` + +éè¿è°ç¨éä¼ ç module `imageRecognition` , å¹¶ä¼ å ¥ image ç»ä»¶ç ref ä½ä¸ºåæ°ï¼å°±å¯ä»¥å®ç°å¾çè¯å«çåè½ï¼æåæååºè¯å«ç»æä¸ confidence æé«ç 5 个ç»æã + +## Demo + +### imageRecognition + +![](https://gw.alicdn.com/tfs/TB1AmqgRVcmXFXX-240-427.gif) + +ä½¿ç¨ [Inceptionv3](https://github.com/fchollet/keras/blob/0bb4e0fad5b4bb3743c8a7d03c260b62a35e7045/keras/applications/inception_v3.py) ä½ä¸ºæ¨¡åï¼è½å¤é«æè¯å«ï¼ 该模åå·²ç»å¨ [keras](https://github.com/fchollet/keras) ä¸è¢«è®ç»å¥½å¹¶éè¿è¹ææä¾çå·¥å ·è½¬æ¢æ **mlmodel** æä»¶ï¼ åªéææ½çæ¹å¼å°±å¯ä»¥éæå° iOS å¼åç¯å¢ä¸ï¼ ä¸è¿° demo è¾åºäºå¯¹ä¸å¼ å¾çåç±»æ大å¯è½ç5个é¢æµç»æï¼ å¯¹äº Weex æ¥è¯´ï¼
incubator-weex git commit: +[doc] add blog
Repository: incubator-weex Updated Branches: refs/heads/dev beb83d2e3 -> d2b5104f1 +[doc] add blog Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d2b5104f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d2b5104f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d2b5104f Branch: refs/heads/dev Commit: d2b5104f1596676b500c0c42010357bb79eae57e Parents: beb83d2 Author: tancy <ron...@gmail.com> Authored: Fri Jul 28 15:58:06 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Fri Jul 28 15:58:06 2017 +0800 -- doc/source/_posts/arkit.md | 112 doc/source/_posts/cn/hello.md | 6 -- doc/source/_posts/hello_world.md | 7 -- doc/source/_posts/test.md | 14 --- doc/source/cn/blog/index.md| 4 - doc/themes/weex/layout/_partial/header.ejs | 1 + doc/themes/weex/source/css/blog.scss | 3 + doc/themes/weex/source/css/media-queries.scss | 1 + doc/themes/weex/source/css/partial/header.scss | 6 +- 9 files changed, 120 insertions(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d2b5104f/doc/source/_posts/arkit.md -- diff --git a/doc/source/_posts/arkit.md b/doc/source/_posts/arkit.md new file mode 100644 index 000..2b97c6e --- /dev/null +++ b/doc/source/_posts/arkit.md @@ -0,0 +1,112 @@ +title: Weex â¤ï¸ iOS 11 ç³»åä¹ä¸ï¼ARKitåæ¢ +type: blog +date: 2017-06-27 14:32:10 + +--- + +## ARKit +è¹æå¨wwdc 2017å ¬å¸äºç¬¬ä¸æ¬¾å ·æARåè½çæä½ç³»ç»iOS11ï¼å¹¶æä¾äºARçSDKï¼ARKitï¼åæ¶å®£ç§°è¹ææ¯ä¸çä¸æ大çARå¹³å°ï¼Weexä¹ç§¯ææ¥æ±ARï¼è®©Weexç¨æ·ä¹å¯ä»¥æ¹ä¾¿å¼åARåè½ + +ARä½éªå°±æ¯å建å追踪ç¨æ·æå¨çç°å®ä¸çåå¯å»ºç«æ¨¡åç空é´ç对åºå ³ç³»çè½åï¼è®©ç¨æ·æè§äº§çèæå 容å¨ç°å®ä¸ççéè§ï¼è¿å°±æ¯æè°çå¢å¼ºç°å®ãARKitéè¿è¯å«å¾ååºæ¯ä¸çæ¾èç¹å¾ï¼è¿½è¸ªè¿äºç¹å¾çå·®å¼ä½ç½®ï¼æåä¸ä¼ æå¨æ°æ®æ¯è¾ï¼å¾å°è®¾å¤ä½ç½®åè¿å¨ç¶æçé«ç²¾åº¦æ¨¡å + +## åç +ARkit å¨ARSCNViewï¼ARSession,ARFrameçåºç¡ä¸å®ç° + +### ARSCNViewåARSession +![x](http://upload-images.jianshu.io/upload_images/6271687-d5b0e534ef0d7aaa.png?imageMogr2/auto-orient/strip%7CimageView2/2) +ARKitæä¾äºä¸¤ç§å¢å¼ºç°å®çè§å¾ï¼ä»ä»¬åå«æ¯ARSCNView(3D)åARSKView(2D),è¿ä¸¤ç§è§å¾é½éç¨ARCameraä½ä¸ºè§å¾èæ¯çï¼èARSCNViewçè§å¾åç¸æºæ²¡æç´æ¥å ³ç³»ï¼ä»ä»¬æ¯éè¿ARSessionè¿ä¸ªæ¡¥æ¢åcamera交äºçï¼è¿è¡ä¸ä¸ªsessionï¼éè¦æå®ä¼è¯è¿½è¸ªé ç½®ç对象ï¼ARSessionConfigurationï¼ARSessionConfigurationè´è´£è¿½è¸ªç¸æºå¨3Dä¸çä¸çä½ç½®åå¹³é¢æ¢æµ + +### ARWorldTrackingSessionConfigurationä¸ARFrame +![x](https://github.com/kfeagle/firstdemo/blob/master/arkit.png?raw=true) +ARWorldTrackingSessionConfigurationéè¿ä¸ç³»åçå¤æ计ç®åè°ç¨ä¼ æå¨æ¥è·è¸ªè®¾å¤çæ¹ååä½ç½®ï¼å½ARWorldTrackingSessionConfiguration计ç®åºä½ç½®ï¼ä¼äº¤ç»ARSession管ç,ARSessionå°±ä¼ç»´æ¤ä¸ä¸ªç¸æºçä½ç½®ARFameï¼ç¨æ·å¯ä»¥éè¿è¿ä¸ªframeå°4x4ç©éµä¸çåæ 转æ¢ä¸º3Dç³»ç»ç¸æºåæ + +## weex-ar +ARKitå¨wwdcä¸å¸¦æ¥çéæ¼ææï¼æéè¿weexæ件çæ¹å¼å°ARKitè½åéä¼ å°Weexï¼è®©ç¨æ·å¨weexä¸ä¹ç¬¬ä¸æ¶é´ä½éªå°NativeçARææ +ææçdemo以åæºç æå·²ç»å¼æºï¼åæ¥å°[github](https://github.com/kfeagle/weex-ar)ï¼ç¨æ·å¨èªå·±å·¥ç¨ä¾èµå³å¯ä½¿ç¨ + +### å¨ç°å®ä¸ç渲æä¸ä¸ª3Dçèæç©ä½ +``` +this.$refs['scene'].addNode({ +name:'color', +width:0.1, +height:0.1, +length:0.1, +chamferRadius:0, +vector:{ + x:0.1, + y:0.1, + z:-0.5 +}, +contents:{ + type:'color', + name:'red' +} + }); +``` +Weexå¨compnonentä¸å¢å addNodeæ¹æ³ï¼ç¨æ·å¯ä»¥è®¾ç½®å¥½èç¹çåæ°ï¼ç¶åå°±ä¼æ建ä¸ä¸ªèæç©ä½ +- ææ + - ![x](http://gitlab.alibaba-inc.com/Jerry/amapdemo/raw/master/ar/1.gif) + +### 交äºæ¯æ +å½native触åäºç¹å»äºä»¶ï¼ä¼åjsfmåéç¹å»ä½ç½®ä¿¡æ¯ + +``` +-(void)tapped:(UITapGestureRecognizer *)recognizer +{ +SCNView *sceneView = (SCNView *)recognizer.view ; +CGPoint touchLocation = [recognizer locationInView:sceneView]; +[self fireEvent:@"tap" params:@{@"touchLocation":@{@"x":@(touchLocation.x),@"y":@(touchLocation.y)}}]; +} +``` +å½VUEæ¥æ¶å°ç¸å ³ä¿¡æ¯ï¼ä¼å¤çä½ç½®ä¿¡æ¯ï¼ç¶åæ´æ°èç¹ +``` +tap:function (event) { +
incubator-weex git commit: *[doc] add aliyunhost tip
Repository: incubator-weex Updated Branches: refs/heads/dev d2b5104f1 -> 476cc3af1 *[doc] add aliyunhost tip Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/476cc3af Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/476cc3af Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/476cc3af Branch: refs/heads/dev Commit: 476cc3af1b40ea328982e3167fd308f5eef94761 Parents: d2b5104 Author: tancy <ron...@gmail.com> Authored: Fri Jul 28 16:24:45 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Fri Jul 28 16:24:45 2017 +0800 -- doc/themes/weex/layout/_partial/post/summary.ejs | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/476cc3af/doc/themes/weex/layout/_partial/post/summary.ejs -- diff --git a/doc/themes/weex/layout/_partial/post/summary.ejs b/doc/themes/weex/layout/_partial/post/summary.ejs index e81308d..abf1bc7 100644 --- a/doc/themes/weex/layout/_partial/post/summary.ejs +++ b/doc/themes/weex/layout/_partial/post/summary.ejs @@ -51,4 +51,5 @@ https://render.alipay.com/p/s/taobaonpm_click/weex_banner_click;> https://render.alipay.com/p/s/taobaonpm_click/weex_banner; alt="" width="180px"> + é¿éäºèµå© \ No newline at end of file
[43/43] incubator-weex git commit: Merge branch '0.16-dev' of https://github.com/MrRaindrop/incubator-weex into 0.16-dev
Merge branch '0.16-dev' of https://github.com/MrRaindrop/incubator-weex 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/b11c4e11 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b11c4e11 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b11c4e11 Branch: refs/heads/0.16-dev Commit: b11c4e113da20e45f304934e39a869f137f0e750 Parents: 495fc6b c45b53c Author: tancy <ron...@gmail.com> Authored: Fri Jul 28 17:11:16 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Fri Jul 28 17:11:16 2017 +0800 -- .gitignore | 3 + build/build.js | 105 +++- build/config.js | 37 +- dangerfile.js | 35 +- 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
[23/43] incubator-weex git commit: * [html5] add src to weex-vue-render package.
* [html5] add src to weex-vue-render package. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8c8034e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8c8034e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8c8034e3 Branch: refs/heads/0.16-dev Commit: 8c8034e34885cbdc89a1043c4e819d7fe7a42b7f Parents: 611cae8 Author: MrRaindropAuthored: Thu Jul 20 18:33:54 2017 +0800 Committer: MrRaindrop Committed: Thu Jul 20 18:33:54 2017 +0800 -- packages/weex-vue-render/src/index.core.js | 13 + packages/weex-vue-render/src/index.js | 12 2 files changed, 25 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c8034e3/packages/weex-vue-render/src/index.core.js -- diff --git a/packages/weex-vue-render/src/index.core.js b/packages/weex-vue-render/src/index.core.js new file mode 100644 index 000..3bc8edb --- /dev/null +++ b/packages/weex-vue-render/src/index.core.js @@ -0,0 +1,13 @@ +import weex from '../../../html5/render/vue' + +import div from '../../../html5/render/vue/components/div' +import text from '../../../html5/render/vue/components/text' +import image from '../../../html5/render/vue/components/image' +import scrollable from '../../../html5/render/vue/components/scrollable' + +weex.install(div) +weex.install(text) +weex.install(image) +weex.install(scrollable) + +export default weex http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c8034e3/packages/weex-vue-render/src/index.js -- diff --git a/packages/weex-vue-render/src/index.js b/packages/weex-vue-render/src/index.js new file mode 100644 index 000..efbbaeb --- /dev/null +++ b/packages/weex-vue-render/src/index.js @@ -0,0 +1,12 @@ +import weex from '../../../html5/render/vue' + +import components from '../../../html5/render/vue/components' +import modules from '../../../html5/render/vue/modules' + +const plugins = components.concat(modules) + +plugins.forEach(function (plugin) { + weex.install(plugin) +}) + +export default weex
[37/43] incubator-weex git commit: * [html5] fix tests.
* [html5] fix tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3b36889c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3b36889c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3b36889c Branch: refs/heads/0.16-dev Commit: 3b36889ccf1a9f9943efe7266fff5292a647d617 Parents: 0fadfcc Author: MrRaindropAuthored: Wed Jul 26 20:43:47 2017 +0800 Committer: MrRaindrop Committed: Wed Jul 26 20:43:47 2017 +0800 -- 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 ++ 5 files changed, 28 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3b36889c/html5/test/render/vue/modules/animation.js -- diff --git a/html5/test/render/vue/modules/animation.js b/html5/test/render/vue/modules/animation.js index 60188c2..a40d7fd 100644 --- a/html5/test/render/vue/modules/animation.js +++ b/html5/test/render/vue/modules/animation.js @@ -17,12 +17,13 @@ * under the License. */ /*global Event*/ -import * as animations from '../../../../render/vue/modules/animation' +// import * as animations from '../../../../render/vue/modules/animation' +import animation from '../../../../render/vue/modules/animation' describe('animation module', () => { + weex.install(animation) + const animationModule = weex.requireModule('animation') it('should transition be worked', (done) => { -const { - transition -} = animations.default +const { transition } = animationModule const config = { duration: 100, timingFunction: 'ease', @@ -53,8 +54,7 @@ describe('animation module', () => { expect(vnode.$el.style['-webkit-box-align']).to.be.equal(config.styles['align-items']) expect(vnode.$el.style['-webkit-align-items']).to.be.equal(config.styles['align-items']) expect(vnode.$el.style['-webkit-box-flex']).to.be.equal(config.styles.flex + '') - expect(vnode.$el.style.top).to.be.equal(config.styles.top + 'px') - expect(vnode.$el.style['margin-left']).to.be.equal('0px') + expect(vnode.$el.style['margin-left']).to.be.equal(-10 * weex.config.env.scale + 'px') done() }, 100) }) http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3b36889c/html5/test/render/vue/modules/dom.js -- diff --git a/html5/test/render/vue/modules/dom.js b/html5/test/render/vue/modules/dom.js index 2a0b3e4..5df77ba 100644 --- a/html5/test/render/vue/modules/dom.js +++ b/html5/test/render/vue/modules/dom.js @@ -16,13 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -import * as dom from '../../../../render/vue/modules/dom' +import dom from '../../../../render/vue/modules/dom' describe('dom module', () => { const callback = sinon.spy() + weex.install(dom) + const domModule = weex.requireModule('dom') it('should scrollToElement be worked', (done) => { const { scrollToElement -} = dom.default +} = domModule const node = document.createElement('div') const vnode = { $el: node @@ -48,7 +50,7 @@ describe('dom module', () => { it('should getComponentRect be worked', () => { const { getComponentRect -} = dom.default +} = domModule const node = document.createElement('div') const vnode = { $el: node @@ -96,7 +98,7 @@ describe('dom module', () => { it('should addRule be worked', () => { const { addRule -} = dom.default +} = domModule const key = 'font-face' const styles = { 'font-family': 'iconfont' http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3b36889c/html5/test/render/vue/modules/globalEvent.js -- diff --git a/html5/test/render/vue/modules/globalEvent.js b/html5/test/render/vue/modules/globalEvent.js index ff285fc..1039ec0 100644 --- a/html5/test/render/vue/modules/globalEvent.js +++ b/html5/test/render/vue/modules/globalEvent.js @@ -17,13 +17,15 @@ * under the License. */ /*global Event*/ -import * as globalEvent from '../../../../render/vue/modules/globalEvent' +import globalEvent from '../../../../render/vue/modules/globalEvent' describe('globalEvent module', () => { + weex.install(globalEvent) + const globalEventModule = weex.requireModule('globalEvent') const callback = sinon.spy() it('should
[35/43] incubator-weex git commit: * [html5] add LICENSE header.
* [html5] add LICENSE header. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5581f722 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5581f722 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5581f722 Branch: refs/heads/0.16-dev Commit: 5581f722d93842a4c19b248a81babbaa64257ff7 Parents: 75c1810 Author: MrRaindropAuthored: Wed Jul 26 11:41:29 2017 +0800 Committer: MrRaindrop Committed: Wed Jul 26 11:41:29 2017 +0800 -- html5/render/vue/components/scrollable/index.js | 19 +++ .../vue/components/scrollable/mixins/index.js| 19 +++ html5/render/vue/components/scrollable/style.css | 19 +++ html5/render/vue/components/slider/index.js | 19 +++ html5/render/vue/components/slider/slider.css| 19 +++ html5/render/vue/styles/base.css | 19 +++ html5/render/vue/styles/reset.css| 19 +++ html5/test/render/vue/utils/lazyload.js | 3 --- 8 files changed, 133 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5581f722/html5/render/vue/components/scrollable/index.js -- diff --git a/html5/render/vue/components/scrollable/index.js b/html5/render/vue/components/scrollable/index.js index 3c68404..8142786 100644 --- a/html5/render/vue/components/scrollable/index.js +++ b/html5/render/vue/components/scrollable/index.js @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import list from './list' import scroller from './scroller' import waterfall from './waterfall' http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5581f722/html5/render/vue/components/scrollable/mixins/index.js -- diff --git a/html5/render/vue/components/scrollable/mixins/index.js b/html5/render/vue/components/scrollable/mixins/index.js index 7b9b304..560f958 100644 --- a/html5/render/vue/components/scrollable/mixins/index.js +++ b/html5/render/vue/components/scrollable/mixins/index.js @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import scrollable from './scrollable' import list from './list' http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5581f722/html5/render/vue/components/scrollable/style.css -- diff --git a/html5/render/vue/components/scrollable/style.css b/html5/render/vue/components/scrollable/style.css index c026113..c4e1498 100644 --- a/html5/render/vue/components/scrollable/style.css +++ b/html5/render/vue/components/scrollable/style.css @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may
[11/43] incubator-weex git commit: * [html5] scan style when async component is loaded.
* [html5] scan style when async component is loaded. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/adac8764 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/adac8764 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/adac8764 Branch: refs/heads/0.16-dev Commit: adac876414eb9214e7fa18930651f30fe4a42a58 Parents: 5537878 Author: MrRaindropAuthored: Fri Jul 14 11:11:05 2017 +0800 Committer: MrRaindrop Committed: Fri Jul 14 11:11:05 2017 +0800 -- html5/render/vue/mixins/style.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/adac8764/html5/render/vue/mixins/style.js -- diff --git a/html5/render/vue/mixins/style.js b/html5/render/vue/mixins/style.js index 5be2edc..647119d 100644 --- a/html5/render/vue/mixins/style.js +++ b/html5/render/vue/mixins/style.js @@ -44,7 +44,9 @@ function getIdentifiedBeforeCreate () { * For vue-loader ^11.3.x, there's no injectStyle function. The styleSheet * is already injected into the head. Just scan it. */ -if (this === this.$root && this.$options && !this._firstScanned) { +// async component. +if ((this.$vnode && this.$vnode.data && this.$vnode.data.tag === 'component') + || (this === this.$root && this.$options && !this._firstScanned)) { this._firstScanned = true extend(weex._styleMap, getHeadStyleMap()) }
[40/43] incubator-weex git commit: Merge branch '0.16-dev' into 0.16-dev-web
Merge branch '0.16-dev' into 0.16-dev-web Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/30687e78 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/30687e78 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/30687e78 Branch: refs/heads/0.16-dev Commit: 30687e785226b31df450b4e82f80840018da91b4 Parents: 38c789e a54bcb9 Author: MrRaindropAuthored: Thu Jul 27 17:59:19 2017 +0800 Committer: MrRaindrop Committed: Thu Jul 27 17:59:19 2017 +0800 -- WeexSDK.podspec | 2 +- ios/playground/Podfile | 2 +- ios/playground/WeexDemo/WXDemoViewController.m | 1 - ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +- .../WeexSDK/Sources/Bridge/WXBridgeContext.m| 27 +-- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 14 ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.h | 2 ++ ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 11 -- .../WeexSDK/Sources/Component/WXListComponent.m | 2 +- .../Sources/Manager/WXComponentManager.m| 14 +--- .../WeexSDK/Sources/Manager/WXTracingManager.h | 35 ++-- .../WeexSDK/Sources/Manager/WXTracingManager.m | 18 +- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 6 ++-- .../WeexSDK/Sources/Protocol/WXBridgeProtocol.h | 5 +++ .../Sources/Protocol/WXValidateProtocol.h | 4 +-- ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +- ios/sdk/WeexSDK/Sources/Utility/WXLog.m | 9 - ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 +- pre-build/native-bundle-main.js | 12 +++ 19 files changed, 117 insertions(+), 53 deletions(-) --
[26/43] incubator-weex git commit: 0.12.2
0.12.2 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b195a369 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b195a369 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b195a369 Branch: refs/heads/0.16-dev Commit: b195a369687fed999a77cc6de903188e232ed220 Parents: d1f619d Author: MrRaindropAuthored: Thu Jul 20 20:44:12 2017 +0800 Committer: MrRaindrop Committed: Thu Jul 20 20:44:12 2017 +0800 -- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b195a369/package.json -- diff --git a/package.json b/package.json index d08813d..f344475 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "weex", - "version": "0.12.1", + "version": "0.12.2", "subversion": { "browser": "0.5.0", "framework": "0.20.6",
[41/43] incubator-weex git commit: * [html5] fix danger file wehn renaming files.
* [html5] fix danger file wehn renaming files. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/83dd1e5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/83dd1e5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/83dd1e5e Branch: refs/heads/0.16-dev Commit: 83dd1e5e274a45c5d1b20f58fa14617e4ec32481 Parents: 30687e7 Author: MrRaindropAuthored: Fri Jul 28 10:29:17 2017 +0800 Committer: MrRaindrop Committed: Fri Jul 28 11:34:06 2017 +0800 -- dangerfile.js | 35 +-- 1 file changed, 21 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/83dd1e5e/dangerfile.js -- diff --git a/dangerfile.js b/dangerfile.js index ac3a5a7..fed5a9b 100644 --- a/dangerfile.js +++ b/dangerfile.js @@ -281,9 +281,10 @@ function findReviewer(resolve, reject) { var fileToDeletedLinesMap = {} var fileToNormalLinesMap = {} var fileToBlamesMap = {} + var repoName = danger.github.pr.base.repo && danger.github.pr.base.repo.name github.pullRequests.get({ owner: danger.github.pr.base.user.login, -repo: danger.github.pr.base.repo.name, +repo: repoName, number: danger.github.pr.number, headers: {Accept: 'application/vnd.github.diff'} }, function (err, result) { @@ -296,7 +297,6 @@ function findReviewer(resolve, reject) { 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) return getContent(blameURL) }); @@ -315,18 +315,25 @@ 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 - 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 +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)) })
[01/43] incubator-weex git commit: * [html5] bind click listener to event tap.
Repository: incubator-weex Updated Branches: refs/heads/0.16-dev 495fc6b24 -> b11c4e113 * [html5] bind click listener to event tap. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a35c690c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a35c690c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a35c690c Branch: refs/heads/0.16-dev Commit: a35c690c1f4e3d43ed93151215bdbe9457942d91 Parents: d20e0d8 Author: MrRaindropAuthored: Thu Jun 29 17:37:02 2017 +0800 Committer: MrRaindrop Committed: Thu Jun 29 17:37:02 2017 +0800 -- html5/render/vue/core/node.js | 122 + 1 file changed, 84 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a35c690c/html5/render/vue/core/node.js -- diff --git a/html5/render/vue/core/node.js b/html5/render/vue/core/node.js index 87981d8..196d061 100644 --- a/html5/render/vue/core/node.js +++ b/html5/render/vue/core/node.js @@ -54,10 +54,25 @@ function getListeners (vnode, evt) { } const supportedEvents = [ - 'tap', 'click', 'longpress', 'appear', 'disappear', + 'longpress', 'appear', 'disappear', // 'touchstart', 'touchmove', 'touchend', 'panstart', 'panmove', 'panend', 'swipe', 'longpress' ] + +/** + * is a element in a '' tag? + * @param {HTMLElement} el + */ +function isInANode (el) { + let parent = el.parentNode + while (parent && parent !== document.body) { +if (parent.tagName.toLowerCase() === 'a') { + return true +} +parent = parent.parentNode + } +} + /** * emit native events to enable v-on. * @param {VComponent} context: which one to emit a event on. @@ -66,52 +81,83 @@ const supportedEvents = [ export function createEventMap (context, extras = []) { const eventMap = {} /** - * bind name with evt event. e.g. bind 'click' with 'tap' event. + * Bind some original type event to your specified type event handler. + * e.g. bind 'tap' event to 'click' event listener: bindFunc('tap')('click'). + * Or bind certian event with your specified handler: bindFunc('click', someFunction) */ - const bindFunc = (evt) => { -return name => { - const evtType = evt || name - eventMap[evtType] = function (e) { -/** - * allow original bubbling. - * use '_triggered' to control actural bubbling. - */ -if (e._triggered) { - return -} -// but should trigger the closest parent which has bound the -// event handler. -let vm = context -while (vm) { - const ons = getListeners(vm.$vnode, name) - const len = ons.length - let idx = 0 - while (idx < len) { -let on = ons[idx] -if (on && on.fn) { - on = on.fn -} -on && on.call(vm, - evtType === name ? e : extend({}, e, { type: name }) -) -idx++ + const bindFunc = (originalType) => { +return listenTo => { + let handler + if (typeof listenTo === 'function') { +handler = listenTo + } + else if (typeof listenTo === 'string') { +if (!originalType) { originalType = listenTo } +handler = function (e) { + /** + * allow original bubbling. + * use '_triggered' to control actural bubbling. + */ + if (e._triggered) { +return } - - // once a parent node (or self node) has triggered the handler, - // then it stops bubble immediately, and a '_triggered' object is set. - if (len > 0) { -e._triggered = { - el: vm.$el + // but should trigger the closest parent which has bound the + // event handler. + let vm = context + while (vm) { +const ons = getListeners(vm.$vnode, listenTo) +const len = ons.length +if (len > 0) { + let idx = 0 + while (idx < len) { +let on = ons[idx] +if (on && on.fn) { + on = on.fn +} +on && on.call(vm, + originalType === listenTo ? e : extend({}, e, { type: listenTo }) +) +idx++ + } + // once a parent node (or self node) has triggered the handler, then + // it stops bubbling immediately, and a '_triggered' object is set. + e._triggered = { +el: vm.$el + } + return } -return +vm = vm.$parent
[16/43] incubator-weex git commit: * [html5] treat components and modules as plugins and bundle the codes into npm packages
* [html5] treat components and modules as plugins and bundle the codes into npm packages Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5298c11d Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5298c11d Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5298c11d Branch: refs/heads/0.16-dev Commit: 5298c11df44965c8d8d12baeec190cf45ffc1e76 Parents: b1a7c02 Author: MrRaindropAuthored: Thu Jul 20 11:16:39 2017 +0800 Committer: MrRaindrop Committed: Thu Jul 20 11:16:39 2017 +0800 -- build/build.js | 48 ++- build/config.js | 35 +- html5/render/vue/components/index.js| 3 +- html5/render/vue/env/index.js | 5 -- html5/render/vue/index.js | 6 --- html5/render/vue/mixins/base.js | 20 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 +-- package.json| 10 ++-- 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 |
[17/43] incubator-weex git commit: Merge branch '0.15-dev' into 0.15-dev-web
Merge branch '0.15-dev' into 0.15-dev-web Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/194a57d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/194a57d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/194a57d9 Branch: refs/heads/0.16-dev Commit: 194a57d98b5462289b7a7329a3f59af84b27a6af Parents: eb5dcb8 9764e25 Author: MrRaindropAuthored: Thu Jul 20 16:29:52 2017 +0800 Committer: MrRaindrop Committed: Thu Jul 20 16:29:52 2017 +0800 -- .../java/com/taobao/weex/dom/WXDomModule.java | 1 - .../com/taobao/weex/dom/WXTextDomObject.java| 4 +- .../com/taobao/weex/dom/action/Actions.java | 4 +- .../taobao/weex/ui/component/WXScroller.java| 79 +++--- .../com/taobao/weex/ui/component/WXSlider.java | 10 +- .../ui/component/list/BasicListComponent.java | 66 ++--- .../taobao/weex/ui/component/list/WXCell.java | 10 - .../weex/ui/view/WXHorizontalScrollView.java| 27 ++ .../com/taobao/weex/ui/view/WXScrollView.java | 1 - build/config.js | 1 + build/karma.vue.conf.js | 7 + doc/source/cn/references/modules/meta.md| 96 +++ doc/source/cn/references/modules/timer.md | 47 doc/source/references/modules/meta.md | 97 +++ doc/source/references/modules/timer.md | 58 examples/vue/hello.vue | 2 +- html5/render/vue/modules/websocket/websocket.js | 1 + html5/render/vue/utils/event.js | 6 +- html5/render/vue/utils/func.js | 136 +++-- html5/render/vue/utils/index.js | 104 --- html5/render/vue/utils/perf.js | 3 +- html5/test/render/vue/modules/websocket.js | 90 +++--- html5/test/render/vue/utils/component.js| 50 +++- html5/test/render/vue/utils/event.js| 78 ++ html5/test/render/vue/utils/func.js | 278 +-- html5/test/render/vue/utils/lazyload.js | 106 +++ html5/test/render/vue/utils/perf.js | 132 + html5/test/render/vue/utils/style.js| 157 +-- html5/test/render/vue/utils/type.js | 49 html5/test/render/vue/validator/index.js| 31 ++- .../WeexSDK/Sources/Bridge/WXBridgeContext.m| 33 +-- .../WeexSDK/Sources/Component/WXAComponent.m| 2 +- .../Sources/Component/WXCycleSliderComponent.m | 6 + .../WeexSDK/Sources/Component/WXEditComponent.m | 2 +- .../Sources/Component/WXImageComponent.m| 4 +- .../WeexSDK/Sources/Component/WXListComponent.m | 55 +++- .../WeexSDK/Sources/Component/WXTextComponent.m | 54 ++-- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 24 +- .../Sources/Component/WXVideoComponent.m| 2 +- .../WeexSDK/Sources/Component/WXWebComponent.m | 2 +- .../Sources/Handler/WXURLRewriteDefaultImpl.m | 2 +- .../WeexSDK/Sources/Layout/WXComponent+Layout.m | 2 +- ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 2 +- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 6 +- .../WeexSDK/Sources/Module/WXAnimationModule.m | 14 +- ios/sdk/WeexSDK/Sources/Module/WXDomModule.m| 8 +- ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 7 + ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 2 +- .../Sources/Protocol/WXURLRewriteProtocol.h | 2 +- .../Sources/View/WXComponent+ViewManagement.m | 4 + ios/sdk/WeexSDKTests/WXAnimationModuleTests.m | 29 ++ pre-build/native-bundle-main.js | 16 +- 52 files changed, 1570 insertions(+), 439 deletions(-) --
[13/43] incubator-weex git commit: Merge branch '0.15-dev-web' into feature/generate-packages
Merge branch '0.15-dev-web' into feature/generate-packages Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a83dfc2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a83dfc2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a83dfc2f Branch: refs/heads/0.16-dev Commit: a83dfc2fb255f5a7b627471c9c59e1aee1bfcf58 Parents: 166513d eb5dcb8 Author: MrRaindropAuthored: Mon Jul 17 11:33:03 2017 +0800 Committer: MrRaindrop Committed: Mon Jul 17 11:33:03 2017 +0800 -- html5/render/vue/mixins/style.js | 4 +++- html5/render/vue/utils/style.js | 30 +- html5/test/render/vue/core/node.js| 18 ++ package.json | 2 +- packages/weex-vue-render/package.json | 2 +- 5 files changed, 52 insertions(+), 4 deletions(-) --
[34/43] incubator-weex git commit: * [html5] add dep for weex-vue-bundle-util.
* [html5] add dep for weex-vue-bundle-util. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/75c18105 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/75c18105 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/75c18105 Branch: refs/heads/0.16-dev Commit: 75c18105b851b849fd0bdd334d18e596def67ba3 Parents: 2014832 Author: MrRaindropAuthored: Wed Jul 26 11:12:49 2017 +0800 Committer: MrRaindrop Committed: Wed Jul 26 11:12:49 2017 +0800 -- package.json | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/75c18105/package.json -- diff --git a/package.json b/package.json index ce7cc0f..32285e8 100644 --- a/package.json +++ b/package.json @@ -166,6 +166,7 @@ "weex-gcanvas": "^0.4.2", "weex-loader": "^0.4.0", "weex-vdom-tester": "^0.2.0", +"weex-vue-bundle-util": "^0.1.3", "weex-wd": "^1.0.23", "wwp": "^0.3.5", "xmldom": "^0.1.27"
[24/43] incubator-weex git commit: * [html5] update deps.
* [html5] update deps. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8fe08a71 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8fe08a71 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8fe08a71 Branch: refs/heads/0.16-dev Commit: 8fe08a7118b4bc3ad67919605bf80da7cad597b5 Parents: 8c8034e Author: MrRaindropAuthored: Thu Jul 20 20:39:07 2017 +0800 Committer: MrRaindrop Committed: Thu Jul 20 20:39:07 2017 +0800 -- packages/weex-vue-plugins/weex-vue-a/package.json| 2 +- packages/weex-vue-plugins/weex-vue-animation/package.json| 2 +- packages/weex-vue-plugins/weex-vue-clipboard/package.json| 2 +- packages/weex-vue-plugins/weex-vue-dom/package.json | 2 +- packages/weex-vue-plugins/weex-vue-event/package.json| 2 +- packages/weex-vue-plugins/weex-vue-geolocation/package.json | 2 +- packages/weex-vue-plugins/weex-vue-global-event/package.json | 2 +- packages/weex-vue-plugins/weex-vue-input/package.json| 2 +- packages/weex-vue-plugins/weex-vue-modal/package.json| 2 +- packages/weex-vue-plugins/weex-vue-navigator/package.json| 2 +- packages/weex-vue-plugins/weex-vue-slider/package.json | 2 +- packages/weex-vue-plugins/weex-vue-storage/package.json | 2 +- packages/weex-vue-plugins/weex-vue-stream/package.json | 2 +- packages/weex-vue-plugins/weex-vue-switch/package.json | 2 +- packages/weex-vue-plugins/weex-vue-textarea/package.json | 2 +- packages/weex-vue-plugins/weex-vue-video/package.json| 2 +- packages/weex-vue-plugins/weex-vue-web/package.json | 2 +- packages/weex-vue-plugins/weex-vue-websocket/package.json| 2 +- packages/weex-vue-plugins/weex-vue-webview/package.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8fe08a71/packages/weex-vue-plugins/weex-vue-a/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-a/package.json b/packages/weex-vue-plugins/weex-vue-a/package.json index aa9bfb2..c7495ad 100644 --- a/packages/weex-vue-plugins/weex-vue-a/package.json +++ b/packages/weex-vue-plugins/weex-vue-a/package.json @@ -21,6 +21,6 @@ ], "peerDependencies": { "weex-vue-render": "^0.12.0", -"weex-loader": "^12.0" +"vue-loader": "^12.0" } } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8fe08a71/packages/weex-vue-plugins/weex-vue-animation/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-animation/package.json b/packages/weex-vue-plugins/weex-vue-animation/package.json index 89a4af6..bffde3e 100644 --- a/packages/weex-vue-plugins/weex-vue-animation/package.json +++ b/packages/weex-vue-plugins/weex-vue-animation/package.json @@ -22,6 +22,6 @@ ], "peerDependencies": { "weex-vue-render": "^0.12.0", -"weex-loader": "^12.0" +"vue-loader": "^12.0" } } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8fe08a71/packages/weex-vue-plugins/weex-vue-clipboard/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-clipboard/package.json b/packages/weex-vue-plugins/weex-vue-clipboard/package.json index f21df0e..91af538 100644 --- a/packages/weex-vue-plugins/weex-vue-clipboard/package.json +++ b/packages/weex-vue-plugins/weex-vue-clipboard/package.json @@ -22,6 +22,6 @@ ], "peerDependencies": { "weex-vue-render": "^0.12.0", -"weex-loader": "^12.0" +"vue-loader": "^12.0" } } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8fe08a71/packages/weex-vue-plugins/weex-vue-dom/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-dom/package.json b/packages/weex-vue-plugins/weex-vue-dom/package.json index feb8eae..c673808 100644 --- a/packages/weex-vue-plugins/weex-vue-dom/package.json +++ b/packages/weex-vue-plugins/weex-vue-dom/package.json @@ -22,6 +22,6 @@ ], "peerDependencies": { "weex-vue-render": "^0.12.0", -"weex-loader": "^12.0" +"vue-loader": "^12.0" } } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8fe08a71/packages/weex-vue-plugins/weex-vue-event/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-event/package.json b/packages/weex-vue-plugins/weex-vue-event/package.json index f343caf..244ec39 100644 --- a/packages/weex-vue-plugins/weex-vue-event/package.json +++
[19/43] incubator-weex git commit: Merge branch 'feature/generate-packages' into 0.15-dev-web
Merge branch 'feature/generate-packages' into 0.15-dev-web Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/66803526 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/66803526 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/66803526 Branch: refs/heads/0.16-dev Commit: 668035263df48a154ca64ad0f18b4143e8e072de Parents: 194a57d fe40690 Author: MrRaindropAuthored: Thu Jul 20 17:40:04 2017 +0800 Committer: MrRaindrop Committed: Thu Jul 20 17:40:04 2017 +0800 -- build/build.js | 48 +- build/config.js | 35 +- 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 | 29 + 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 | 7 + .../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 | 66 +++ .../vue/components/scrollable/waterfall.js | 573 ++- html5/render/vue/components/slider/index.js | 69 +-- 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.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 | 6 - html5/render/vue/mixins/base.js | 26 - html5/render/vue/mixins/index.js| 2 - html5/render/vue/mixins/scrollable.js | 233 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| 67 --- package.json| 10 +- 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 +
[31/43] incubator-weex git commit: * [html5] fix test cases & rm perf utils.
* [html5] fix test cases & rm perf utils. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a2064a49 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a2064a49 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a2064a49 Branch: refs/heads/0.16-dev Commit: a2064a49014b2200490f47f61158272ecf2bcd97 Parents: 7e6c95b Author: MrRaindropAuthored: Tue Jul 25 21:13:54 2017 +0800 Committer: MrRaindrop Committed: Tue Jul 25 21:13:54 2017 +0800 -- build/config.js | 6 +- html5/render/vue/index.js | 19 -- html5/render/vue/mixins/base.js | 45 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/utils/lazyload.js | 56 ++--- html5/test/render/vue/utils/perf.js | 94 +--- html5/test/render/vue/utils/style.js| 52 +++-- package.json| 3 +- packages/weex-vue-render/README.md | 10 +- 16 files changed, 89 insertions(+), 521 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a2064a49/build/config.js -- diff --git a/build/config.js b/build/config.js index 544ecd9..85470d7 100644 --- a/build/config.js +++ b/build/config.js @@ -85,8 +85,7 @@ const configs = { entry: absolute('packages/weex-vue-render/src/index.js'), dest: absolute('packages/weex-vue-render/dist/index.js'), banner:` -console.log('START WEEX VUE RENDER: ${subversion['vue-render']}, Build ${now()}.'); -window._jslib_init_start = window.performance && window.performance.now && window.performance.now() || +new Date();\n\n`, +console.log('START WEEX VUE RENDER: ${subversion['vue-render']}, Build ${now()}.');\n\n`, format: 'umd', plugins: [ postcss(), @@ -105,8 +104,7 @@ window._jslib_init_start = window.performance && window.performance.now && windo entry: absolute('packages/weex-vue-render/src/index.core.js'), dest: absolute('packages/weex-vue-render/dist/index.core.js'), banner:` -console.log('START WEEX VUE RENDER CORE: ${subversion['vue-render']}, Build ${now()}.'); -window._jslib_init_start = window.performance && window.performance.now && window.performance.now() || +new Date();\n\n`, +console.log('START WEEX VUE RENDER CORE: ${subversion['vue-render']}, Build ${now()}.');\n\n`, format: 'umd', plugins: [ postcss(), http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a2064a49/html5/render/vue/index.js -- diff --git a/html5/render/vue/index.js b/html5/render/vue/index.js index a307e80..8a00a57 100644 --- a/html5/render/vue/index.js +++ b/html5/render/vue/index.js @@ -19,7 +19,6 @@ import weex from './env' import { setVue } from './env' import { base, style, sticky } from './mixins' -// import styleMixin from './mixins/style' /** * init weex. @@ -44,18 +43,9 @@ function init (Vue/*, options = {}*/) { Vue.config.isReservedTag = tag => htmlRegex.test(tag) Vue.config.parsePlatformTagName = tag => tag.replace(htmlRegex, '') - /* istanbul ignore next */ - // if (process.env.NODE_ENV === 'development') { - // if (semver.lt(Vue.version, '2.1.5')) { - // console.warn(`[Vue Render] The version of Vue should be ` + - // `greater than 2.1.5, current is ${Vue.version}.`) - // } - // console.info(`[Vue Render] Registered components: ` - // + `[${Object.keys(components).join(', ')}].`) Vue.mixin(base) Vue.mixin(style) Vue.mixin(sticky) - // } } // auto init in dist mode. @@ -65,13 +55,4 @@ if (typeof window !== 'undefined' && window.Vue) { weex.init = init -// perf stat for componentCount. -window._component_count = 0 - -// perf stat for JSLibInitTime. -window._jslib_init_end = window.performance && window.performance.now() || +new Date() -window._weex_perf.stat.JSLibInitTime = parseInt(window._jslib_init_end - window._jslib_init_start) -delete window._jslib_init_end -delete window._jslib_init_start - export default weex http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a2064a49/html5/render/vue/mixins/base.js -- diff --git a/html5/render/vue/mixins/base.js
[25/43] incubator-weex git commit: 0.12.1
0.12.1 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d1f619dd Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d1f619dd Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d1f619dd Branch: refs/heads/0.16-dev Commit: d1f619dd89c9386855dd0e4ef6e6fe4192e50aad Parents: 8fe08a7 Author: MrRaindropAuthored: Thu Jul 20 20:39:23 2017 +0800 Committer: MrRaindrop Committed: Thu Jul 20 20:39:23 2017 +0800 -- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d1f619dd/package.json -- diff --git a/package.json b/package.json index 1d86f3b..d08813d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "weex", - "version": "0.12.0", + "version": "0.12.1", "subversion": { "browser": "0.5.0", "framework": "0.20.6",
[28/43] incubator-weex git commit: Merge branch '0.15-dev' into 0.15-dev-web
Merge branch '0.15-dev' into 0.15-dev-web Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ed20cdc2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ed20cdc2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ed20cdc2 Branch: refs/heads/0.16-dev Commit: ed20cdc274515ff7a3334b76cf855856e12497e3 Parents: 5225997 7ca3a1e Author: MrRaindropAuthored: Tue Jul 25 15:50:54 2017 +0800 Committer: MrRaindrop Committed: Tue Jul 25 15:50:54 2017 +0800 -- README.md | 51 +- .../weex/extend/component/WXParallax.java | 4 +- .../taobao/weex/dom/WXRecyclerDomObject.java| 4 + .../ui/component/list/BasicListComponent.java | 30 +- .../weex/ui/component/list/WXListComponent.java | 9 +- examples/vue/components/input.vue | 17 + html5/test/render/vue/core/node.js | 10 +- .../render/vue/data/dotvue/event-bubble-bar.vue | 11 - .../render/vue/data/dotvue/event-bubble.vue | 11 - .../WeexDemo.xcodeproj/project.pbxproj | 4 + ios/playground/WeexDemo/WXDemoViewController.m | 3 +- ios/sdk/WeexSDK-Dynamic/Info.plist | 24 + ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 638 ++- .../xcschemes/WeexSDK-Dynamic.xcscheme | 80 +++ .../WeexSDK/Sources/Bridge/WXBridgeContext.h| 2 +- .../WeexSDK/Sources/Bridge/WXBridgeContext.m| 19 +- ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 16 +- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 19 +- .../Component/Recycler/WXRecyclerComponent.h| 3 +- .../Component/Recycler/WXRecyclerComponent.m| 5 +- .../Recycler/WXSectionDataController.h | 2 + .../Sources/Component/WXCanvasComponent.h | 2 +- .../WeexSDK/Sources/Component/WXEditComponent.m | 2 +- .../Sources/Component/WXFooterComponent.h | 2 +- .../Sources/Component/WXHeaderComponent.h | 3 +- .../Sources/Component/WXImageComponent.m| 1 + .../WeexSDK/Sources/Component/WXListComponent.m | 2 +- .../Sources/Component/WXScrollerComponent.m | 1 + .../WeexSDK/Sources/Component/WXTextComponent.m | 1 + .../Sources/Controller/WXRootViewController.m | 1 + .../Sources/Display/WXComponent+BoxShadow.h | 4 - ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.h | 1 + ios/sdk/WeexSDK/Sources/Display/WXRoundedRect.h | 2 +- ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m| 10 +- .../WeexSDK/Sources/Layout/WXComponent+Layout.m | 1 + .../Sources/Manager/WXComponentManager.h| 3 + .../Sources/Manager/WXComponentManager.m| 5 +- .../WeexSDK/Sources/Manager/WXServiceFactory.h | 2 +- .../WeexSDK/Sources/Manager/WXTracingManager.h | 125 .../WeexSDK/Sources/Manager/WXTracingManager.m | 382 +++ ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 5 +- .../WeexSDK/Sources/Model/WXJSExceptionInfo.h | 1 + .../WeexSDK/Sources/Model/WXJSExceptionInfo.m | 1 + ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 7 + .../WeexSDK/Sources/Module/WXAnimationModule.m | 7 +- ios/sdk/WeexSDK/Sources/Module/WXDomModule.m| 4 +- ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 4 +- ios/sdk/WeexSDK/Sources/Utility/WXLog.m | 1 + .../View/WXComponent+PseudoClassManagement.h| 4 +- .../Sources/View/WXComponent+ViewManagement.m | 3 +- ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 + ios/sdk/buildScripts.sh | 2 + 52 files changed, 1444 insertions(+), 108 deletions(-) --
[38/43] incubator-weex git commit: * [html5] fix test suit release.
* [html5] fix test suit release. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8b66fb8e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8b66fb8e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8b66fb8e Branch: refs/heads/0.16-dev Commit: 8b66fb8e114461515b0efc43ff0c10b7ebf1127b Parents: 3b36889 Author: MrRaindropAuthored: Wed Jul 26 22:33:26 2017 +0800 Committer: MrRaindrop Committed: Wed Jul 26 22:33:26 2017 +0800 -- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8b66fb8e/package.json -- diff --git a/package.json b/package.json index 32285e8..b2316c2 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "postinstall": "bash ./scripts/install-hooks.sh", "build:native": "node build/build.js native", "build:runtime": "node build/build.js runtime", -"install:buildtools": "npm i rollup rollup-watch rollup-plugin-buble rollup-plugin-json rollup-plugin-eslint rollup-plugin-commonjs rollup-plugin-flow rollup-plugin-flow-no-whitespace rollup-plugin-postcss rollup-plugin-replace rollup-plugin-uglify rollup-plugin-node-resolve wwp flow-bin babel-core babel-eslint babel-istanbul babel-loader babel-plugin-coverage babel-preset-es2015 babel-runtime eslint-plugin-flowtype", +"install:buildtools": "npm i webpack@^1.0 rollup rollup-watch rollup-plugin-buble rollup-plugin-json rollup-plugin-eslint rollup-plugin-commonjs rollup-plugin-flow rollup-plugin-flow-no-whitespace rollup-plugin-postcss rollup-plugin-replace rollup-plugin-uglify rollup-plugin-node-resolve wwp flow-bin babel-core babel-eslint babel-istanbul babel-loader babel-plugin-coverage babel-preset-es2015 babel-runtime eslint-plugin-flowtype", "build:source": "npm run build:native && npm run build:browser && node build/build.js vue", "build:browser": "wwp && node build/build.js browser", "build:browser:common": "rollup -c build/rollup.browser.common.config.js",
[36/43] incubator-weex git commit: Merge branch '0.16-dev' into 0.16-dev-web
Merge branch '0.16-dev' into 0.16-dev-web Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0fadfcc9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0fadfcc9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0fadfcc9 Branch: refs/heads/0.16-dev Commit: 0fadfcc9bd2a3a9d5a4633cb82e58ccbd7876c1d Parents: 5581f72 3afacf1 Author: MrRaindropAuthored: Wed Jul 26 14:46:21 2017 +0800 Committer: MrRaindrop Committed: Wed Jul 26 14:46:21 2017 +0800 -- dangerfile.js | 8 +- html5/test/render/vue/core/node.js | 5 +- .../render/vue/data/dotvue/event-bubble-bar.vue | 8 +- .../render/vue/data/dotvue/event-bubble.vue | 4 +- html5/test/render/vue/modules/animation.js | 61 +++ html5/test/render/vue/modules/dom.js| 109 +++ html5/test/render/vue/modules/globalEvent.js| 45 html5/test/render/vue/modules/navigator.js | 44 html5/test/render/vue/modules/webview.js| 53 + 9 files changed, 329 insertions(+), 8 deletions(-) --
[33/43] incubator-weex git commit: * [html5] @notdanger.
* [html5] @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/20148324 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/20148324 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/20148324 Branch: refs/heads/0.16-dev Commit: 20148324ff1718128f328faa92b5aef50faa4062 Parents: 2ef0c51 Author: MrRaindropAuthored: Wed Jul 26 10:41:10 2017 +0800 Committer: MrRaindrop Committed: Wed Jul 26 10:41:10 2017 +0800 -- --
[06/43] incubator-weex git commit: * [html5] add touch events & fix event mapping.
* [html5] add touch events & fix event mapping. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c4f461f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c4f461f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c4f461f3 Branch: refs/heads/0.16-dev Commit: c4f461f34929a6c2f733047698ee4d565db001c1 Parents: 736772b Author: MrRaindropAuthored: Mon Jul 3 17:37:04 2017 +0800 Committer: MrRaindrop Committed: Mon Jul 3 17:37:04 2017 +0800 -- .../vue/components/scrollable/list/index.js | 3 +- .../vue/components/scrollable/scroller.js | 3 +- .../vue/components/scrollable/waterfall.js | 3 +- .../render/vue/components/slider/slideMixin.js | 17 --- html5/render/vue/core/node.js | 51 html5/test/render/vue/core/node.js | 4 +- 6 files changed, 57 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c4f461f3/html5/render/vue/components/scrollable/list/index.js -- diff --git a/html5/render/vue/components/scrollable/list/index.js b/html5/render/vue/components/scrollable/list/index.js index e781fe9..79e6d7d 100644 --- a/html5/render/vue/components/scrollable/list/index.js +++ b/html5/render/vue/components/scrollable/list/index.js @@ -19,7 +19,6 @@ import { extractComponentStyle, createEventMap } from '../../../core' import { scrollable } from '../../../mixins' // import { validateStyles } from '../../../validator' -import { extend } from '../../../utils' import listMixin from './listMixin' export default { @@ -66,7 +65,7 @@ export default { ref: 'wrapper', attrs: { 'weex-type': 'list' }, staticClass: this.wrapperClass, - on: extend(createEventMap(this), { + on: createEventMap(this, { scroll: this.handleListScroll, touchstart: this.handleTouchStart, touchmove: this.handleTouchMove, http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c4f461f3/html5/render/vue/components/scrollable/scroller.js -- diff --git a/html5/render/vue/components/scrollable/scroller.js b/html5/render/vue/components/scrollable/scroller.js index 3151fae..1eebab3 100644 --- a/html5/render/vue/components/scrollable/scroller.js +++ b/html5/render/vue/components/scrollable/scroller.js @@ -19,7 +19,6 @@ import { extractComponentStyle, createEventMap } from '../../core' import { scrollable } from '../../mixins' // import { validateStyles } from '../../validator' -import { extend } from '../../utils' import listMixin from './list/listMixin' export default { @@ -80,7 +79,7 @@ export default { return createElement('main', { ref: 'wrapper', attrs: { 'weex-type': 'scroller' }, - on: extend(createEventMap(this), { + on: createEventMap(this, { scroll: this.handleScroll, touchstart: this.handleTouchStart, touchmove: this.handleTouchMove, http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c4f461f3/html5/render/vue/components/scrollable/waterfall.js -- diff --git a/html5/render/vue/components/scrollable/waterfall.js b/html5/render/vue/components/scrollable/waterfall.js index 2239f00..012c1d2 100644 --- a/html5/render/vue/components/scrollable/waterfall.js +++ b/html5/render/vue/components/scrollable/waterfall.js @@ -23,7 +23,6 @@ */ import { extractComponentStyle, createEventMap } from '../../core' import { scrollable } from '../../mixins' -import { extend } from '../../utils' const NORMAL_GAP_SIZE = 32 const DEFAULT_COLUMN_COUNT = 1 @@ -325,7 +324,7 @@ export default { return createElement('main', { ref: 'wrapper', attrs: { 'weex-type': 'waterfall' }, - on: extend(createEventMap(this), { + on: createEventMap(this, { scroll: this.handleScroll, touchstart: this.handleTouchStart, touchmove: this.handleTouchMove, http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c4f461f3/html5/render/vue/components/slider/slideMixin.js -- diff --git a/html5/render/vue/components/slider/slideMixin.js b/html5/render/vue/components/slider/slideMixin.js index 73960e5..2b7bfa1 100644 --- a/html5/render/vue/components/slider/slideMixin.js +++ b/html5/render/vue/components/slider/slideMixin.js @@ -19,7 +19,6 @@ import './slider.css' import { throttle, - extend, createEvent, fireLazyload, addTransform, @@ -116,12 +115,16 @@ export default { { ref: 'wrapper',
[18/43] incubator-weex git commit: * [html5] publish plugins.
* [html5] publish plugins. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fe406907 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fe406907 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fe406907 Branch: refs/heads/0.16-dev Commit: fe406907a138f0d3bfee787da42dd7b39a3b0cef Parents: 5298c11 Author: MrRaindropAuthored: Thu Jul 20 17:38:16 2017 +0800 Committer: MrRaindrop Committed: Thu Jul 20 17:38:16 2017 +0800 -- packages/weex-vue-plugins/weex-vue-a/package.json| 2 +- packages/weex-vue-plugins/weex-vue-animation/package.json| 2 +- packages/weex-vue-plugins/weex-vue-clipboard/package.json| 2 +- packages/weex-vue-plugins/weex-vue-dom/package.json | 2 +- packages/weex-vue-plugins/weex-vue-event/package.json| 2 +- packages/weex-vue-plugins/weex-vue-geolocation/package.json | 2 +- packages/weex-vue-plugins/weex-vue-global-event/package.json | 2 +- packages/weex-vue-plugins/weex-vue-input/package.json| 2 +- packages/weex-vue-plugins/weex-vue-modal/package.json| 2 +- packages/weex-vue-plugins/weex-vue-navigator/package.json| 4 ++-- packages/weex-vue-plugins/weex-vue-slider/package.json | 2 +- packages/weex-vue-plugins/weex-vue-storage/package.json | 2 +- packages/weex-vue-plugins/weex-vue-stream/package.json | 2 +- packages/weex-vue-plugins/weex-vue-switch/package.json | 2 +- packages/weex-vue-plugins/weex-vue-textarea/package.json | 2 +- packages/weex-vue-plugins/weex-vue-video/package.json| 2 +- packages/weex-vue-plugins/weex-vue-web/package.json | 2 +- packages/weex-vue-plugins/weex-vue-websocket/package.json| 2 +- packages/weex-vue-plugins/weex-vue-webview/package.json | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fe406907/packages/weex-vue-plugins/weex-vue-a/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-a/package.json b/packages/weex-vue-plugins/weex-vue-a/package.json index 55dcb1f..ce586e6 100644 --- a/packages/weex-vue-plugins/weex-vue-a/package.json +++ b/packages/weex-vue-plugins/weex-vue-a/package.json @@ -1,6 +1,6 @@ { "name": "weex-vue-a", - "version": "0.1.0", + "version": "0.1.1", "description": "Weex built-in '' component for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js", http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fe406907/packages/weex-vue-plugins/weex-vue-animation/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-animation/package.json b/packages/weex-vue-plugins/weex-vue-animation/package.json index 56f0e80..89a4af6 100644 --- a/packages/weex-vue-plugins/weex-vue-animation/package.json +++ b/packages/weex-vue-plugins/weex-vue-animation/package.json @@ -1,6 +1,6 @@ { "name": "weex-vue-animation", - "version": "0.1.0", + "version": "0.1.1", "description": "Weex built-in API module 'animation' for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js", http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fe406907/packages/weex-vue-plugins/weex-vue-clipboard/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-clipboard/package.json b/packages/weex-vue-plugins/weex-vue-clipboard/package.json index a4b07d1..f21df0e 100644 --- a/packages/weex-vue-plugins/weex-vue-clipboard/package.json +++ b/packages/weex-vue-plugins/weex-vue-clipboard/package.json @@ -1,6 +1,6 @@ { "name": "weex-vue-clipboard", - "version": "0.1.0", + "version": "0.1.1", "description": "Weex built-in API module 'clipboard' for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js", http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fe406907/packages/weex-vue-plugins/weex-vue-dom/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-dom/package.json b/packages/weex-vue-plugins/weex-vue-dom/package.json index 67e23dc..feb8eae 100644 --- a/packages/weex-vue-plugins/weex-vue-dom/package.json +++ b/packages/weex-vue-plugins/weex-vue-dom/package.json @@ -1,6 +1,6 @@ { "name": "weex-vue-dom", - "version": "0.1.0", + "version": "0.1.1", "description": "Weex built-in API module 'dom' for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js", http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fe406907/packages/weex-vue-plugins/weex-vue-event/package.json
[32/43] incubator-weex git commit: * [html5] clean debugger.
* [html5] clean debugger. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2ef0c510 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2ef0c510 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2ef0c510 Branch: refs/heads/0.16-dev Commit: 2ef0c5103bd093c1572edb679f5c2b67e9a00579 Parents: a2064a4 Author: MrRaindropAuthored: Tue Jul 25 21:14:55 2017 +0800 Committer: MrRaindrop Committed: Tue Jul 25 21:14:55 2017 +0800 -- html5/test/render/vue/utils/style.js | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2ef0c510/html5/test/render/vue/utils/style.js -- diff --git a/html5/test/render/vue/utils/style.js b/html5/test/render/vue/utils/style.js index c073987..2b2e321 100644 --- a/html5/test/render/vue/utils/style.js +++ b/html5/test/render/vue/utils/style.js @@ -122,7 +122,6 @@ describe('transform', () => { }) it('should replace all transform properties', () => { addTransform(node, style, true) - debugger; expect(trimSpace(node.style.transform)).to.be.equal( trimSpace(style.translate + style.rotate)) // webkitTransform will remove last whitespace automatically @@ -151,7 +150,6 @@ describe('transform', () => { node.style.transform = nodeStyle.translate + ' ' + nodeStyle.scale + ' ' + nodeStyle.rotate node.style.webkitTransform = nodeStyle.translate + ' ' + nodeStyle.scale + ' ' + nodeStyle.rotate addTranslateX(node, toAdd) - debugger; // webkitTransform will reserved whitespace between translate value but transform will not. expect(trimSpace(node.style.transform)).to.be.equal( trimSpace(nodeStyle.translate.replace(translateReg, translateReplaceFunction)
[08/43] incubator-weex git commit: Merge branch '0.15-dev' into 0.15-dev-web
Merge branch '0.15-dev' into 0.15-dev-web Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/69365b3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/69365b3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/69365b3b Branch: refs/heads/0.16-dev Commit: 69365b3b41df8ea3c3b2a6504980dbefa431a938 Parents: 34f9f59 cc9ca19 Author: MrRaindropAuthored: Mon Jul 3 17:40:21 2017 +0800 Committer: MrRaindrop Committed: Mon Jul 3 17:40:21 2017 +0800 -- .../java/com/taobao/weex/WXEnvironment.java | 4 + .../com/taobao/weex/bridge/WXBridgeManager.java | 12 +- .../java/com/taobao/weex/common/WXConfig.java | 1 + .../taobao/weex/ui/component/WXComponent.java | 8 + .../ui/component/list/BasicListComponent.java | 57 +++-- .../taobao/weex/ui/component/list/WXCell.java | 9 + build/karma.vue.conf.js | 9 +- doc/source/cn/references/weex-variable.md | 1 + doc/source/references/weex-variable.md | 1 + html5/render/vue/core/style.js | 1 - html5/render/vue/modules/websocket/websocket.js | 1 + html5/test/render/vue/helper/utils.js | 10 +- html5/test/render/vue/modules/modal.js | 225 +++ html5/test/render/vue/modules/websocket.js | 109 - ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +- .../WeexSDK/Sources/Component/WXTextComponent.m | 16 ++ ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 1 + package.json| 2 +- 18 files changed, 432 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/69365b3b/package.json --
[27/43] incubator-weex git commit: * [html5] update version.
* [html5] update version. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5225997d Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5225997d Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5225997d Branch: refs/heads/0.16-dev Commit: 5225997d01796843308f48b4b9abad35a55b6170 Parents: b195a36 Author: MrRaindropAuthored: Thu Jul 20 21:37:50 2017 +0800 Committer: MrRaindrop Committed: Thu Jul 20 21:37:50 2017 +0800 -- packages/weex-vue-plugins/weex-vue-a/package.json| 2 +- packages/weex-vue-plugins/weex-vue-animation/package.json| 2 +- packages/weex-vue-plugins/weex-vue-clipboard/package.json| 2 +- packages/weex-vue-plugins/weex-vue-dom/package.json | 2 +- packages/weex-vue-plugins/weex-vue-event/package.json| 2 +- packages/weex-vue-plugins/weex-vue-geolocation/package.json | 2 +- packages/weex-vue-plugins/weex-vue-global-event/package.json | 2 +- packages/weex-vue-plugins/weex-vue-input/package.json| 2 +- packages/weex-vue-plugins/weex-vue-modal/package.json| 2 +- packages/weex-vue-plugins/weex-vue-navigator/package.json| 2 +- packages/weex-vue-plugins/weex-vue-slider/package.json | 2 +- packages/weex-vue-plugins/weex-vue-storage/package.json | 2 +- packages/weex-vue-plugins/weex-vue-stream/package.json | 2 +- packages/weex-vue-plugins/weex-vue-switch/package.json | 2 +- packages/weex-vue-plugins/weex-vue-textarea/package.json | 2 +- packages/weex-vue-plugins/weex-vue-video/package.json| 2 +- packages/weex-vue-plugins/weex-vue-web/package.json | 2 +- packages/weex-vue-plugins/weex-vue-websocket/package.json| 2 +- packages/weex-vue-plugins/weex-vue-webview/package.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5225997d/packages/weex-vue-plugins/weex-vue-a/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-a/package.json b/packages/weex-vue-plugins/weex-vue-a/package.json index c7495ad..b0d1d9a 100644 --- a/packages/weex-vue-plugins/weex-vue-a/package.json +++ b/packages/weex-vue-plugins/weex-vue-a/package.json @@ -1,6 +1,6 @@ { "name": "weex-vue-a", - "version": "0.1.1", + "version": "0.1.2", "description": "Weex built-in 'a' component for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js", http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5225997d/packages/weex-vue-plugins/weex-vue-animation/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-animation/package.json b/packages/weex-vue-plugins/weex-vue-animation/package.json index bffde3e..94c7368 100644 --- a/packages/weex-vue-plugins/weex-vue-animation/package.json +++ b/packages/weex-vue-plugins/weex-vue-animation/package.json @@ -1,6 +1,6 @@ { "name": "weex-vue-animation", - "version": "0.1.1", + "version": "0.1.2", "description": "Weex built-in API module 'animation' for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js", http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5225997d/packages/weex-vue-plugins/weex-vue-clipboard/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-clipboard/package.json b/packages/weex-vue-plugins/weex-vue-clipboard/package.json index 91af538..10e6c01 100644 --- a/packages/weex-vue-plugins/weex-vue-clipboard/package.json +++ b/packages/weex-vue-plugins/weex-vue-clipboard/package.json @@ -1,6 +1,6 @@ { "name": "weex-vue-clipboard", - "version": "0.1.1", + "version": "0.1.2", "description": "Weex built-in API module 'clipboard' for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js", http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5225997d/packages/weex-vue-plugins/weex-vue-dom/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-dom/package.json b/packages/weex-vue-plugins/weex-vue-dom/package.json index c673808..d1df658 100644 --- a/packages/weex-vue-plugins/weex-vue-dom/package.json +++ b/packages/weex-vue-plugins/weex-vue-dom/package.json @@ -1,6 +1,6 @@ { "name": "weex-vue-dom", - "version": "0.1.1", + "version": "0.1.2", "description": "Weex built-in API module 'dom' for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js", http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5225997d/packages/weex-vue-plugins/weex-vue-event/package.json
[12/43] incubator-weex git commit: * [html5] release 0.11.57
* [html5] release 0.11.57 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/eb5dcb83 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eb5dcb83 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eb5dcb83 Branch: refs/heads/0.16-dev Commit: eb5dcb83c643b58536bbcfab1545ecec586031eb Parents: adac876 Author: MrRaindropAuthored: Fri Jul 14 11:12:19 2017 +0800 Committer: MrRaindrop Committed: Fri Jul 14 11:12:19 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/eb5dcb83/package.json -- diff --git a/package.json b/package.json index f99aec9..8aa7b32 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.20.6", -"vue-render": "0.11.56", +"vue-render": "0.11.57", "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/eb5dcb83/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index 6356cca..ecf00c4 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.56", + "version": "0.11.57", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js",
[29/43] incubator-weex git commit: + [html5] add render built with weex-vue-bundle-tool.
+ [html5] add render built with weex-vue-bundle-tool. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b50035e0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b50035e0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b50035e0 Branch: refs/heads/0.16-dev Commit: b50035e0c579439d29e6b8ac3c1b2aeba6e9b4dc Parents: ed20cdc Author: MrRaindropAuthored: Tue Jul 25 16:01:05 2017 +0800 Committer: MrRaindrop Committed: Tue Jul 25 16:01:05 2017 +0800 -- .gitignore | 3 +++ build/build.js | 59 - entry.js | 11 html5/render/vue/README.md | 10 ++- package.json | 1 + vue.html | 8 +++--- 6 files changed, 87 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b50035e0/.gitignore -- diff --git a/.gitignore b/.gitignore index ada18b8..d1469fc 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,9 @@ examples/vue/test/ html5/browser/extend/packer.js html5/render/browser/extend/packer.js +# Created by weex-vue-bundle-util +weex-vue-plugins.js + android/playground/app/gradlew android/playground/app/gradlew.bat android/playground/app/gradle/wrapper/gradle-wrapper.jar http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b50035e0/build/build.js -- diff --git a/build/build.js b/build/build.js index c96fe66..ff2ef08 100644 --- a/build/build.js +++ b/build/build.js @@ -24,6 +24,10 @@ const gzip = require('zlib').createGzip() const pkg = require('../package.json') const rollup = require('rollup') const watch = require('rollup-watch') +const webpack = require('webpack') +const scan = require('weex-vue-bundle-util') +const webExamplesWebpackConfig = require('./webpack.examples.web.config') +const exec = require('child_process').execSync const getConfig = require('./config') @@ -111,6 +115,55 @@ function getAllEntries (rootDir) { }) } +function absolutePath (p) { + return path.join(__dirname, p) +} + +function buildForWebExamples (config, minifyConfig) { + config.entry = minifyConfig.entry = absolutePath('../entry.js') + config.dest = absolutePath('../dist/render.vue.js') + delete config.banner + config.plugins = config.plugins.filter(function (plugin) { +return plugin.name !== 'eslint' + }) + minifyConfig.dest = absolutePath('../dist/render.vue.min.js') + delete minifyConfig.banner + + // bundle web examples. + scan(webpack, webExamplesWebpackConfig) +.then(function (res) { + var pkgs = res.pkgs + var names = [] + var str = pkgs.map(function (pkgName) { +var name = pkgName + .replace('weex-vue-', '') + .replace(/-(\w)/g, function ($0, $1) { +return $1.toUpperCase() + }) + + 'Mod' +names.push(name) +try { + var version = require(`${pkgName}/package.json`).version +} catch (err) { + exec(`npm install ${pkgName}`) +} +return `import ${name} from '${pkgName}'\n` + }).join('') + str += `export default [\n${names.join(', \n')}\n]\n` + return fs.writeFileSync(absolutePath('../weex-vue-plugins.js'), str) +}) +.then(function () { + console.log(`\n => start to build weex-vue-render for examples.\n`) + return new Promise((resolve, reject) => { +runRollup(config).then(() => { + runRollup(minifyConfig).then(() => { +zip(minifyConfig.dest, resolve) + }) +}) + }) +}) +} + function build (name) { let pkgName = 'weex-js-framework' switch (name) { @@ -120,12 +173,16 @@ function build (name) { case 'vue': pkgName = 'weex-vue-render'; break; case 'vue-plugins': pkgName = 'weex-vue-render-plugins'; break; case 'vue-core': pkgName = 'weex-vue-render-core'; break; +case 'web-examples': pkgName = 'weex-vue-render-core'; break; } const config = getConfig(pkgName) const minifyConfig = getConfig(pkgName, true) - if (pkgName === 'weex-vue-render-plugins') { + if (name === 'web-examples') { +buildForWebExamples(config, minifyConfig) + } + else if (pkgName === 'weex-vue-render-plugins') { // build multiple packages in a loop. console.log(`\n => start to build ${name} (${pkgName})\n`) const entries = getAllEntries(path.join(__dirname, '../packages/weex-vue-plugins')) http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b50035e0/entry.js -- diff --git a/entry.js
[42/43] incubator-weex git commit: * [html5] fix release tests.
* [html5] fix release tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c45b53cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c45b53cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c45b53cd Branch: refs/heads/0.16-dev Commit: c45b53cdbf11bc72f0124c05c4f461d1185d3c70 Parents: 83dd1e5 Author: MrRaindropAuthored: Fri Jul 28 15:22:24 2017 +0800 Committer: MrRaindrop Committed: Fri Jul 28 15:22:24 2017 +0800 -- build/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c45b53cd/build/build.js -- diff --git a/build/build.js b/build/build.js index ff2ef08..d3b0559 100644 --- a/build/build.js +++ b/build/build.js @@ -26,7 +26,6 @@ const rollup = require('rollup') const watch = require('rollup-watch') const webpack = require('webpack') const scan = require('weex-vue-bundle-util') -const webExamplesWebpackConfig = require('./webpack.examples.web.config') const exec = require('child_process').execSync const getConfig = require('./config') @@ -120,6 +119,7 @@ function absolutePath (p) { } function buildForWebExamples (config, minifyConfig) { + const webExamplesWebpackConfig = require('./webpack.examples.web.config') config.entry = minifyConfig.entry = absolutePath('../entry.js') config.dest = absolutePath('../dist/render.vue.js') delete config.banner
[14/43] incubator-weex git commit: * [html5] implementate the integrated components as render's plugin, which should have no directly dependency on render core.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b1a7c02a/html5/render/vue/components/slider/slideMixin.js -- diff --git a/html5/render/vue/components/slider/slideMixin.js b/html5/render/vue/components/slider/slideMixin.js index 2b7bfa1..f160d58 100644 --- a/html5/render/vue/components/slider/slideMixin.js +++ b/html5/render/vue/components/slider/slideMixin.js @@ -17,17 +17,6 @@ * under the License. */ import './slider.css' -import { - throttle, - createEvent, - fireLazyload, - addTransform, - copyTransform, - getTransformObj, - bind, - extendKeys -} from '../../utils' -import { extractComponentStyle, createEventMap } from '../../core' const TRANSITION_TIME = 400 const NEIGHBOR_SCALE_TIME = 100 @@ -59,7 +48,7 @@ export default { } } } -fireLazyload(this.$el, true) +weex.utils.fireLazyload(this.$el, true) if (this._preIndex !== this.currentIndex) { this._slideTo(this.currentIndex) } @@ -68,7 +57,7 @@ export default { mounted () { this._getWrapperSize() this._slideTo(this.currentIndex) -fireLazyload(this.$el, true) +weex.utils.fireLazyload(this.$el, true) }, methods: { @@ -109,24 +98,23 @@ export default { _renderSlides (createElement) { this._cells = this._formatChildren(createElement) this.frameCount = this._cells.length - this._renderHook() return createElement( 'nav', { ref: 'wrapper', attrs: { 'weex-type': this.isNeighbor ? 'slider-neighbor' : 'slider' }, - on: createEventMap( + on: weex.createEventMap( this, ['scroll', 'scrollstart', 'scrollend'], { touchstart: this._handleTouchStart, - touchmove: throttle(bind(this._handleTouchMove, this), 25), + touchmove: weex.utils.throttle(weex.utils.bind(this._handleTouchMove, this), 25), touchend: this._handleTouchEnd, touchcancel: this._handleTouchCancel } ), staticClass: 'weex-slider weex-slider-wrapper weex-ct', - staticStyle: extractComponentStyle(this) + staticStyle: weex.extractComponentStyle(this) }, [ createElement('ul', { @@ -154,7 +142,7 @@ export default { } let interval = parseInt(this.interval - TRANSITION_TIME - NEIGHBOR_SCALE_TIME) interval = interval > INTERVAL_MINIMUM ? interval : INTERVAL_MINIMUM - this._autoPlayTimer = setTimeout(bind(this._next, this), interval) + this._autoPlayTimer = setTimeout(weex.utils.bind(this._next, this), interval) }, _stopAutoPlay () { @@ -195,7 +183,7 @@ export default { if (inner) { this._prepareNodes() -const translate = getTransformObj(inner).translate +const translate = weex.utils.getTransformObj(inner).translate const match = translate && translate.match(/translate[^(]+\(([+-\d.]+)/) const innerX = match && match[1] || 0 const dist = innerX - this.innerOffset @@ -240,7 +228,7 @@ export default { } if (newIndex !== this._preIndex) { -this.$emit('change', createEvent(this.$el, 'change', { +this.$emit('change', weex.utils.createEvent(this.$el, 'change', { index: newIndex })) } @@ -252,7 +240,7 @@ export default { let node = this._showNodes[i] node = node && node.firstElementChild if (!node) { continue } -addTransform(this._showNodes[i].firstElementChild, { +weex.utils.addTransform(this._showNodes[i].firstElementChild, { translate: 'translate3d(0px, 0px, 0px)' }) } @@ -343,7 +331,7 @@ export default { node._inShow = true const translateX = index * this._wrapperWidth - this.innerOffset - addTransform(node, { + weex.utils.addTransform(node, { translate: `translate3d(${translateX}px, 0px, 0px)` }) node.style.zIndex = 99 - Math.abs(index) @@ -408,16 +396,16 @@ export default { * one element to another. */ _copyStyle (from, to, styles = ['opacity', 'zIndex'], transformExtra = {}) { - extendKeys(to.style, from.style, styles) - const transObj = getTransformObj(from) + weex.utils.extendKeys(to.style, from.style, styles) + const transObj = weex.utils.getTransformObj(from) for (const k in transformExtra) { transObj[k] = transformExtra[k] } - addTransform(to, transObj) + weex.utils.addTransform(to, transObj) const fromInner = from.firstElementChild const toInner = to.firstElementChild toInner.style.opacity = fromInner.style.opacity - copyTransform(fromInner, toInner) + weex.utils.copyTransform(fromInner, toInner) }, /** @@ -438,7 +426,7 @@ export default {
[05/43] incubator-weex git commit: Merge branch '0.14-dev-web' into 0.15-dev-web
Merge branch '0.14-dev-web' into 0.15-dev-web Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/736772bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/736772bc Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/736772bc Branch: refs/heads/0.16-dev Commit: 736772bcdab5b71cec6fd15b3076e3752e929d85 Parents: 3719136 da1ca84 Author: MrRaindropAuthored: Fri Jun 30 17:46:49 2017 +0800 Committer: MrRaindrop Committed: Fri Jun 30 17:46:49 2017 +0800 -- html5/render/vue/core/node.js | 127 - html5/render/vue/env/wx-env.js| 2 +- package.json | 2 +- packages/weex-vue-render/package.json | 2 +- 4 files changed, 92 insertions(+), 41 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/736772bc/package.json --
[10/43] incubator-weex git commit: * [html5] fix loading & release v0.11.56
* [html5] fix loading & release v0.11.56 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/166513dc Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/166513dc Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/166513dc Branch: refs/heads/0.16-dev Commit: 166513dca8deb32e9d6d948ad1577b20e70096d4 Parents: d6730ef Author: MrRaindropAuthored: Tue Jul 4 18:56:59 2017 +0800 Committer: MrRaindrop Committed: Tue Jul 4 18:56:59 2017 +0800 -- html5/render/vue/mixins/base.js | 16 html5/render/vue/mixins/scrollable.js | 18 +++--- package.json | 2 +- packages/weex-vue-render/package.json | 2 +- 4 files changed, 21 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/166513dc/html5/render/vue/mixins/base.js -- diff --git a/html5/render/vue/mixins/base.js b/html5/render/vue/mixins/base.js index aa77d1f..ff31cd0 100644 --- a/html5/render/vue/mixins/base.js +++ b/html5/render/vue/mixins/base.js @@ -37,7 +37,7 @@ import { // import { extractComponentStyle } from '../core' -import config from '../config' +// import config from '../config' let lazyloadWatched = false function watchLazyload () { @@ -139,13 +139,13 @@ export default { return arr }, -_getParentScroller () { - let parent = this - while (parent && config.scrollableTypes.indexOf(parent.$options._componentTag) <= -1) { -parent = parent.$options.parent - } - return parent -}, +// _getParentScroller () { +// let parent = this +// while (parent && config.scrollableTypes.indexOf(parent.$options._componentTag) <= -1) { +// parent = parent.$options.parent +// } +// return parent +// }, _fireLazyload (el) { if (process.env.NODE_ENV === 'development') { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/166513dc/html5/render/vue/mixins/scrollable.js -- diff --git a/html5/render/vue/mixins/scrollable.js b/html5/render/vue/mixins/scrollable.js index 4f7b03c..54c87dd 100644 --- a/html5/render/vue/mixins/scrollable.js +++ b/html5/render/vue/mixins/scrollable.js @@ -107,6 +107,14 @@ export default { this._innerWidth = rect.width this._innerHeight = rect.height } + const loadingEl = this._loading && this._loading.$el + const refreshEl = this._refresh && this._refresh.$el + if (loadingEl) { +this._innerHeight -= loadingEl.getBoundingClientRect().height + } + if (refreshEl) { +this._innerHeight -= refreshEl.getBoundingClientRect().height + } // inner width is always the viewport width somehow in horizontal // scoller, therefore the inner width should be reclaculated. if (this.scrollDirection === 'horizontal' && children) { @@ -137,7 +145,7 @@ export default { this._innerLength = innerLength this._loadmoreReset = true } -if (this._loadmoreReset && this.reachBottom()) { +if (this._loadmoreReset && this.reachBottom(this.loadmoreoffset)) { this._loadmoreReset = false this.$emit('loadmore', event) } @@ -149,19 +157,15 @@ export default { return (!!wrapper) && (wrapper.scrollTop <= 0) }, -reachBottom () { +reachBottom (offset) { const wrapper = this.$refs.wrapper const inner = this.$refs.inner - const offset = parseInt(this.loadmoreoffset) * weex.config.env.scale + offset = parseInt(offset || 0) * weex.config.env.scale if (wrapper && inner) { -// const innerRect = inner.getBoundingClientRect() -// const wrapperRect = wrapper.getBoundingClientRect() const key = this.scrollDirection === 'horizontal' ? 'width' : 'height' -// const innerLength = innerRect[key] -// const wrapperLength = wrapperRect[key] const innerLength = this[`_inner${key[0].toUpperCase()}${key.substr(1)}`] const wrapperLength = this[`_wrapper${key[0].toUpperCase()}${key.substr(1)}`] const scrollOffset = this.scrollDirection === 'horizontal' http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/166513dc/package.json -- diff --git a/package.json b/package.json index 1c9aa54..f99aec9 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.20.6", -"vue-render": "0.11.55", +"vue-render": "0.11.56",
[07/43] incubator-weex git commit: * [html5] release v0.11.55
* [html5] release v0.11.55 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/34f9f59c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/34f9f59c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/34f9f59c Branch: refs/heads/0.16-dev Commit: 34f9f59cf7fdc3af97e5a689a7451355dd06a6fb Parents: c4f461f Author: MrRaindropAuthored: Mon Jul 3 17:38:59 2017 +0800 Committer: MrRaindrop Committed: Mon Jul 3 17:38:59 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/34f9f59c/package.json -- diff --git a/package.json b/package.json index 7feb65f..bad0c34 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.20.6", -"vue-render": "0.11.54", +"vue-render": "0.11.55", "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/34f9f59c/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index a431e54..d725d71 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.54", + "version": "0.11.55", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js",
[20/43] incubator-weex git commit: * [html5] update info.
* [html5] update info. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7f34d5b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7f34d5b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7f34d5b7 Branch: refs/heads/0.16-dev Commit: 7f34d5b76bf9bff49e52be7838f610a8b4077e84 Parents: fe40690 Author: MrRaindropAuthored: Thu Jul 20 17:53:43 2017 +0800 Committer: MrRaindrop Committed: Thu Jul 20 17:53:43 2017 +0800 -- packages/weex-vue-plugins/weex-vue-a/README.md | 2 +- packages/weex-vue-plugins/weex-vue-a/package.json| 2 +- packages/weex-vue-plugins/weex-vue-input/README.md | 2 +- packages/weex-vue-plugins/weex-vue-input/package.json| 2 +- packages/weex-vue-plugins/weex-vue-slider/README.md | 2 +- packages/weex-vue-plugins/weex-vue-slider/package.json | 2 +- packages/weex-vue-plugins/weex-vue-switch/README.md | 2 +- packages/weex-vue-plugins/weex-vue-switch/package.json | 2 +- packages/weex-vue-plugins/weex-vue-textarea/README.md| 2 +- packages/weex-vue-plugins/weex-vue-textarea/package.json | 2 +- packages/weex-vue-plugins/weex-vue-video/README.md | 2 +- packages/weex-vue-plugins/weex-vue-video/package.json| 2 +- packages/weex-vue-plugins/weex-vue-web/README.md | 2 +- packages/weex-vue-plugins/weex-vue-web/package.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f34d5b7/packages/weex-vue-plugins/weex-vue-a/README.md -- diff --git a/packages/weex-vue-plugins/weex-vue-a/README.md b/packages/weex-vue-plugins/weex-vue-a/README.md index daf0942..9c1b20f 100644 --- a/packages/weex-vue-plugins/weex-vue-a/README.md +++ b/packages/weex-vue-plugins/weex-vue-a/README.md @@ -1,3 +1,3 @@ # weex-vue-a -Weex built-in '' component for Vue 2.x. +Weex built-in 'a' component for Vue 2.x. http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f34d5b7/packages/weex-vue-plugins/weex-vue-a/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-a/package.json b/packages/weex-vue-plugins/weex-vue-a/package.json index ce586e6..aa9bfb2 100644 --- a/packages/weex-vue-plugins/weex-vue-a/package.json +++ b/packages/weex-vue-plugins/weex-vue-a/package.json @@ -1,7 +1,7 @@ { "name": "weex-vue-a", "version": "0.1.1", - "description": "Weex built-in '' component for Vue 2.x.", + "description": "Weex built-in 'a' component for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js", "repository": { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f34d5b7/packages/weex-vue-plugins/weex-vue-input/README.md -- diff --git a/packages/weex-vue-plugins/weex-vue-input/README.md b/packages/weex-vue-plugins/weex-vue-input/README.md index 5491fde..408a156 100644 --- a/packages/weex-vue-plugins/weex-vue-input/README.md +++ b/packages/weex-vue-plugins/weex-vue-input/README.md @@ -1,3 +1,3 @@ # weex-vue-input -Weex built-in '' component for Vue 2.x. +Weex built-in 'input' component for Vue 2.x. http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f34d5b7/packages/weex-vue-plugins/weex-vue-input/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-input/package.json b/packages/weex-vue-plugins/weex-vue-input/package.json index 6515340..ec1a3bf 100644 --- a/packages/weex-vue-plugins/weex-vue-input/package.json +++ b/packages/weex-vue-plugins/weex-vue-input/package.json @@ -1,7 +1,7 @@ { "name": "weex-vue-input", "version": "0.1.1", - "description": "Weex built-in '' component for Vue 2.x.", + "description": "Weex built-in 'input' component for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js", "repository": { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f34d5b7/packages/weex-vue-plugins/weex-vue-slider/README.md -- diff --git a/packages/weex-vue-plugins/weex-vue-slider/README.md b/packages/weex-vue-plugins/weex-vue-slider/README.md index fd9cd50..ff1d8df 100644 --- a/packages/weex-vue-plugins/weex-vue-slider/README.md +++ b/packages/weex-vue-plugins/weex-vue-slider/README.md @@ -1,3 +1,3 @@ # weex-vue-slider -Weex built-in '' and '' component for Vue 2.x. +Weex built-in 'slider' and 'slider-neighbor' component for Vue 2.x. http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f34d5b7/packages/weex-vue-plugins/weex-vue-slider/package.json
[09/43] incubator-weex git commit: * [html5] update
* [html5] update Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d6730ef5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d6730ef5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d6730ef5 Branch: refs/heads/0.16-dev Commit: d6730ef5fb6de6d92f731aeb79c4a191d7c016f2 Parents: 69365b3 Author: MrRaindropAuthored: Mon Jul 3 17:49:27 2017 +0800 Committer: MrRaindrop Committed: Mon Jul 3 17:49:27 2017 +0800 -- packages/weex-vue-render/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d6730ef5/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index d725d71..19b31c3 100644 --- a/packages/weex-vue-render/package.json +++ b/packages/weex-vue-render/package.json @@ -6,11 +6,11 @@ "main": "dist/index.js", "repository": { "type": "git", -"url": "g...@github.com:alibaba/weex.git" +"url": "g...@github.com:apache/incubator-weex.git" }, - "homepage": "http://alibaba.github.io/weex/;, + "homepage": "http://weex.apache.org/;, "bugs": { -"url": "https://github.com/alibaba/weex/issues; +"url": "https://issues.apache.org/jira/browse/WEEX/; }, "keywords": [ "weex",
[04/43] incubator-weex git commit: * [html5] release v0.11.54 & rm click event object's tow methods.
* [html5] release v0.11.54 & rm click event object's tow methods. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/da1ca840 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/da1ca840 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/da1ca840 Branch: refs/heads/0.16-dev Commit: da1ca840417be5c85300bb099c7e19a21d29ec1d Parents: 85c92c9 Author: MrRaindropAuthored: Fri Jun 30 17:46:14 2017 +0800 Committer: MrRaindrop Committed: Fri Jun 30 17:46:14 2017 +0800 -- html5/render/vue/core/node.js | 11 --- package.json | 2 +- packages/weex-vue-render/package.json | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/da1ca840/html5/render/vue/core/node.js -- diff --git a/html5/render/vue/core/node.js b/html5/render/vue/core/node.js index 196d061..8edc608 100644 --- a/html5/render/vue/core/node.js +++ b/html5/render/vue/core/node.js @@ -114,9 +114,14 @@ export function createEventMap (context, extras = []) { if (on && on.fn) { on = on.fn } -on && on.call(vm, - originalType === listenTo ? e : extend({}, e, { type: listenTo }) -) +let evt = e +if (originalType === listenTo) { + evt = extend({}, { type: listenTo }) + // weex didn't provide these two methods for event object. + delete event.preventDefault + delete event.stopPropagation +} +on && on.call(vm, evt) idx++ } // once a parent node (or self node) has triggered the handler, then http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/da1ca840/package.json -- diff --git a/package.json b/package.json index 3a8febe..794b972 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.20.6", -"vue-render": "0.11.53", +"vue-render": "0.11.54", "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/da1ca840/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index 585da06..a431e54 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.53", + "version": "0.11.54", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js",
[39/43] incubator-weex git commit: * [html5] fix release.
* [html5] fix release. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/38c789e5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/38c789e5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/38c789e5 Branch: refs/heads/0.16-dev Commit: 38c789e5313040acb41b82834e2d00e71c0ad8b7 Parents: 8b66fb8 Author: MrRaindropAuthored: Thu Jul 27 11:22:49 2017 +0800 Committer: MrRaindrop Committed: Thu Jul 27 11:22:49 2017 +0800 -- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/38c789e5/package.json -- diff --git a/package.json b/package.json index b2316c2..e76c35b 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "postinstall": "bash ./scripts/install-hooks.sh", "build:native": "node build/build.js native", "build:runtime": "node build/build.js runtime", -"install:buildtools": "npm i webpack@^1.0 rollup rollup-watch rollup-plugin-buble rollup-plugin-json rollup-plugin-eslint rollup-plugin-commonjs rollup-plugin-flow rollup-plugin-flow-no-whitespace rollup-plugin-postcss rollup-plugin-replace rollup-plugin-uglify rollup-plugin-node-resolve wwp flow-bin babel-core babel-eslint babel-istanbul babel-loader babel-plugin-coverage babel-preset-es2015 babel-runtime eslint-plugin-flowtype", +"install:buildtools": "npm i webpack@^1.0 weex-vue-bundle-util rollup rollup-watch rollup-plugin-buble rollup-plugin-json rollup-plugin-eslint rollup-plugin-commonjs rollup-plugin-flow rollup-plugin-flow-no-whitespace rollup-plugin-postcss rollup-plugin-replace rollup-plugin-uglify rollup-plugin-node-resolve wwp flow-bin babel-core babel-eslint babel-istanbul babel-loader babel-plugin-coverage babel-preset-es2015 babel-runtime eslint-plugin-flowtype", "build:source": "npm run build:native && npm run build:browser && node build/build.js vue", "build:browser": "wwp && node build/build.js browser", "build:browser:common": "rollup -c build/rollup.browser.common.config.js",
[03/43] incubator-weex git commit: * [html5] release vue-render 0.11.53
* [html5] release vue-render 0.11.53 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/85c92c95 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/85c92c95 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/85c92c95 Branch: refs/heads/0.16-dev Commit: 85c92c95d2c87de6f0273c25b35e196f1068cd05 Parents: f8da7d9 Author: MrRaindropAuthored: Fri Jun 30 11:04:19 2017 +0800 Committer: MrRaindrop Committed: Fri Jun 30 11:04:19 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/85c92c95/package.json -- diff --git a/package.json b/package.json index 2888260..3a8febe 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.20.6", -"vue-render": "0.11.52", +"vue-render": "0.11.53", "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/85c92c95/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index 485a099..585da06 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.52", + "version": "0.11.53", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js",
[02/43] incubator-weex git commit: * [html5] osName on android should be in lowercase
* [html5] osName on android should be in lowercase Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f8da7d99 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f8da7d99 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f8da7d99 Branch: refs/heads/0.16-dev Commit: f8da7d99ddef22bccd0a17a208afe27b2b8a1dc1 Parents: a35c690 Author: MrRaindropAuthored: Fri Jun 30 11:03:03 2017 +0800 Committer: MrRaindrop Committed: Fri Jun 30 11:03:03 2017 +0800 -- html5/render/vue/env/wx-env.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f8da7d99/html5/render/vue/env/wx-env.js -- diff --git a/html5/render/vue/env/wx-env.js b/html5/render/vue/env/wx-env.js index 4da3174..ecdf2ec 100644 --- a/html5/render/vue/env/wx-env.js +++ b/html5/render/vue/env/wx-env.js @@ -34,7 +34,7 @@ export function initEnv (viewportInfo, envInfo) { osName = 'iOS' } else if (osName.match(/Android/i)) { -osName = 'Android' +osName = 'android' } const osVersion = envInfo.os.version.val const env = {
[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: MrRaindropAuthored: 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: MrRaindropAuthored: 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",
[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: MrRaindropAuthored: 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 <ron...@gmail.com> Authored: Fri Jun 30 11:24:50 2017 +0800 Committer: tancy <ron...@gmail.com> 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 --
[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 <ron...@gmail.com> Authored: Fri Jun 30 11:08:30 2017 +0800 Committer: tancy <ron...@gmail.com> 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 <ron...@gmail.com> Authored: Fri Jun 30 11:09:09 2017 +0800 Committer: tancy <ron...@gmail.com> 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(-) --