[39/47] incubator-weex git commit: * [html5] release v0.12.16.
* [html5] release v0.12.16. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/524fbd13 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/524fbd13 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/524fbd13 Branch: refs/heads/master Commit: 524fbd131ad557d797274dfd0cb5aea2e78c20ce Parents: b7fa6b0 Author: MrRaindrop Authored: Sun Sep 24 12:01:19 2017 +0800 Committer: MrRaindrop Committed: Sun Sep 24 12:01:19 2017 +0800 -- html5/render/vue/README.md| 2 +- html5/render/vue/env/event-manager.js | 5 ++--- package.json | 2 +- packages/weex-vue-render/README.md| 2 +- packages/weex-vue-render/package.json | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/524fbd13/html5/render/vue/README.md -- diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md index 31646a2..d2b8c89 100644 --- a/html5/render/vue/README.md +++ b/html5/render/vue/README.md @@ -172,7 +172,7 @@ vue: { * fix loading & refresh: pulling down wrongly triggered. - 0.12.15 + 0.12.16 * not to prevent default behaviour of click events unless the click-binding element is inside a `` link, or it is a `` link and has a `prevent` attribute on it. http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/524fbd13/html5/render/vue/env/event-manager.js -- diff --git a/html5/render/vue/env/event-manager.js b/html5/render/vue/env/event-manager.js index e637b7d..4c777d0 100644 --- a/html5/render/vue/env/event-manager.js +++ b/html5/render/vue/env/event-manager.js @@ -131,13 +131,12 @@ function _init (doc) { if (window._should_intercept_a_jump && window._should_intercept_a_jump(elm)) { // e._triggered should not be true since we left the intercepter to handle the event. e._triggered = false -e.preventDefault() disposed = true } else if (href.match(voidHrefReg) || prevent === '' || prevent === 'true') { - e._triggered = false - e.preventDefault() +e._triggered = false +e.preventDefault() } else { e._triggered = { target: elm } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/524fbd13/package.json -- diff --git a/package.json b/package.json index cd90c76..49a5d76 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.21.11", -"vue-render": "0.12.15", +"vue-render": "0.12.16", "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/524fbd13/packages/weex-vue-render/README.md -- diff --git a/packages/weex-vue-render/README.md b/packages/weex-vue-render/README.md index 31646a2..d2b8c89 100644 --- a/packages/weex-vue-render/README.md +++ b/packages/weex-vue-render/README.md @@ -172,7 +172,7 @@ vue: { * fix loading & refresh: pulling down wrongly triggered. - 0.12.15 + 0.12.16 * not to prevent default behaviour of click events unless the click-binding element is inside a `` link, or it is a `` link and has a `prevent` attribute on it. http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/524fbd13/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index a08b4ce..57fed3f 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.12.15", + "version": "0.12.16", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.common.js",
[39/47] incubator-weex git commit: * [html5] release v0.12.16.
* [html5] release v0.12.16. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/524fbd13 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/524fbd13 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/524fbd13 Branch: refs/heads/dev Commit: 524fbd131ad557d797274dfd0cb5aea2e78c20ce Parents: b7fa6b0 Author: MrRaindrop Authored: Sun Sep 24 12:01:19 2017 +0800 Committer: MrRaindrop Committed: Sun Sep 24 12:01:19 2017 +0800 -- html5/render/vue/README.md| 2 +- html5/render/vue/env/event-manager.js | 5 ++--- package.json | 2 +- packages/weex-vue-render/README.md| 2 +- packages/weex-vue-render/package.json | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/524fbd13/html5/render/vue/README.md -- diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md index 31646a2..d2b8c89 100644 --- a/html5/render/vue/README.md +++ b/html5/render/vue/README.md @@ -172,7 +172,7 @@ vue: { * fix loading & refresh: pulling down wrongly triggered. - 0.12.15 + 0.12.16 * not to prevent default behaviour of click events unless the click-binding element is inside a `` link, or it is a `` link and has a `prevent` attribute on it. http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/524fbd13/html5/render/vue/env/event-manager.js -- diff --git a/html5/render/vue/env/event-manager.js b/html5/render/vue/env/event-manager.js index e637b7d..4c777d0 100644 --- a/html5/render/vue/env/event-manager.js +++ b/html5/render/vue/env/event-manager.js @@ -131,13 +131,12 @@ function _init (doc) { if (window._should_intercept_a_jump && window._should_intercept_a_jump(elm)) { // e._triggered should not be true since we left the intercepter to handle the event. e._triggered = false -e.preventDefault() disposed = true } else if (href.match(voidHrefReg) || prevent === '' || prevent === 'true') { - e._triggered = false - e.preventDefault() +e._triggered = false +e.preventDefault() } else { e._triggered = { target: elm } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/524fbd13/package.json -- diff --git a/package.json b/package.json index cd90c76..49a5d76 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.21.11", -"vue-render": "0.12.15", +"vue-render": "0.12.16", "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/524fbd13/packages/weex-vue-render/README.md -- diff --git a/packages/weex-vue-render/README.md b/packages/weex-vue-render/README.md index 31646a2..d2b8c89 100644 --- a/packages/weex-vue-render/README.md +++ b/packages/weex-vue-render/README.md @@ -172,7 +172,7 @@ vue: { * fix loading & refresh: pulling down wrongly triggered. - 0.12.15 + 0.12.16 * not to prevent default behaviour of click events unless the click-binding element is inside a `` link, or it is a `` link and has a `prevent` attribute on it. http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/524fbd13/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index a08b4ce..57fed3f 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.12.15", + "version": "0.12.16", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.common.js",