[11/47] incubator-weex git commit: * [html5] update slider version.
* [html5] update slider 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/3153784a Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3153784a Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3153784a Branch: refs/heads/dev Commit: 3153784a73c12abd7dc8880d83ebd9de61c90366 Parents: 2504db5 Author: MrRaindropAuthored: Thu Aug 24 14:52:56 2017 +0800 Committer: MrRaindrop Committed: Thu Aug 24 14:52:56 2017 +0800 -- packages/weex-vue-plugins/weex-vue-slider/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3153784a/packages/weex-vue-plugins/weex-vue-slider/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-slider/package.json b/packages/weex-vue-plugins/weex-vue-slider/package.json index 427fdc2..1b0d8a5 100644 --- a/packages/weex-vue-plugins/weex-vue-slider/package.json +++ b/packages/weex-vue-plugins/weex-vue-slider/package.json @@ -1,6 +1,6 @@ { "name": "weex-vue-slider", - "version": "0.1.2", + "version": "0.1.3", "description": "Weex built-in 'slider' and 'slider-neighbor' component for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js",
[19/47] incubator-weex git commit: * [html5] fix error under firefox ios.
* [html5] fix error under firefox ios. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1ceb3749 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1ceb3749 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1ceb3749 Branch: refs/heads/dev Commit: 1ceb3749b1862ebf6e3eee5a0a1ddb3fe0d0d603 Parents: 31411dd Author: MrRaindropAuthored: Mon Sep 4 17:26:03 2017 +0800 Committer: MrRaindrop Committed: Mon Sep 4 17:26:03 2017 +0800 -- html5/render/vue/lib/envd/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1ceb3749/html5/render/vue/lib/envd/index.js -- diff --git a/html5/render/vue/lib/envd/index.js b/html5/render/vue/lib/envd/index.js index 99b6fd6..df9fdf3 100644 --- a/html5/render/vue/lib/envd/index.js +++ b/html5/render/vue/lib/envd/index.js @@ -55,7 +55,7 @@ else if ((match = ua.match(/(iPhone|iPad|iPod)/))) { isIPhone: (name === 'iPhone' || name === 'iPod'), isIPad: name === 'iPad', isIOS: true, -version: match[1].split('_').join('.') +version: match && match[1].split('_').join('.') || '' } } else { @@ -155,7 +155,7 @@ else if (ua.match(/iPhone|iPad|iPod/)) { env.browser = { name: 'Safari', isSafari: true, - version: match[1] + version: match && match[1] || '' } } else { @@ -163,7 +163,7 @@ else if (ua.match(/iPhone|iPad|iPod/)) { env.browser = { name: 'iOS Webview', isWebview: true, - version: match[1].replace(/_/g, '.') + version: match && match[1].replace(/_/g, '.') || '' } } }
[05/47] incubator-weex git commit: Revert "* [html5] release vue-render 0.12.2"
Revert "* [html5] release vue-render 0.12.2" This reverts commit bb844b90aa013ca946c6ffdce57a1281f5340374. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/486c6f4d Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/486c6f4d Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/486c6f4d Branch: refs/heads/master Commit: 486c6f4dffcb9865739731c34fbabf276395dd16 Parents: bb844b9 Author: MrRaindropAuthored: Mon Aug 21 11:31:55 2017 +0800 Committer: MrRaindrop Committed: Mon Aug 21 11:31:55 2017 +0800 -- package.json | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/486c6f4d/package.json -- diff --git a/package.json b/package.json index 2148df1..4579a27 100644 --- a/package.json +++ b/package.json @@ -3,13 +3,8 @@ "version": "0.12.2", "subversion": { "browser": "0.5.0", -<<< HEAD "framework": "0.21.9", "vue-render": "0.12.3", -=== -"framework": "0.20.6", -"vue-render": "0.12.2", ->>> 850811c... * [html5] release vue-render 0.12.2 "transformer": ">=0.1.5 <0.5" }, "description": "A framework for building Mobile cross-platform UI",
[02/47] 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/a105b22b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a105b22b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a105b22b Branch: refs/heads/dev Commit: a105b22b15281fbf7b37ae2b326ee5a77a490da2 Parents: a672d2f 2a52a58 Author: MrRaindropAuthored: Mon Aug 21 11:04:34 2017 +0800 Committer: MrRaindrop Committed: Mon Aug 21 11:04:34 2017 +0800 -- HOW-TO-BUILD.md |17 +- SCRIPTS.md | 4 +- .../main/java/com/taobao/weex/WXSDKManager.java | 6 + .../java/com/taobao/weex/common/Constants.java | 1 + .../taobao/weex/dom/WXRecyclerDomObject.java| 9 + .../weex/dom/action/GetComponentRectAction.java |12 - .../weex/ui/component/ContentMeasurable.java|29 - .../taobao/weex/ui/component/WXComponent.java |14 +- .../taobao/weex/ui/component/WXScroller.java|16 +- .../com/taobao/weex/ui/component/WXSlider.java | 8 +- .../ui/component/list/BasicListComponent.java |69 +- .../weex/ui/view/WXBaseCircleIndicator.java | 3 +- .../taobao/weex/ui/view/WXCircleViewPager.java |57 +- .../ui/view/refresh/core/WXSwipeLayout.java |17 +- .../ui/view/refresh/wrapper/BaseBounceView.java | 2 +- build/build.js | 1 + build/config.js |21 +- dangerfile.js |27 +- examples/vanilla/index.js | 4 +- examples/vue/index.vue | 2 + html5/frameworks/vanilla/index.js |32 +- html5/render/browser/extend/api/storage.js | 4 +- html5/render/native/setup.js| 2 +- html5/runtime/api/config.js |37 + html5/runtime/api/init.js | 227 + html5/runtime/api/service.js|77 + html5/runtime/bridge/CallbackManager.js |58 + html5/runtime/bridge/Handler.js |91 + html5/runtime/bridge/Listener.js| 220 + html5/runtime/bridge/TaskCenter.js | 130 + html5/runtime/bridge/normalize.js |91 + html5/runtime/callback-manager.js |58 - html5/runtime/config.js |36 - html5/runtime/handler.js|91 - html5/runtime/index.js |11 +- html5/runtime/init.js | 215 - html5/runtime/listener.js | 227 - html5/runtime/normalize.js |98 - html5/runtime/service.js|77 - html5/runtime/task-center.js| 130 - html5/runtime/utils.js |54 + html5/runtime/vdom/Comment.js |43 + html5/runtime/vdom/Document.js | 188 + html5/runtime/vdom/Element.js | 454 + html5/runtime/vdom/Node.js |47 + html5/runtime/vdom/WeexElement.js |84 + html5/runtime/vdom/comment.js |47 - html5/runtime/vdom/directive.js |69 + html5/runtime/vdom/document.js | 194 - html5/runtime/vdom/element-types.js |83 - html5/runtime/vdom/element.js | 459 - html5/runtime/vdom/index.js |16 +- html5/runtime/vdom/node.js |49 - html5/runtime/vdom/operation.js | 8 - html5/test/case/prepare.js | 4 +- html5/test/unit/default/app/bundle.js |98 +- html5/test/unit/default/helper/document.js | 145 - html5/test/unit/default/runtime.js | 485 - html5/test/unit/default/vm/compiler.js | 614 - html5/test/unit/default/vm/directive.js | 279 - html5/test/unit/default/vm/dom-helper.js| 2 +- html5/test/unit/default/vm/vm.js| 2 +- html5/test/unit/runtime/legacy-framework.js | 353 + html5/test/unit/runtime/runner/helper.js|73 + html5/test/unit/runtime/runner/vanilla.js |59 + html5/test/unit/runtime/runner/vue.js |67 + html5/test/unit/runtime/vdom/directive.js | 101 + html5/test/unit/runtime/vdom/index.js | 639 + html5/test/unit/runtime/vdom/listener.js| 381 + html5/test/unit/runtime/vdom/node.js|39 + html5/test/unit/shared/BroadcastChannel.js | 7 - html5/test/unit/shared/arrayFrom.js | 5 - html5/test/unit/shared/index.js |20
[31/47] incubator-weex git commit: * [html5] fix styles in firefox & impl get/set selection range methods.
* [html5] fix styles in firefox & impl get/set selection range 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/2f3af6f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2f3af6f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2f3af6f6 Branch: refs/heads/master Commit: 2f3af6f6fc97fdc32cfa15c06b8da6d098753553 Parents: 86cd036 Author: MrRaindropAuthored: Tue Sep 12 15:20:17 2017 +0800 Committer: MrRaindrop Committed: Tue Sep 12 15:20:17 2017 +0800 -- .../components/scrollable/loading-indicator.js | 13 +++--- .../render/vue/components/scrollable/style.css | 22 ++ html5/render/vue/components/slider/indicator.js | 2 + .../render/vue/components/slider/slideMixin.js | 13 +- html5/render/vue/components/slider/slider.css | 6 +++ html5/render/vue/components/switch.js | 12 +++--- html5/render/vue/components/text.js | 3 ++ html5/render/vue/env/event-manager.js | 4 +- html5/render/vue/mixins/input-common.js | 32 ++ html5/render/vue/modules/animation.js | 44 +++- html5/render/vue/modules/modal/style.js | 20 ++--- html5/render/vue/styles/base.css| 15 +++ html5/render/vue/styles/reset.css | 5 ++- html5/render/vue/utils/func.js | 5 ++- html5/render/vue/utils/style.js | 13 +- 15 files changed, 166 insertions(+), 43 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2f3af6f6/html5/render/vue/components/scrollable/loading-indicator.js -- diff --git a/html5/render/vue/components/scrollable/loading-indicator.js b/html5/render/vue/components/scrollable/loading-indicator.js index aa289bd..4fa2c7b 100644 --- a/html5/render/vue/components/scrollable/loading-indicator.js +++ b/html5/render/vue/components/scrollable/loading-indicator.js @@ -24,13 +24,15 @@ const _css = ` width: 1rem !important; height: 1rem !important; -webkit-box-align: center; + -moz-box-align: center; -webkit-align-items: center; - -ms-flex-align: center; - align-items: center; + -ms-flex-align: center; + align-items: center; -webkit-box-pack: center; + -moz-box-pack: center; -webkit-justify-content: center; - -ms-flex-pack: center; - justify-content: center; + -ms-flex-pack: center; + justify-content: center; overflow: visible; background: none; } @@ -47,7 +49,8 @@ const _css = ` position: relative; text-indent: -em; -webkit-animation: weex-spinner 1.1s infinite ease; - animation: weex-spinner 1.1s infinite ease; + -moz-animation: weex-spinner 1.1s infinite ease; + animation: weex-spinner 1.1s infinite ease; } @-webkit-keyframes weex-spinner { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2f3af6f6/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 c90d2ea..f79ff7d 100644 --- a/html5/render/vue/components/scrollable/style.css +++ b/html5/render/vue/components/scrollable/style.css @@ -43,8 +43,10 @@ body > .weex-waterfall { .weex-waterfall-inner-columns { -webkit-flex-direction: row; - -ms-flex-direction: row; - flex-direction: row; + -moz-box-orient: horizontal; + -moz-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; -webkit-box-orient: horizontal; } @@ -65,8 +67,10 @@ body > .weex-waterfall { .weex-scroller-horizontal .weex-scroller-inner { -webkit-flex-direction: row; - -ms-flex-direction: row; - flex-direction: row; + -ms-flex-direction: row; + -moz-box-orient: horizontal; + -moz-box-direction: normal; + flex-direction: row; -webkit-box-orient: horizontal; height: 100%; } @@ -79,12 +83,14 @@ body > .weex-waterfall { .weex-loading { -webkit-box-align: center; -webkit-align-items: center; - -ms-flex-align: center; - align-items: center; + -moz-box-align: center; + -ms-flex-align: center; + align-items: center; -webkit-box-pack: center; -webkit-justify-content: center; - -ms-flex-pack: center; - justify-content: center; + -moz-box-pack: center; + -ms-flex-pack: center; + justify-content: center; width: 100%; overflow: hidden; } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2f3af6f6/html5/render/vue/components/slider/indicator.js -- diff --git
[42/47] incubator-weex git commit: Merge branch 'html5-feature-offset-appear' into 0.16-dev-web
Merge branch 'html5-feature-offset-appear' 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/51ceff10 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/51ceff10 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/51ceff10 Branch: refs/heads/dev Commit: 51ceff10aec22a99fbd2b006ec4cd34c555653bc Parents: 3c2ad1c 5554d51 Author: MrRaindropAuthored: Mon Sep 25 16:12:23 2017 +0800 Committer: MrRaindrop Committed: Mon Sep 25 16:12:23 2017 +0800 -- html5/render/vue/README.md| 4 + html5/render/vue/mixins/base.js | 4 +- html5/render/vue/utils/component.js | 160 ++--- package.json | 2 +- packages/weex-vue-render/README.md| 4 + packages/weex-vue-render/package.json | 2 +- 6 files changed, 112 insertions(+), 64 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/51ceff10/package.json --
[40/47] incubator-weex git commit: * [html5] fix ci.
* [html5] fix ci. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3c2ad1c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3c2ad1c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3c2ad1c3 Branch: refs/heads/master Commit: 3c2ad1c39b8f328fd49f2314c99fcc48774ee51f Parents: 524fbd1 Author: MrRaindropAuthored: Mon Sep 25 11:18:10 2017 +0800 Committer: MrRaindrop Committed: Mon Sep 25 11:18:10 2017 +0800 -- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3c2ad1c3/package.json -- diff --git a/package.json b/package.json index 49a5d76..e3f224a 100644 --- a/package.json +++ b/package.json @@ -166,7 +166,7 @@ "uglify-js": "^2.8.29", "vue": "^2.4.3", "vue-loader": "^12.2.1", -"vue-template-compiler": "^2.2.6", +"vue-template-compiler": "^2.4.3", "webpack": "^1.13.1", "weex-components": "^0.2.0", "weex-gcanvas": "^0.4.2",
[38/47] incubator-weex git commit: * [html5] fix trigger click problem.
* [html5] fix trigger click problem. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b7fa6b0f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b7fa6b0f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b7fa6b0f Branch: refs/heads/master Commit: b7fa6b0ff7af1b4d18823709fe43569cc5b69b9a Parents: 6ec5a50 Author: MrRaindropAuthored: Sat Sep 23 18:51:20 2017 +0800 Committer: MrRaindrop Committed: Sat Sep 23 18:51:20 2017 +0800 -- html5/render/vue/README.md| 4 ++ html5/render/vue/env/event-manager.js | 88 +++--- package.json | 2 +- packages/weex-vue-render/README.md| 4 ++ packages/weex-vue-render/package.json | 2 +- 5 files changed, 55 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b7fa6b0f/html5/render/vue/README.md -- diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md index 0554334..31646a2 100644 --- a/html5/render/vue/README.md +++ b/html5/render/vue/README.md @@ -172,6 +172,10 @@ vue: { * fix loading & refresh: pulling down wrongly triggered. + 0.12.15 + +* 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. + ## component -> dom map | component | dom element | children | note | http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b7fa6b0f/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 16057ca..e637b7d 100644 --- a/html5/render/vue/env/event-manager.js +++ b/html5/render/vue/env/event-manager.js @@ -35,6 +35,15 @@ function isANode (el) { return el.tagName.toLowerCase() === 'a' } +function isInANode (el) { + let parent = el.parentElement + while (parent && parent !== document.body) { +if (parent.tagName === 'A') { return true } +parent = parent.parentElement + } + return false +} + /** * get listeners from on config and v-on binding. * v-on binding has a priority over on config. @@ -87,72 +96,65 @@ function _init (doc) { return } let disposed = false - let evtName = e.type - /** - * take full control of redirection of element. - */ - if (evtName === 'click') { -// use '_triggered' to control bubbles event. -e._triggered = { target: vm.$el } -e.preventDefault() -return - } + const evtName = e.type if (evtName === 'tap' && e._for !== 'weex') { return } - else if (evtName === 'tap') { -evtName = 'click' - } while (vm) { const vnode = vm._vnode || vm.$vnode const elm = vm.$el -const ons = getListeners(vnode, evtName) +const ons = getListeners(vnode, evtName === 'tap' ? 'click' : evtName) const len = ons && ons.length if (len > 0) { - for (let i = 0; i < len; i++) { -const handler = ons[i] -const newEvt = evtName === 'click' - ? createEvent(el, evtName) - : e -applyFns(handler.fns, newEvt) + if (evtName !== 'click') { +for (let i = 0; i < len; i++) { + const handler = ons[i] + const newEvt = evtName === 'tap' +? createEvent(el, 'click') +: e + newEvt._triggered = { target: elm } + applyFns(handler.fns, newEvt) +} } - e._triggered = { target: vm.$el } + e._triggered = { target: elm } disposed = true } -/** - * if the handler is binding on a element, should trigger - * the handler first and then jump to href. - * NOTE: if target==='_blank' then do no jumping and leave it - * to users binding handlers for further disposing. - */ -if (evtName === 'click' && isANode(elm)) { +if (isANode(elm) + && (evtName === 'click' || evtName === 'tap')) { const href = elm.getAttribute('href') const voidHrefReg = /^\s*javascript\s*:\s*void\s*(?:\(\s*0\s*\)|0)\s*;?\s*$/ const prevent = elm.getAttribute('prevent') - disposed = true - /** - * Give the chance to the listeners binding on doc or doc.body for - * handling the a-jump. - * Should set a _should_intercept_a_jump function on window to test - * whether we should intercept the
[33/47] incubator-weex git commit: * [html5] fix vue2.4.3
* [html5] fix vue2.4.3 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2cf16754 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2cf16754 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2cf16754 Branch: refs/heads/master Commit: 2cf16754205ec74fd4e646fecf36db84ced5b588 Parents: f58c820 Author: MrRaindropAuthored: Thu Sep 14 13:53:26 2017 +0800 Committer: MrRaindrop Committed: Thu Sep 14 13:53:26 2017 +0800 -- html5/render/vue/index.js | 11 +++ package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2cf16754/html5/render/vue/index.js -- diff --git a/html5/render/vue/index.js b/html5/render/vue/index.js index 038f67a..bd0016d 100644 --- a/html5/render/vue/index.js +++ b/html5/render/vue/index.js @@ -45,6 +45,17 @@ function init (Vue/*, options = {}*/) { Vue.config.isReservedTag = tag => htmlRegex.test(tag) Vue.config.parsePlatformTagName = tag => tag.replace(htmlRegex, '') + function isWeexTag (tag) { +return !!weex._components[tag] + } + const oldGetTagNamespace = Vue.config.getTagNamespace + Vue.config.getTagNamespace = function (tag) { +if (isWeexTag(tag)) { + return +} +return oldGetTagNamespace(tag) + } + Vue.mixin(base) Vue.mixin(style) Vue.mixin(sticky) http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2cf16754/package.json -- diff --git a/package.json b/package.json index c98bc37..fa2a332 100644 --- a/package.json +++ b/package.json @@ -164,7 +164,7 @@ "sinon": "^2.1.0", "sinon-chai": "^2.8.0", "uglify-js": "^2.8.29", -"vue": "^2.2.6", +"vue": "^2.4.3", "vue-loader": "^12.2.1", "vue-template-compiler": "^2.2.6", "webpack": "^1.13.1",
[17/47] incubator-weex git commit: * [html5] fix call loop.
* [html5] fix call loop. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/31411dd4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/31411dd4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/31411dd4 Branch: refs/heads/dev Commit: 31411dd4afd383cb4a25bd666830615c9c14e6d5 Parents: 902a1f7 Author: MrRaindropAuthored: Fri Aug 25 15:19:01 2017 +0800 Committer: MrRaindrop Committed: Fri Aug 25 15:19:01 2017 +0800 -- html5/render/vue/README.md| 2 +- html5/render/vue/core/node.js | 33 +- html5/render/vue/env/event-manager.js | 19 - package.json | 2 +- packages/weex-vue-render/README.md| 2 +- packages/weex-vue-render/package.json | 2 +- 6 files changed, 41 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/31411dd4/html5/render/vue/README.md -- diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md index 41df16b..bcdd2de 100644 --- a/html5/render/vue/README.md +++ b/html5/render/vue/README.md @@ -142,7 +142,7 @@ vue: { * fix scanning style in production with uglified code. - 0.12.6 + 0.12.8 * optimize event binding. http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/31411dd4/html5/render/vue/core/node.js -- diff --git a/html5/render/vue/core/node.js b/html5/render/vue/core/node.js index d38cafd..4cef067 100644 --- a/html5/render/vue/core/node.js +++ b/html5/render/vue/core/node.js @@ -54,6 +54,30 @@ function getListeners (vnode, evt) { } /** + * Instead of vue's invoker, this function should check if the binding function + * has a _weex_hook flag. If there is one, the handler should not be triggered. + * @param {Array | Function} fns + */ +export function applyFns (fns, ...args) { + if (Array.isArray(fns)) { +const cloned = fns.slice() +const len = cloned.length +for (let i = 0; i < len; i++) { + const fn = cloned[i] + if (fn._weex_hook) { +continue + } + fn.apply(null, args) +} + } + else { +if (!fns._weex_hook) { + fns.apply(null, args) +} + } +} + +/** * emit native events to enable v-on. * @param {VComponent} context: which one to emit a event on. * @param {array | object} events: extra events. You can pass in multiple arguments here. @@ -90,11 +114,8 @@ export function createEventMap (context, ...events) { if (len > 0) { let idx = 0 while (idx < len) { -let on = ons[idx] -if (on && on.fn) { - on = on.fn -} -on && on.call(vm, e) +const on = ons[idx] +applyFns(on.fns, e) idx++ } // once a parent node (or self node) has triggered the handler, then @@ -107,6 +128,8 @@ export function createEventMap (context, ...events) { vm = vm.$parent } } +// flag to distinguish from user-binding listeners. +handler._weex_hook = true } if (!eventMap[evtName]) { eventMap[evtName] = [] http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/31411dd4/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 3ecf618..c19a649 100644 --- a/html5/render/vue/env/event-manager.js +++ b/html5/render/vue/env/event-manager.js @@ -19,6 +19,7 @@ import config from '../config' import { createEvent, supportsPassive } from '../utils' +import { applyFns } from '../core' const gestureEvents = config.gestureEvents const nativeEvents = ['click', 'touchstart', 'touchmove', 'touchend'] @@ -112,13 +113,11 @@ function _init (doc) { if (len > 0) { for (let i = 0; i < len; i++) { -let handler = ons[i] -if (handler && handler.fn) { - handler = handler.fn -} -// create a no bubble event. -const newEvt = createEvent(el, evt) -handler && handler.call(vm, newEvt) +const handler = ons[i] +const newEvt = evtName === 'click' + ? createEvent(el, evtName) + : e +applyFns(handler.fns, newEvt) } e._triggered = { target: vm.$el } disposed = true @@ -127,8 +126,8 @@ function _init (doc) { /** * if the handler is binding on a element,
[40/47] incubator-weex git commit: * [html5] fix ci.
* [html5] fix ci. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3c2ad1c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3c2ad1c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3c2ad1c3 Branch: refs/heads/dev Commit: 3c2ad1c39b8f328fd49f2314c99fcc48774ee51f Parents: 524fbd1 Author: MrRaindropAuthored: Mon Sep 25 11:18:10 2017 +0800 Committer: MrRaindrop Committed: Mon Sep 25 11:18:10 2017 +0800 -- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3c2ad1c3/package.json -- diff --git a/package.json b/package.json index 49a5d76..e3f224a 100644 --- a/package.json +++ b/package.json @@ -166,7 +166,7 @@ "uglify-js": "^2.8.29", "vue": "^2.4.3", "vue-loader": "^12.2.1", -"vue-template-compiler": "^2.2.6", +"vue-template-compiler": "^2.4.3", "webpack": "^1.13.1", "weex-components": "^0.2.0", "weex-gcanvas": "^0.4.2",
[23/47] incubator-weex git commit: * [html5] update README
* [html5] update README Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/60ce6306 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/60ce6306 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/60ce6306 Branch: refs/heads/dev Commit: 60ce6306fca87be38b10da56724149bbd7c592cf Parents: b8aae6f Author: MrRaindropAuthored: Tue Sep 5 10:56:21 2017 +0800 Committer: MrRaindrop Committed: Tue Sep 5 10:56:21 2017 +0800 -- html5/render/vue/README.md | 1 + packages/weex-vue-render/README.md | 1 + 2 files changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/60ce6306/html5/render/vue/README.md -- diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md index bcdd2de..2c915a6 100644 --- a/html5/render/vue/README.md +++ b/html5/render/vue/README.md @@ -145,6 +145,7 @@ vue: { 0.12.8 * optimize event binding. +* fix a-jump interception condition. ## component -> dom map http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/60ce6306/packages/weex-vue-render/README.md -- diff --git a/packages/weex-vue-render/README.md b/packages/weex-vue-render/README.md index bcdd2de..2c915a6 100644 --- a/packages/weex-vue-render/README.md +++ b/packages/weex-vue-render/README.md @@ -145,6 +145,7 @@ vue: { 0.12.8 * optimize event binding. +* fix a-jump interception condition. ## component -> dom map
[35/47] incubator-weex git commit: * [html5] reset env.deviceHeight after window's resizing.
* [html5] reset env.deviceHeight after window's resizing. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/babd33bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/babd33bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/babd33bf Branch: refs/heads/master Commit: babd33bf5257cce55fe429b0137b2ce218281cc4 Parents: 89b131f Author: MrRaindropAuthored: Thu Sep 14 20:55:09 2017 +0800 Committer: MrRaindrop Committed: Thu Sep 14 20:55:09 2017 +0800 -- html5/render/vue/README.md| 4 html5/render/vue/env/viewport.js | 8 package.json | 2 +- packages/weex-vue-render/README.md| 4 packages/weex-vue-render/package.json | 2 +- 5 files changed, 18 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/babd33bf/html5/render/vue/README.md -- diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md index 31b6226..4433261 100644 --- a/html5/render/vue/README.md +++ b/html5/render/vue/README.md @@ -164,6 +164,10 @@ vue: { * fix NS (svg) bug in vue.js@v2.4.3 + 0.12.13 + +* reset `env.deviceHeight` after window's resizing. + ## component -> dom map | component | dom element | children | note | http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/babd33bf/html5/render/vue/env/viewport.js -- diff --git a/html5/render/vue/env/viewport.js b/html5/render/vue/env/viewport.js index 33efd6a..bec967f 100644 --- a/html5/render/vue/env/viewport.js +++ b/html5/render/vue/env/viewport.js @@ -118,10 +118,18 @@ export function init (viewportWidth: number = width): ?{ screenWidth = doc.documentElement.clientWidth screenHeight = doc.documentElement.clientHeight +const resetDeviceHeight = function () { + screenHeight = doc.documentElement.clientHeight + const env = window.weex && window.weex.config.env + info.deviceHeight = env.deviceHeight = screenHeight * dpr +} + // set root font for rem. setRootFont(screenWidth) setMetaViewport(viewportWidth) +window.addEventListener('resize', resetDeviceHeight) + /** * why not to use window.screen.width to get screenWidth ? Because in some * old webkit browser on android system it get the device pixel width, which http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/babd33bf/package.json -- diff --git a/package.json b/package.json index 534cc67..57cde71 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.21.11", -"vue-render": "0.12.12", +"vue-render": "0.12.13", "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/babd33bf/packages/weex-vue-render/README.md -- diff --git a/packages/weex-vue-render/README.md b/packages/weex-vue-render/README.md index 31b6226..4433261 100644 --- a/packages/weex-vue-render/README.md +++ b/packages/weex-vue-render/README.md @@ -164,6 +164,10 @@ vue: { * fix NS (svg) bug in vue.js@v2.4.3 + 0.12.13 + +* reset `env.deviceHeight` after window's resizing. + ## component -> dom map | component | dom element | children | note | http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/babd33bf/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index 8ff879e..c86c16b 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.12", + "version": "0.12.13", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.common.js",
[45/47] incubator-weex git commit: * [html5] pair versions for vue & vue-template-compiler.
* [html5] pair versions for vue & vue-template-compiler. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/aab1d745 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/aab1d745 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/aab1d745 Branch: refs/heads/master Commit: aab1d7455b474e949630b44f7e695a5d20225c65 Parents: cda836a Author: MrRaindropAuthored: Tue Sep 26 11:23:25 2017 +0800 Committer: MrRaindrop Committed: Tue Sep 26 11:23:25 2017 +0800 -- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aab1d745/package.json -- diff --git a/package.json b/package.json index d52a121..1c7024d 100644 --- a/package.json +++ b/package.json @@ -164,9 +164,9 @@ "sinon": "^2.1.0", "sinon-chai": "^2.8.0", "uglify-js": "^2.8.29", -"vue": "^2.4.3", +"vue": "2.4.3", "vue-loader": "^12.2.1", -"vue-template-compiler": "^2.4.3", +"vue-template-compiler": "2.4.3", "webpack": "^1.13.1", "weex-components": "^0.2.0", "weex-gcanvas": "^0.4.2",
[08/47] incubator-weex git commit: * [html5] fix style scanning in uglified code bundle.
* [html5] fix style scanning in uglified code bundle. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/26646cf3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/26646cf3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/26646cf3 Branch: refs/heads/master Commit: 26646cf383399a3b035786636087d079bdd3ef4b Parents: 214c6e3 Author: MrRaindropAuthored: Tue Aug 22 14:17:52 2017 +0800 Committer: MrRaindrop Committed: Tue Aug 22 14:17:52 2017 +0800 -- html5/render/vue/mixins/style.js | 18 -- 1 file changed, 8 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/26646cf3/html5/render/vue/mixins/style.js -- diff --git a/html5/render/vue/mixins/style.js b/html5/render/vue/mixins/style.js index 647119d..ba11ed5 100644 --- a/html5/render/vue/mixins/style.js +++ b/html5/render/vue/mixins/style.js @@ -67,16 +67,14 @@ function getIdentifiedBeforeCreate () { for (; thisHookIdx < len; thisHookIdx++) { if (hooks[thisHookIdx]._styleMixin) { break } } - for (let i = thisHookIdx + 1; i < len; i++) { -const func = hooks[i] -if (func.name === 'injectStyle') { - hooks[i] = function () { -// call the original injectStyle hook. -func.call(this) -// scan the new appended styleSheet. -extend(weex._styleMap, getHeadStyleMap()) -hooks[i] = func - } + if (thisHookIdx !== len - 1) { +const func = hooks[len - 1] +hooks[len - 1] = function () { + // call the original injectStyle hook. + func.call(this) + // scan the new appended styleSheet. + extend(weex._styleMap, getHeadStyleMap()) + hooks[len - 1] = func } } }
[12/47] incubator-weex git commit: * [html5] trigger cilck with tap.
* [html5] trigger cilck with 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/b3dd01f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b3dd01f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b3dd01f2 Branch: refs/heads/master Commit: b3dd01f20815594fe7d1bc824ef577099e731f9f Parents: 3153784 Author: MrRaindropAuthored: Thu Aug 24 16:44:51 2017 +0800 Committer: MrRaindrop Committed: Thu Aug 24 16:44:51 2017 +0800 -- html5/render/vue/config.js| 3 ++- html5/render/vue/env/event-manager.js | 11 +-- html5/render/vue/lib/gesture.js | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b3dd01f2/html5/render/vue/config.js -- diff --git a/html5/render/vue/config.js b/html5/render/vue/config.js index 0858b2f..bccf1e3 100644 --- a/html5/render/vue/config.js +++ b/html5/render/vue/config.js @@ -23,6 +23,7 @@ export default { 'panmove', 'panend', 'swipe', -'longpress' +'longpress', +'tap' ] } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b3dd01f2/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 1a57f84..7a074d5 100644 --- a/html5/render/vue/env/event-manager.js +++ b/html5/render/vue/env/event-manager.js @@ -21,10 +21,10 @@ import config from '../config' import { createEvent, supportsPassive } from '../utils' const gestureEvents = config.gestureEvents -const touchEvents = ['touchstart', 'touchmove', 'touchend'] +const nativeEvents = ['click', 'touchstart', 'touchmove', 'touchend'] const needPassive = ['touchmove'] -const events = gestureEvents.concat(touchEvents) +const events = gestureEvents.concat(nativeEvents) // /** // * is a element in a '' tag? @@ -96,6 +96,13 @@ function _init (doc) { e.preventDefault() } + if (evt === 'tap' && evt._for !== 'weex') { +return + } + else if (evt === 'tap') { +evt = 'click' + } + while (vm) { const vnode = vm.$vnode || vm._vnode const elm = vm.$el http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b3dd01f2/html5/render/vue/lib/gesture.js -- diff --git a/html5/render/vue/lib/gesture.js b/html5/render/vue/lib/gesture.js index 5f72b3c..62ad226 100644 --- a/html5/render/vue/lib/gesture.js +++ b/html5/render/vue/lib/gesture.js @@ -384,7 +384,7 @@ function touchendHandler(event) { if (gesture.status === 'tapping') { gesture.timestamp = Date.now() // fire click, not tap. - fireEvent(gesture.element, 'click', /* 'tap', */{ + fireEvent(gesture.element, 'tap', { touch: touch, touchEvent: event })
[29/47] incubator-weex git commit: * [html5] fix accessing vm in doms without __vue__.
* [html5] fix accessing vm in doms without __vue__. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/19f0c01c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/19f0c01c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/19f0c01c Branch: refs/heads/dev Commit: 19f0c01cfb3c5520a46a0b3ee77a137ded381321 Parents: 73d2f13 Author: MrRaindropAuthored: Tue Sep 12 10:38:59 2017 +0800 Committer: MrRaindrop Committed: Tue Sep 12 10:38:59 2017 +0800 -- html5/render/vue/env/event-manager.js | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/19f0c01c/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 914981d..c2d714d 100644 --- a/html5/render/vue/env/event-manager.js +++ b/html5/render/vue/env/event-manager.js @@ -77,13 +77,17 @@ function _init (doc) { ? true : needPassive.indexOf(evt) > -1 && _sp ? { passive: true } : false doc.addEventListener(evt, function (e) { - const el = e.target + let el = e.target let vm = el.__vue__ - let disposed = false - let evtName = e.type + while (!vm && el !== document.body) { +el = el.parentElement +vm = el.__vue__ + } if (!vm) { // not a vue component. return } + let disposed = false + let evtName = e.type /** * take full control of redirection of element. */
[41/47] incubator-weex git commit: * [html5] add feature offset appear.
* [html5] add feature offset appear. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5554d51e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5554d51e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5554d51e Branch: refs/heads/master Commit: 5554d51ecd632b1a7826574541efda99240a5105 Parents: 524fbd1 Author: MrRaindropAuthored: Mon Sep 25 16:11:35 2017 +0800 Committer: MrRaindrop Committed: Mon Sep 25 16:11:35 2017 +0800 -- html5/render/vue/README.md| 4 + html5/render/vue/mixins/base.js | 4 +- html5/render/vue/utils/component.js | 160 ++--- package.json | 2 +- packages/weex-vue-render/README.md| 4 + packages/weex-vue-render/package.json | 2 +- 6 files changed, 112 insertions(+), 64 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5554d51e/html5/render/vue/README.md -- diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md index d2b8c89..ad7c61f 100644 --- a/html5/render/vue/README.md +++ b/html5/render/vue/README.md @@ -176,6 +176,10 @@ vue: { * 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. + 0.12.17 + +* support offset appear. + ## component -> dom map | component | dom element | children | note | http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5554d51e/html5/render/vue/mixins/base.js -- diff --git a/html5/render/vue/mixins/base.js b/html5/render/vue/mixins/base.js index 06bc980..28c7703 100644 --- a/html5/render/vue/mixins/base.js +++ b/html5/render/vue/mixins/base.js @@ -19,7 +19,6 @@ import { getThrottleLazyload, watchAppear, - triggerAppear, triggerDisappear, extend } from '../utils' @@ -73,8 +72,7 @@ export default { if (this.$el && (i = j = this.$vnode) && (i = i.data) && (j = j.componentOptions)) { this.$el.attrs = extend({}, i.attrs, j.propsData) } -triggerAppear(this) -watchAppear(this) +watchAppear(this, true) }, destroyed () { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5554d51e/html5/render/vue/utils/component.js -- diff --git a/html5/render/vue/utils/component.js b/html5/render/vue/utils/component.js index eb8ded7..f1e9ee0 100644 --- a/html5/render/vue/utils/component.js +++ b/html5/render/vue/utils/component.js @@ -36,9 +36,52 @@ export function getParentScroller (vm) { return _getParentScroller(vm.$parent) } -export function hasIntersection (rect, ctRect) { - return (rect.left < ctRect.right && rect.right > ctRect.left) -&& (rect.top < ctRect.bottom && rect.bottom > ctRect.top) +function horizontalBalance (rect, ctRect) { + return rect.left < ctRect.right && rect.right > ctRect.left +} + +function verticalBalance (rect, ctRect) { + return rect.top < ctRect.bottom && rect.bottom > ctRect.top +} + +/** + * return a data array with two boolean value, which are: + * 1. visible in current ct's viewport. + * 2. visible with offset in current ct's viewport. + */ +export function hasIntersection (rect, ctRect, dir, offset) { + dir = dir || 'up' + const isHorizontal = dir === 'left' || dir === 'right' + const isVertical = dir === 'up' || dir === 'down' + if (isHorizontal && !verticalBalance(rect, ctRect)) { +return [false, false] + } + if (isVertical && !horizontalBalance(rect, ctRect)) { +return [false, false] + } + offset = parseInt(offset || 0) * weex.config.env.scale + switch (dir) { +case 'up': + return [ +rect.top < ctRect.bottom && rect.bottom > ctRect.top, +rect.top < ctRect.bottom + offset && rect.bottom > ctRect.top - offset + ] +case 'down': + return [ +rect.bottom > ctRect.top && rect.top < ctRect.bottom, +rect.bottom > ctRect.top - offset && rect.top < ctRect.bottom + offset + ] +case 'left': + return [ +rect.left < ctRect.right && rect.right > ctRect.left, +rect.left < ctRect.right + offset && rect.right > ctRect.left - offset + ] +case 'right': + return [ +rect.right > ctRect.left && rect.left < ctRect.right, +rect.right > ctRect.left - offset && rect.left < ctRect.right + offset + ] + } } /** @@ -46,7 +89,7 @@ export function hasIntersection (rect, ctRect) { * @param {HTMLElement} ela dom element. * @param {HTMLElement} container optional, the container of this el. */ -export function
[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: MrRaindropAuthored: 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",
[28/47] incubator-weex git commit: * [html5] release v0.12.9 & fix clicking on none-vue element.
* [html5] release v0.12.9 & fix clicking on none-vue element. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/73d2f134 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/73d2f134 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/73d2f134 Branch: refs/heads/dev Commit: 73d2f134fa14b2600983e6647ed15d0f4f8e2fb9 Parents: eb81e1c Author: MrRaindropAuthored: Mon Sep 11 16:15:59 2017 +0800 Committer: MrRaindrop Committed: Mon Sep 11 16:15:59 2017 +0800 -- html5/render/vue/README.md| 4 html5/render/vue/env/event-manager.js | 3 +++ package.json | 2 +- packages/weex-vue-render/README.md| 4 packages/weex-vue-render/package.json | 6 +- 5 files changed, 13 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/73d2f134/html5/render/vue/README.md -- diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md index 2c915a6..d27bdac 100644 --- a/html5/render/vue/README.md +++ b/html5/render/vue/README.md @@ -147,6 +147,10 @@ vue: { * optimize event binding. * fix a-jump interception condition. + 0.12.9 + +* event handling ignore none-vue element. + ## component -> dom map | component | dom element | children | note | http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/73d2f134/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 a72f9b6..914981d 100644 --- a/html5/render/vue/env/event-manager.js +++ b/html5/render/vue/env/event-manager.js @@ -81,6 +81,9 @@ function _init (doc) { let vm = el.__vue__ let disposed = false let evtName = e.type + if (!vm) { // not a vue component. +return + } /** * take full control of redirection of element. */ http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/73d2f134/package.json -- diff --git a/package.json b/package.json index 0b79cde..8346fc2 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.21.11", -"vue-render": "0.12.8", +"vue-render": "0.12.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/73d2f134/packages/weex-vue-render/README.md -- diff --git a/packages/weex-vue-render/README.md b/packages/weex-vue-render/README.md index 2c915a6..d27bdac 100644 --- a/packages/weex-vue-render/README.md +++ b/packages/weex-vue-render/README.md @@ -147,6 +147,10 @@ vue: { * optimize event binding. * fix a-jump interception condition. + 0.12.9 + +* event handling ignore none-vue element. + ## component -> dom map | component | dom element | children | note | http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/73d2f134/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index b29cfdc..220744f 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.8", + "version": "0.12.9", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.common.js", @@ -24,9 +24,5 @@ "httpurl": "^0.1.1", "query-string": "^4.3.2", "inline-style-prefixer": "^3.0.2" - }, - "peerDependencies": { -"vue": "^2.0", -"vue-loader": "^12.0" } }
[24/47] 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/b0741d80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b0741d80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b0741d80 Branch: refs/heads/master Commit: b0741d806e55285523fcf1ba0cd5a8dc0872ed84 Parents: 60ce630 42da9dd Author: MrRaindropAuthored: Tue Sep 5 11:16:29 2017 +0800 Committer: MrRaindrop Committed: Tue Sep 5 11:16:29 2017 +0800 -- .../commons/adapter/FrescoImageComponent.java | 2 +- .../java/com/alibaba/weex/WXPageActivity.java | 5 +- android/sdk/build.gradle| 6 + android/sdk/libs/armeabi/libweexjsb.so | Bin 22556 -> 0 bytes android/sdk/libs/armeabi/libweexjsc.so | Bin 325660 -> 7570392 bytes android/sdk/libs/armeabi/libweexjss.so | Bin 6754012 -> 0 bytes .../java/com/taobao/weex/WXSDKInstance.java | 23 ++- .../java/com/taobao/weex/common/Constants.java | 1 + .../com/taobao/weex/common/IWXDebugProxy.java | 2 + .../weex/ui/component/AppearanceHelper.java | 9 +- .../com/taobao/weex/ui/component/WXImage.java | 75 +++ .../taobao/weex/ui/component/WXScroller.java| 2 +- .../com/taobao/weex/ui/component/WXText.java| 29 ++- .../taobao/weex/ui/component/WXVContainer.java | 6 + .../ui/component/list/BasicListComponent.java | 204 +-- .../ui/component/list/SimpleListComponent.java | 6 +- .../ui/component/list/StickyHeaderHelper.java | 71 --- .../weex/ui/component/list/WXListComponent.java | 83 +++- .../com/taobao/weex/ui/view/WXImageView.java| 16 +- .../com/taobao/weex/utils/ImageDrawable.java| 17 +- .../java/com/taobao/weex/utils/WXUtils.java | 64 +++--- dangerfile.js | 2 +- doc/_config.yml | 2 + doc/_config_cn.yml | 2 + doc/source/cn/guide/integrate-to-your-app.md| 6 +- doc/source/cn/guide/tools/index.md | 1 + doc/source/cn/guide/tools/plugin.md | 77 +++ doc/source/cn/references/common-style.md| 59 +- doc/source/cn/references/modules/animation.md | 37 ++-- doc/source/guide/integrate-to-your-app.md | 6 +- doc/source/guide/tools/index.md | 1 + doc/source/guide/tools/plugin.md| 68 +++ doc/source/references/common-style.md | 57 ++ doc/source/references/modules/animation.md | 46 ++--- doc/themes/weex/languages/en.yml| 2 +- .../weex/layout/_partial/after-footer.ejs | 10 + doc/themes/weex/layout/_partial/header.ejs | 3 + doc/themes/weex/layout/_partial/sidebar.ejs | 3 + doc/themes/weex/source/css/index.scss | 42 +++- ios/playground/WeexDemo/Scanner/WXScannerVC.m | 2 +- .../WeexDemo/WXConfigCenterDefaultImpl.m| 6 +- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 20 +- .../WeexSDK/Sources/Component/WXAComponent.m| 1 + .../Sources/Component/WXComponent_internal.h| 3 +- .../Sources/Component/WXCycleSliderComponent.m | 56 + .../WeexSDK/Sources/Component/WXEditComponent.m | 9 +- .../Sources/Component/WXImageComponent.m| 4 + .../Sources/Component/WXSliderComponent.m | 53 + .../Component/WXSliderNeighborComponent.m | 14 ++ .../Sources/Component/WXSwitchComponent.m | 2 + .../Sources/Component/WXTextAreaComponent.m | 4 + .../WeexSDK/Sources/Component/WXTextComponent.m | 19 +- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 2 +- .../Sources/Controller/WXBaseViewController.m | 4 +- ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m| 1 + .../Sources/Manager/WXComponentManager.h| 8 + .../Sources/Manager/WXComponentManager.m| 26 ++- .../Sources/Manager/WXDatePickerManager.m | 8 + .../WeexSDK/Sources/Manager/WXTracingManager.m | 2 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 38 ++-- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 7 +- ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 44 .../WeexSDK/Sources/Module/WXPrerenderManager.h | 21 ++ .../WeexSDK/Sources/Module/WXPrerenderManager.m | 120 --- .../WeexSDK/Sources/Module/WXVoiceOverModule.h | 25 +++ .../WeexSDK/Sources/Module/WXVoiceOverModule.m | 148 ++ ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 2 +- ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 + test/mocha.opts | 2 - test/pages/attributes/dom-operation.vue | 33 +++ test/pages/components/a-src.vue | 86 test/pages/components/a-support-href1.vue | 58 ++
[47/47] incubator-weex git commit: Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.16-dev
Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/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/915935b0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/915935b0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/915935b0 Branch: refs/heads/dev Commit: 915935b09163d2ea88d2db7ba83979e6d9f2cf1c Parents: aab1d74 5b7c9a4 Author: MrRaindropAuthored: Tue Sep 26 12:22:44 2017 +0800 Committer: MrRaindrop Committed: Tue Sep 26 12:22:44 2017 +0800 -- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[25/47] incubator-weex git commit: * [html5] bugfix: appear only trigger once when there's no disappear handler bound.
* [html5] bugfix: appear only trigger once when there's no disappear handler bound. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ec5b7914 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ec5b7914 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ec5b7914 Branch: refs/heads/master Commit: ec5b79142d13d319d21ed8092f8a2f5857cb341f Parents: b0741d8 Author: MrRaindropAuthored: Tue Sep 5 18:11:46 2017 +0800 Committer: MrRaindrop Committed: Tue Sep 5 18:11:46 2017 +0800 -- html5/render/vue/utils/component.js | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ec5b7914/html5/render/vue/utils/component.js -- diff --git a/html5/render/vue/utils/component.js b/html5/render/vue/utils/component.js index f587b26..eb8ded7 100644 --- a/html5/render/vue/utils/component.js +++ b/html5/render/vue/utils/component.js @@ -202,7 +202,12 @@ export function detectAppear (context, visible, dir = null) { const el = context && context.$el if (!el) { return } const handlers = getEventHandlers(context) - if (!handlers[visible ? 'appear' : 'disappear']) { return } + /** + * No matter it's binding appear/disappear or both of them. Always + * should test it's visibility and change the context._visible. + * If neithor of them was bound, then just ignore it. + */ + if (!handlers['appear'] && !handlers['disappear']) { return } /** * if the component hasn't appeared for once yet, then it shouldn't trigger * a disappear event at all.
[26/47] incubator-weex git commit: * [html5] add prevent attr for a and support href of javascript:void(0)
* [html5] add prevent attr for a and support href of javascript:void(0) Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/386a0c61 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/386a0c61 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/386a0c61 Branch: refs/heads/master Commit: 386a0c611184da024fe1132e26d857cd4c4839a0 Parents: ec5b791 Author: MrRaindropAuthored: Fri Sep 8 12:52:21 2017 +0800 Committer: MrRaindrop Committed: Fri Sep 8 12:52:21 2017 +0800 -- html5/render/vue/env/event-manager.js | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/386a0c61/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 06a00a3..70166bc 100644 --- a/html5/render/vue/env/event-manager.js +++ b/html5/render/vue/env/event-manager.js @@ -124,6 +124,8 @@ function _init (doc) { */ if (evtName === 'click' && isANode(elm)) { const href = elm.getAttribute('href') + const voidHrefReg = /^\s*javascript\s*:\s*void\s*(?:\(\s*0\s*\)|0)\s*;?\s*$/ + const prevent = elm.getAttribute('prevent') disposed = true /** * Give the chance to the listeners binding on doc or doc.body for @@ -131,16 +133,15 @@ function _init (doc) { * Should set a _should_intercept_a_jump function on window to test * whether we should intercept the a-jump. */ - if (window._should_intercept_a_jump && window._should_intercept_a_jump(elm)) { + if (window._should_intercept_a_jump && window._should_intercept_a_jump(elm) +|| href.match(voidHrefReg) +|| prevent === '' || prevent === 'true') { // do nothing. leave it to the intercept handler. } - else { -if (!!href) { - location.href = href -} -else { - console.warn('[vue-render] If you want to use the A tag jump, set the href attribute') -} + else if (href) { +location.href = href + } else if (process.env.NODE_ENV === 'development') { +console.warn('[vue-render] If you want to use the A tag jump, set the href attribute') } }
[44/47] 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/cda836a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cda836a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cda836a0 Branch: refs/heads/dev Commit: cda836a0f5526cbb6e5c73a408a019fce0203dd8 Parents: 52aed20 2513b0f Author: MrRaindropAuthored: Tue Sep 26 11:09:30 2017 +0800 Committer: MrRaindrop Committed: Tue Sep 26 11:09:30 2017 +0800 -- .travis.yml |52 +- POSSIBLE-NOTICES-FOR-BIN-DIST | 5 +- WeexSDK.podspec | 2 - android/build.gradle|13 +- android/gradle.properties | 5 +- .../gradle/wrapper/gradle-wrapper.properties| 2 +- android/jacoco.gradle |43 + .../alibaba/weex/benchmark/BenchmarkTest.java |29 +- .../playground/app/src/main/AndroidManifest.xml | 8 + .../alibaba/weex/util/CoverageDataDumper.java |36 + .../alibaba/weex/util/JacocoCodeCoverage.java |93 + android/sdk/libs/armeabi/libweexjsb.so | Bin 0 -> 22556 bytes android/sdk/libs/armeabi/libweexjsc.so | Bin 7570392 -> 325660 bytes android/sdk/libs/armeabi/libweexjss.so | Bin 0 -> 6754016 bytes .../java/com/taobao/weex/WXEnvironment.java |16 + .../main/java/com/taobao/weex/WXSDKEngine.java | 5 + .../java/com/taobao/weex/WXSDKInstance.java | 122 +- .../weex/appfram/pickers/DatePickerImpl.java| 3 +- .../appfram/websocket/WebSocketCloseCodes.java | 2 +- .../com/taobao/weex/bridge/WXBridgeManager.java |79 +- .../java/com/taobao/weex/bridge/WXParams.java | 9 + .../java/com/taobao/weex/common/Constants.java |31 + .../java/com/taobao/weex/common/WXConfig.java | 1 + .../com/taobao/weex/dom/ImmutableDomObject.java |21 +- .../main/java/com/taobao/weex/dom/WXAttr.java | 147 +- .../com/taobao/weex/dom/WXCellDomObject.java|53 +- .../java/com/taobao/weex/dom/WXDomObject.java |26 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 120 +- .../taobao/weex/dom/WXRecyclerDomObject.java|58 +- .../main/java/com/taobao/weex/dom/WXStyle.java |17 - .../com/taobao/weex/dom/WXTextDomObject.java|24 +- .../dom/action/AbstractAddElementAction.java|12 +- .../com/taobao/weex/dom/action/Actions.java | 8 +- .../taobao/weex/dom/action/AddEventAction.java |11 +- .../weex/dom/action/CreateBodyAction.java |12 +- .../weex/dom/action/ReloadPageAction.java | 6 +- .../weex/dom/action/RemoveEventAction.java | 5 +- .../com/taobao/weex/dom/binding/ELUtils.java| 125 + .../taobao/weex/dom/binding/WXStatement.java| 160 + .../com/taobao/weex/el/parse/ArrayStack.java|75 + .../java/com/taobao/weex/el/parse/Block.java|75 + .../java/com/taobao/weex/el/parse/Operator.java | 106 + .../com/taobao/weex/el/parse/Operators.java | 499 + .../java/com/taobao/weex/el/parse/Parser.java | 485 + .../java/com/taobao/weex/el/parse/Symbol.java |37 + .../java/com/taobao/weex/el/parse/Token.java|89 + .../weex/ui/component/AppearanceHelper.java | 9 + .../weex/ui/component/WXBasicComponentType.java | 3 + .../taobao/weex/ui/component/WXComponent.java | 299 +- .../com/taobao/weex/ui/component/WXDiv.java |74 +- .../com/taobao/weex/ui/component/WXHeader.java | 4 +- .../com/taobao/weex/ui/component/WXImage.java | 7 + .../com/taobao/weex/ui/component/WXLoading.java | 5 +- .../com/taobao/weex/ui/component/WXRefresh.java | 5 +- .../com/taobao/weex/ui/component/WXSlider.java | 4 +- .../com/taobao/weex/ui/component/WXText.java|65 +- .../taobao/weex/ui/component/WXVContainer.java |44 +- .../weex/ui/component/binding/Layouts.java |92 + .../weex/ui/component/binding/Statements.java | 420 + .../ui/component/list/RecyclerTransform.java|90 + .../taobao/weex/ui/component/list/WXCell.java |65 +- .../weex/ui/component/list/WXListComponent.java |53 +- .../list/template/CellLifecycleManager.java | 211 + .../list/template/TemplateStickyHelper.java | 252 + .../list/template/TemplateViewHolder.java |79 + .../list/template/WXRecyclerTemplateList.java | 1463 + .../com/taobao/weex/ui/flat/FlatComponent.java |33 + .../com/taobao/weex/ui/flat/FlatGUIContext.java | 146 + .../taobao/weex/ui/flat/WidgetContainer.java|93 + .../weex/ui/flat/widget/AndroidViewWidget.java |76 + .../taobao/weex/ui/flat/widget/BaseWidget.java | 130 + .../taobao/weex/ui/flat/widget/TextWidget.java |
[27/47] 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/eb81e1ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eb81e1ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eb81e1ca Branch: refs/heads/master Commit: eb81e1cacae448967b262906963a21e2dad089f0 Parents: 386a0c6 Author: MrRaindropAuthored: Fri Sep 8 14:11:03 2017 +0800 Committer: MrRaindrop Committed: Fri Sep 8 14:11:03 2017 +0800 -- html5/render/vue/env/event-manager.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eb81e1ca/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 70166bc..a72f9b6 100644 --- a/html5/render/vue/env/event-manager.js +++ b/html5/render/vue/env/event-manager.js @@ -140,7 +140,8 @@ function _init (doc) { } else if (href) { location.href = href - } else if (process.env.NODE_ENV === 'development') { + } + else if (process.env.NODE_ENV === 'development') { console.warn('[vue-render] If you want to use the A tag jump, set the href attribute') } }
[43/47] incubator-weex git commit: * [html5] fix vue-render tests.
* [html5] fix vue-render 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/52aed200 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/52aed200 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/52aed200 Branch: refs/heads/master Commit: 52aed20005c438a40dbb97c670d27858fa1e3d90 Parents: 51ceff1 Author: MrRaindropAuthored: Tue Sep 26 10:30:40 2017 +0800 Committer: MrRaindrop Committed: Tue Sep 26 10:30:40 2017 +0800 -- build/karma.vue.conf.js| 1 + html5/render/vue/utils/component.js| 7 +++ html5/test/render/vue/components/switch.js | 5 + html5/test/render/vue/components/text.js | 4 ++-- html5/test/render/vue/components/web.js| 4 ++-- html5/test/render/vue/helper/index.js | 11 +++ html5/test/render/vue/utils/component.js | 5 - 7 files changed, 20 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52aed200/build/karma.vue.conf.js -- diff --git a/build/karma.vue.conf.js b/build/karma.vue.conf.js index 693c241..1bb24d3 100644 --- a/build/karma.vue.conf.js +++ b/build/karma.vue.conf.js @@ -72,6 +72,7 @@ module.exports = function (config) { '../html5/test/render/vue/utils/*.js', '../html5/test/render/vue/core/*.js', '../html5/test/render/vue/!(utils|core)/*.js' + // '../html5/test/render/vue/components/switch.js', ], exclude: [ '../html5/test/render/vue/core/node.js', http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52aed200/html5/render/vue/utils/component.js -- diff --git a/html5/render/vue/utils/component.js b/html5/render/vue/utils/component.js index f1e9ee0..7e96585 100644 --- a/html5/render/vue/utils/component.js +++ b/html5/render/vue/utils/component.js @@ -152,7 +152,7 @@ function checkHandlers (handlers) { */ export function watchAppear (context, fireNow) { const el = context && context.$el - if (!el) { return } + if (!el || el.nodeType !== 1) { return } const appearOffset = getAppearOffset(el) const handlers = getEventHandlers(context) @@ -163,7 +163,7 @@ export function watchAppear (context, fireNow) { } let isWindow = false - let container = window + let container = document.body const scroller = getParentScroller(context) if (scroller && scroller.$el) { container = scroller.$el @@ -208,9 +208,8 @@ export function watchAppear (context, fireNow) { for (let i = 0; i < len; i++) { const vm = watchAppearList[i] const el = vm.$el - const ct = isWindow ? document.body : container const appearOffset = getAppearOffset(el) - const visibleData = isElementVisible(el, ct, dir, appearOffset) + const visibleData = isElementVisible(el, container, dir, appearOffset) detectAppear(vm, visibleData, dir) } }, 25, true) http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52aed200/html5/test/render/vue/components/switch.js -- diff --git a/html5/test/render/vue/components/switch.js b/html5/test/render/vue/components/switch.js index 89e3734..123bb8e 100644 --- a/html5/test/render/vue/components/switch.js +++ b/html5/test/render/vue/components/switch.js @@ -28,9 +28,7 @@ init(' component', (Vue, helper) => { it('simple component', () => { const vm = compile(``) - -// console.log(vm.$el) -expect(vm.$el.tagName).to.be.equal('SPAN') +expect(vm.$el.tagName.toLowerCase()).to.be.equal('span') expect(utils.toArray(vm.$el.classList)).to.include('weex-switch') expect(vm.$el.innerHTML).to.be.equal('') }) @@ -39,7 +37,6 @@ init(' component', (Vue, helper) => { const vmA = compile(``) const vmB = compile(``) const vmC = compile(``) - expect(vmA.$el.className).to.match(/weex\-switch\-disabled/) expect(vmB.$el.className).to.match(/weex\-switch\-disabled/) expect(vmC.$el.className).to.match(/weex\-switch\-disabled/) http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52aed200/html5/test/render/vue/components/text.js -- diff --git a/html5/test/render/vue/components/text.js b/html5/test/render/vue/components/text.js index 105cb49..e45432b 100644 --- a/html5/test/render/vue/components/text.js +++ b/html5/test/render/vue/components/text.js @@ -30,14 +30,14 @@ init(' component', (Vue, helper) => { it('create simple text component', () => { const vm = compile(`abc`) -expect(vm.$el.tagName).to.be.equal('P') +
[16/47] incubator-weex git commit: * [html5] release v0.12.7
* [html5] release v0.12.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/902a1f73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/902a1f73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/902a1f73 Branch: refs/heads/master Commit: 902a1f7306da90e67006f4938489f6b6659b909e Parents: 5bc5851 Author: MrRaindropAuthored: Thu Aug 24 21:39:35 2017 +0800 Committer: MrRaindrop Committed: Thu Aug 24 21:39:35 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/902a1f73/package.json -- diff --git a/package.json b/package.json index 3e70ac0..47b84dd 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.21.11", -"vue-render": "0.12.6", +"vue-render": "0.12.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/902a1f73/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index 51a68d9..1262ef1 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.6", + "version": "0.12.7", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.common.js",
[35/47] incubator-weex git commit: * [html5] reset env.deviceHeight after window's resizing.
* [html5] reset env.deviceHeight after window's resizing. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/babd33bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/babd33bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/babd33bf Branch: refs/heads/dev Commit: babd33bf5257cce55fe429b0137b2ce218281cc4 Parents: 89b131f Author: MrRaindropAuthored: Thu Sep 14 20:55:09 2017 +0800 Committer: MrRaindrop Committed: Thu Sep 14 20:55:09 2017 +0800 -- html5/render/vue/README.md| 4 html5/render/vue/env/viewport.js | 8 package.json | 2 +- packages/weex-vue-render/README.md| 4 packages/weex-vue-render/package.json | 2 +- 5 files changed, 18 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/babd33bf/html5/render/vue/README.md -- diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md index 31b6226..4433261 100644 --- a/html5/render/vue/README.md +++ b/html5/render/vue/README.md @@ -164,6 +164,10 @@ vue: { * fix NS (svg) bug in vue.js@v2.4.3 + 0.12.13 + +* reset `env.deviceHeight` after window's resizing. + ## component -> dom map | component | dom element | children | note | http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/babd33bf/html5/render/vue/env/viewport.js -- diff --git a/html5/render/vue/env/viewport.js b/html5/render/vue/env/viewport.js index 33efd6a..bec967f 100644 --- a/html5/render/vue/env/viewport.js +++ b/html5/render/vue/env/viewport.js @@ -118,10 +118,18 @@ export function init (viewportWidth: number = width): ?{ screenWidth = doc.documentElement.clientWidth screenHeight = doc.documentElement.clientHeight +const resetDeviceHeight = function () { + screenHeight = doc.documentElement.clientHeight + const env = window.weex && window.weex.config.env + info.deviceHeight = env.deviceHeight = screenHeight * dpr +} + // set root font for rem. setRootFont(screenWidth) setMetaViewport(viewportWidth) +window.addEventListener('resize', resetDeviceHeight) + /** * why not to use window.screen.width to get screenWidth ? Because in some * old webkit browser on android system it get the device pixel width, which http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/babd33bf/package.json -- diff --git a/package.json b/package.json index 534cc67..57cde71 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.21.11", -"vue-render": "0.12.12", +"vue-render": "0.12.13", "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/babd33bf/packages/weex-vue-render/README.md -- diff --git a/packages/weex-vue-render/README.md b/packages/weex-vue-render/README.md index 31b6226..4433261 100644 --- a/packages/weex-vue-render/README.md +++ b/packages/weex-vue-render/README.md @@ -164,6 +164,10 @@ vue: { * fix NS (svg) bug in vue.js@v2.4.3 + 0.12.13 + +* reset `env.deviceHeight` after window's resizing. + ## component -> dom map | component | dom element | children | note | http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/babd33bf/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index 8ff879e..c86c16b 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.12", + "version": "0.12.13", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.common.js",
[17/47] incubator-weex git commit: * [html5] fix call loop.
* [html5] fix call loop. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/31411dd4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/31411dd4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/31411dd4 Branch: refs/heads/master Commit: 31411dd4afd383cb4a25bd666830615c9c14e6d5 Parents: 902a1f7 Author: MrRaindropAuthored: Fri Aug 25 15:19:01 2017 +0800 Committer: MrRaindrop Committed: Fri Aug 25 15:19:01 2017 +0800 -- html5/render/vue/README.md| 2 +- html5/render/vue/core/node.js | 33 +- html5/render/vue/env/event-manager.js | 19 - package.json | 2 +- packages/weex-vue-render/README.md| 2 +- packages/weex-vue-render/package.json | 2 +- 6 files changed, 41 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/31411dd4/html5/render/vue/README.md -- diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md index 41df16b..bcdd2de 100644 --- a/html5/render/vue/README.md +++ b/html5/render/vue/README.md @@ -142,7 +142,7 @@ vue: { * fix scanning style in production with uglified code. - 0.12.6 + 0.12.8 * optimize event binding. http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/31411dd4/html5/render/vue/core/node.js -- diff --git a/html5/render/vue/core/node.js b/html5/render/vue/core/node.js index d38cafd..4cef067 100644 --- a/html5/render/vue/core/node.js +++ b/html5/render/vue/core/node.js @@ -54,6 +54,30 @@ function getListeners (vnode, evt) { } /** + * Instead of vue's invoker, this function should check if the binding function + * has a _weex_hook flag. If there is one, the handler should not be triggered. + * @param {Array | Function} fns + */ +export function applyFns (fns, ...args) { + if (Array.isArray(fns)) { +const cloned = fns.slice() +const len = cloned.length +for (let i = 0; i < len; i++) { + const fn = cloned[i] + if (fn._weex_hook) { +continue + } + fn.apply(null, args) +} + } + else { +if (!fns._weex_hook) { + fns.apply(null, args) +} + } +} + +/** * emit native events to enable v-on. * @param {VComponent} context: which one to emit a event on. * @param {array | object} events: extra events. You can pass in multiple arguments here. @@ -90,11 +114,8 @@ export function createEventMap (context, ...events) { if (len > 0) { let idx = 0 while (idx < len) { -let on = ons[idx] -if (on && on.fn) { - on = on.fn -} -on && on.call(vm, e) +const on = ons[idx] +applyFns(on.fns, e) idx++ } // once a parent node (or self node) has triggered the handler, then @@ -107,6 +128,8 @@ export function createEventMap (context, ...events) { vm = vm.$parent } } +// flag to distinguish from user-binding listeners. +handler._weex_hook = true } if (!eventMap[evtName]) { eventMap[evtName] = [] http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/31411dd4/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 3ecf618..c19a649 100644 --- a/html5/render/vue/env/event-manager.js +++ b/html5/render/vue/env/event-manager.js @@ -19,6 +19,7 @@ import config from '../config' import { createEvent, supportsPassive } from '../utils' +import { applyFns } from '../core' const gestureEvents = config.gestureEvents const nativeEvents = ['click', 'touchstart', 'touchmove', 'touchend'] @@ -112,13 +113,11 @@ function _init (doc) { if (len > 0) { for (let i = 0; i < len; i++) { -let handler = ons[i] -if (handler && handler.fn) { - handler = handler.fn -} -// create a no bubble event. -const newEvt = createEvent(el, evt) -handler && handler.call(vm, newEvt) +const handler = ons[i] +const newEvt = evtName === 'click' + ? createEvent(el, evtName) + : e +applyFns(handler.fns, newEvt) } e._triggered = { target: vm.$el } disposed = true @@ -127,8 +126,8 @@ function _init (doc) { /** * if the handler is binding on a element,
[20/47] incubator-weex git commit: Merge pull request #1 from erha19/html5-bugfix-event
Merge pull request #1 from erha19/html5-bugfix-event * [html5] add _triggered on event when evtName is click Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/125f17d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/125f17d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/125f17d3 Branch: refs/heads/dev Commit: 125f17d3a2a7fc10f8645f189066d60d0f2668d9 Parents: 1ceb374 aeb55f3 Author: _HSAuthored: Mon Sep 4 17:59:18 2017 +0800 Committer: GitHub Committed: Mon Sep 4 17:59:18 2017 +0800 -- examples/vue/showcase/a-node-click.vue | 6 +++--- html5/render/vue/env/event-manager.js | 15 +++ 2 files changed, 14 insertions(+), 7 deletions(-) --
[09/47] incubator-weex git commit: * [html5] pack cjs bundle.
* [html5] pack cjs bundle. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/52b04970 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/52b04970 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/52b04970 Branch: refs/heads/dev Commit: 52b04970f38e0121e81d71f79ea96d367011b6ae Parents: 26646cf Author: MrRaindropAuthored: Wed Aug 23 10:58:52 2017 +0800 Committer: MrRaindrop Committed: Wed Aug 23 10:58:52 2017 +0800 -- build/build.js| 8 html5/render/vue/README.md| 4 package.json | 2 +- packages/weex-vue-render/README.md| 4 packages/weex-vue-render/package.json | 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52b04970/build/build.js -- diff --git a/build/build.js b/build/build.js index 02f1e8c..a191260 100644 --- a/build/build.js +++ b/build/build.js @@ -210,12 +210,12 @@ function build (name) { return runRollup(config).then(() => { let p = Promise.resolve() if (name === 'vue') { - const esConfig = getConfig(pkgName, false, { -format: 'es', + const cjsConfig = getConfig(pkgName, false, { +format: 'cjs', _isProd: true }) - esConfig.dest = esConfig.dest.replace(/\.js$/, '.es.js') - p = runRollup(esConfig) + cjsConfig.dest = cjsConfig.dest.replace(/\.js$/, '.common.js') + p = runRollup(cjsConfig) } return p.then(function () { return runRollup(minifyConfig).then(() => { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52b04970/html5/render/vue/README.md -- diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md index eb2d21a..7e507c9 100644 --- a/html5/render/vue/README.md +++ b/html5/render/vue/README.md @@ -138,6 +138,10 @@ vue: { * fix `modal.toast` on android. * fix css prefixer for gradients. + 0.12.4 + +* fix scanning style in production with uglified code. + ## component -> dom map | component | dom element | children | note | http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52b04970/package.json -- diff --git a/package.json b/package.json index 4579a27..02ad3ed 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.21.9", -"vue-render": "0.12.3", +"vue-render": "0.12.4", "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/52b04970/packages/weex-vue-render/README.md -- diff --git a/packages/weex-vue-render/README.md b/packages/weex-vue-render/README.md index eb2d21a..7e507c9 100644 --- a/packages/weex-vue-render/README.md +++ b/packages/weex-vue-render/README.md @@ -138,6 +138,10 @@ vue: { * fix `modal.toast` on android. * fix css prefixer for gradients. + 0.12.4 + +* fix scanning style in production with uglified code. + ## component -> dom map | component | dom element | children | note | http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52b04970/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index 8c38634..c6dfb4a 100644 --- a/packages/weex-vue-render/package.json +++ b/packages/weex-vue-render/package.json @@ -1,9 +1,9 @@ { "name": "weex-vue-render", - "version": "0.12.3", + "version": "0.12.4", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", - "main": "dist/index.js", + "main": "dist/index.common.js", "repository": { "type": "git", "url": "g...@github.com:apache/incubator-weex.git"
[27/47] 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/eb81e1ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eb81e1ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eb81e1ca Branch: refs/heads/dev Commit: eb81e1cacae448967b262906963a21e2dad089f0 Parents: 386a0c6 Author: MrRaindropAuthored: Fri Sep 8 14:11:03 2017 +0800 Committer: MrRaindrop Committed: Fri Sep 8 14:11:03 2017 +0800 -- html5/render/vue/env/event-manager.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eb81e1ca/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 70166bc..a72f9b6 100644 --- a/html5/render/vue/env/event-manager.js +++ b/html5/render/vue/env/event-manager.js @@ -140,7 +140,8 @@ function _init (doc) { } else if (href) { location.href = href - } else if (process.env.NODE_ENV === 'development') { + } + else if (process.env.NODE_ENV === 'development') { console.warn('[vue-render] If you want to use the A tag jump, set the href attribute') } }
[07/47] incubator-weex git commit: * [html5] add meta.setViewport.
* [html5] add meta.setViewport. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/214c6e33 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/214c6e33 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/214c6e33 Branch: refs/heads/master Commit: 214c6e33d15dae42a415b6c3f5e2ac2dc2f6301b Parents: 77ab0f8 Author: MrRaindropAuthored: Mon Aug 21 14:35:12 2017 +0800 Committer: MrRaindrop Committed: Mon Aug 21 14:35:12 2017 +0800 -- html5/render/vue/env/weex.js | 21 +++ html5/render/vue/modules/index.js | 4 ++- html5/render/vue/modules/meta.js | 36 + packages/weex-vue-render/src/index.core.js | 3 +++ 4 files changed, 63 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/214c6e33/html5/render/vue/env/weex.js -- diff --git a/html5/render/vue/env/weex.js b/html5/render/vue/env/weex.js index 199e8ae..7d88268 100644 --- a/html5/render/vue/env/weex.js +++ b/html5/render/vue/env/weex.js @@ -47,6 +47,27 @@ const weex = { return this.registerApiModule(...args) }, + support (feature = '') { +const match = (feature + '').match(/@(component|module)\/(\w+)(.\w+)?/) +if (match) { + const type = match[1] + const mod = match[2] + let method = match[3] + method = method && method.replace(/^\./, '') + switch (type) { +case 'component': + return !!this._components[mod] +case 'module': + const module = this.requireModule(mod) + return module && method ? !!module[method] : !!module + } +} +else { + console.warn(`[vue-render] invalid argument for weex.support: ${feature}`) + return null +} + }, + /** * Register a new vue instance in this weex instance. Put its root element into weex.document.body.children, so * that user can use weex.document.body to walk through all dom structures in all vue instances in the page. http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/214c6e33/html5/render/vue/modules/index.js -- diff --git a/html5/render/vue/modules/index.js b/html5/render/vue/modules/index.js index c0e2fc1..48d1136 100644 --- a/html5/render/vue/modules/index.js +++ b/html5/render/vue/modules/index.js @@ -33,6 +33,7 @@ import modal from './modal' import navigatorModule from './navigator' import webview from './webview' import websocket from './websocket' +import meta from './meta' export default [ geolocation, @@ -46,5 +47,6 @@ export default [ dom, globalEvent, navigatorModule, - webview + webview, + meta ] http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/214c6e33/html5/render/vue/modules/meta.js -- diff --git a/html5/render/vue/modules/meta.js b/html5/render/vue/modules/meta.js new file mode 100644 index 000..ed5f0ff --- /dev/null +++ b/html5/render/vue/modules/meta.js @@ -0,0 +1,36 @@ +/* + * 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. + */ + +const meta = { + /** + * setViewport + * Changing viewport width at runtime is not supported. Please use weex-viewport meta + * tag to specify your viewport in your html file. + */ + setViewport (options) { +console.warn(`[vue-render] meta.setViewport doesn't works as expected in web platform.` ++ ` Please use to specify your viewport width.`) + } +} + +export default { + init (weex) { +weex.registerModule('meta', meta) + } +} http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/214c6e33/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 index dc49562..5e84c86
[01/47] incubator-weex git commit: * [html5] fix release CI.
Repository: incubator-weex Updated Branches: refs/heads/master 2513b0f43 -> 915935b09 * [html5] fix release CI. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a672d2f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a672d2f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a672d2f1 Branch: refs/heads/master Commit: a672d2f1dc08e52b9f639763bcfa09cdf7cc1ec8 Parents: b903e3c Author: MrRaindropAuthored: Wed Aug 16 17:26:14 2017 +0800 Committer: MrRaindrop Committed: Wed Aug 16 17:26:14 2017 +0800 -- scripts/release_files.rules | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a672d2f1/scripts/release_files.rules -- diff --git a/scripts/release_files.rules b/scripts/release_files.rules index bfc0958..01ba712 100644 --- a/scripts/release_files.rules +++ b/scripts/release_files.rules @@ -42,6 +42,7 @@ + /packages/weex-html5 + /packages/weex-html5/package.json + /packages/weex-vue-render ++ /packages/weex-vue-render/src/** + /packages/weex-vue-render/package.json + /build + /build/**
[09/47] incubator-weex git commit: * [html5] pack cjs bundle.
* [html5] pack cjs bundle. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/52b04970 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/52b04970 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/52b04970 Branch: refs/heads/master Commit: 52b04970f38e0121e81d71f79ea96d367011b6ae Parents: 26646cf Author: MrRaindropAuthored: Wed Aug 23 10:58:52 2017 +0800 Committer: MrRaindrop Committed: Wed Aug 23 10:58:52 2017 +0800 -- build/build.js| 8 html5/render/vue/README.md| 4 package.json | 2 +- packages/weex-vue-render/README.md| 4 packages/weex-vue-render/package.json | 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52b04970/build/build.js -- diff --git a/build/build.js b/build/build.js index 02f1e8c..a191260 100644 --- a/build/build.js +++ b/build/build.js @@ -210,12 +210,12 @@ function build (name) { return runRollup(config).then(() => { let p = Promise.resolve() if (name === 'vue') { - const esConfig = getConfig(pkgName, false, { -format: 'es', + const cjsConfig = getConfig(pkgName, false, { +format: 'cjs', _isProd: true }) - esConfig.dest = esConfig.dest.replace(/\.js$/, '.es.js') - p = runRollup(esConfig) + cjsConfig.dest = cjsConfig.dest.replace(/\.js$/, '.common.js') + p = runRollup(cjsConfig) } return p.then(function () { return runRollup(minifyConfig).then(() => { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52b04970/html5/render/vue/README.md -- diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md index eb2d21a..7e507c9 100644 --- a/html5/render/vue/README.md +++ b/html5/render/vue/README.md @@ -138,6 +138,10 @@ vue: { * fix `modal.toast` on android. * fix css prefixer for gradients. + 0.12.4 + +* fix scanning style in production with uglified code. + ## component -> dom map | component | dom element | children | note | http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52b04970/package.json -- diff --git a/package.json b/package.json index 4579a27..02ad3ed 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.21.9", -"vue-render": "0.12.3", +"vue-render": "0.12.4", "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/52b04970/packages/weex-vue-render/README.md -- diff --git a/packages/weex-vue-render/README.md b/packages/weex-vue-render/README.md index eb2d21a..7e507c9 100644 --- a/packages/weex-vue-render/README.md +++ b/packages/weex-vue-render/README.md @@ -138,6 +138,10 @@ vue: { * fix `modal.toast` on android. * fix css prefixer for gradients. + 0.12.4 + +* fix scanning style in production with uglified code. + ## component -> dom map | component | dom element | children | note | http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52b04970/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index 8c38634..c6dfb4a 100644 --- a/packages/weex-vue-render/package.json +++ b/packages/weex-vue-render/package.json @@ -1,9 +1,9 @@ { "name": "weex-vue-render", - "version": "0.12.3", + "version": "0.12.4", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", - "main": "dist/index.js", + "main": "dist/index.common.js", "repository": { "type": "git", "url": "g...@github.com:apache/incubator-weex.git"
[43/47] incubator-weex git commit: * [html5] fix vue-render tests.
* [html5] fix vue-render 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/52aed200 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/52aed200 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/52aed200 Branch: refs/heads/dev Commit: 52aed20005c438a40dbb97c670d27858fa1e3d90 Parents: 51ceff1 Author: MrRaindropAuthored: Tue Sep 26 10:30:40 2017 +0800 Committer: MrRaindrop Committed: Tue Sep 26 10:30:40 2017 +0800 -- build/karma.vue.conf.js| 1 + html5/render/vue/utils/component.js| 7 +++ html5/test/render/vue/components/switch.js | 5 + html5/test/render/vue/components/text.js | 4 ++-- html5/test/render/vue/components/web.js| 4 ++-- html5/test/render/vue/helper/index.js | 11 +++ html5/test/render/vue/utils/component.js | 5 - 7 files changed, 20 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52aed200/build/karma.vue.conf.js -- diff --git a/build/karma.vue.conf.js b/build/karma.vue.conf.js index 693c241..1bb24d3 100644 --- a/build/karma.vue.conf.js +++ b/build/karma.vue.conf.js @@ -72,6 +72,7 @@ module.exports = function (config) { '../html5/test/render/vue/utils/*.js', '../html5/test/render/vue/core/*.js', '../html5/test/render/vue/!(utils|core)/*.js' + // '../html5/test/render/vue/components/switch.js', ], exclude: [ '../html5/test/render/vue/core/node.js', http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52aed200/html5/render/vue/utils/component.js -- diff --git a/html5/render/vue/utils/component.js b/html5/render/vue/utils/component.js index f1e9ee0..7e96585 100644 --- a/html5/render/vue/utils/component.js +++ b/html5/render/vue/utils/component.js @@ -152,7 +152,7 @@ function checkHandlers (handlers) { */ export function watchAppear (context, fireNow) { const el = context && context.$el - if (!el) { return } + if (!el || el.nodeType !== 1) { return } const appearOffset = getAppearOffset(el) const handlers = getEventHandlers(context) @@ -163,7 +163,7 @@ export function watchAppear (context, fireNow) { } let isWindow = false - let container = window + let container = document.body const scroller = getParentScroller(context) if (scroller && scroller.$el) { container = scroller.$el @@ -208,9 +208,8 @@ export function watchAppear (context, fireNow) { for (let i = 0; i < len; i++) { const vm = watchAppearList[i] const el = vm.$el - const ct = isWindow ? document.body : container const appearOffset = getAppearOffset(el) - const visibleData = isElementVisible(el, ct, dir, appearOffset) + const visibleData = isElementVisible(el, container, dir, appearOffset) detectAppear(vm, visibleData, dir) } }, 25, true) http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52aed200/html5/test/render/vue/components/switch.js -- diff --git a/html5/test/render/vue/components/switch.js b/html5/test/render/vue/components/switch.js index 89e3734..123bb8e 100644 --- a/html5/test/render/vue/components/switch.js +++ b/html5/test/render/vue/components/switch.js @@ -28,9 +28,7 @@ init(' component', (Vue, helper) => { it('simple component', () => { const vm = compile(``) - -// console.log(vm.$el) -expect(vm.$el.tagName).to.be.equal('SPAN') +expect(vm.$el.tagName.toLowerCase()).to.be.equal('span') expect(utils.toArray(vm.$el.classList)).to.include('weex-switch') expect(vm.$el.innerHTML).to.be.equal('') }) @@ -39,7 +37,6 @@ init(' component', (Vue, helper) => { const vmA = compile(``) const vmB = compile(``) const vmC = compile(``) - expect(vmA.$el.className).to.match(/weex\-switch\-disabled/) expect(vmB.$el.className).to.match(/weex\-switch\-disabled/) expect(vmC.$el.className).to.match(/weex\-switch\-disabled/) http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52aed200/html5/test/render/vue/components/text.js -- diff --git a/html5/test/render/vue/components/text.js b/html5/test/render/vue/components/text.js index 105cb49..e45432b 100644 --- a/html5/test/render/vue/components/text.js +++ b/html5/test/render/vue/components/text.js @@ -30,14 +30,14 @@ init(' component', (Vue, helper) => { it('create simple text component', () => { const vm = compile(`abc`) -expect(vm.$el.tagName).to.be.equal('P') +
[07/47] incubator-weex git commit: * [html5] add meta.setViewport.
* [html5] add meta.setViewport. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/214c6e33 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/214c6e33 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/214c6e33 Branch: refs/heads/dev Commit: 214c6e33d15dae42a415b6c3f5e2ac2dc2f6301b Parents: 77ab0f8 Author: MrRaindropAuthored: Mon Aug 21 14:35:12 2017 +0800 Committer: MrRaindrop Committed: Mon Aug 21 14:35:12 2017 +0800 -- html5/render/vue/env/weex.js | 21 +++ html5/render/vue/modules/index.js | 4 ++- html5/render/vue/modules/meta.js | 36 + packages/weex-vue-render/src/index.core.js | 3 +++ 4 files changed, 63 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/214c6e33/html5/render/vue/env/weex.js -- diff --git a/html5/render/vue/env/weex.js b/html5/render/vue/env/weex.js index 199e8ae..7d88268 100644 --- a/html5/render/vue/env/weex.js +++ b/html5/render/vue/env/weex.js @@ -47,6 +47,27 @@ const weex = { return this.registerApiModule(...args) }, + support (feature = '') { +const match = (feature + '').match(/@(component|module)\/(\w+)(.\w+)?/) +if (match) { + const type = match[1] + const mod = match[2] + let method = match[3] + method = method && method.replace(/^\./, '') + switch (type) { +case 'component': + return !!this._components[mod] +case 'module': + const module = this.requireModule(mod) + return module && method ? !!module[method] : !!module + } +} +else { + console.warn(`[vue-render] invalid argument for weex.support: ${feature}`) + return null +} + }, + /** * Register a new vue instance in this weex instance. Put its root element into weex.document.body.children, so * that user can use weex.document.body to walk through all dom structures in all vue instances in the page. http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/214c6e33/html5/render/vue/modules/index.js -- diff --git a/html5/render/vue/modules/index.js b/html5/render/vue/modules/index.js index c0e2fc1..48d1136 100644 --- a/html5/render/vue/modules/index.js +++ b/html5/render/vue/modules/index.js @@ -33,6 +33,7 @@ import modal from './modal' import navigatorModule from './navigator' import webview from './webview' import websocket from './websocket' +import meta from './meta' export default [ geolocation, @@ -46,5 +47,6 @@ export default [ dom, globalEvent, navigatorModule, - webview + webview, + meta ] http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/214c6e33/html5/render/vue/modules/meta.js -- diff --git a/html5/render/vue/modules/meta.js b/html5/render/vue/modules/meta.js new file mode 100644 index 000..ed5f0ff --- /dev/null +++ b/html5/render/vue/modules/meta.js @@ -0,0 +1,36 @@ +/* + * 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. + */ + +const meta = { + /** + * setViewport + * Changing viewport width at runtime is not supported. Please use weex-viewport meta + * tag to specify your viewport in your html file. + */ + setViewport (options) { +console.warn(`[vue-render] meta.setViewport doesn't works as expected in web platform.` ++ ` Please use to specify your viewport width.`) + } +} + +export default { + init (weex) { +weex.registerModule('meta', meta) + } +} http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/214c6e33/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 index dc49562..5e84c86 100644
[08/47] incubator-weex git commit: * [html5] fix style scanning in uglified code bundle.
* [html5] fix style scanning in uglified code bundle. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/26646cf3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/26646cf3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/26646cf3 Branch: refs/heads/dev Commit: 26646cf383399a3b035786636087d079bdd3ef4b Parents: 214c6e3 Author: MrRaindropAuthored: Tue Aug 22 14:17:52 2017 +0800 Committer: MrRaindrop Committed: Tue Aug 22 14:17:52 2017 +0800 -- html5/render/vue/mixins/style.js | 18 -- 1 file changed, 8 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/26646cf3/html5/render/vue/mixins/style.js -- diff --git a/html5/render/vue/mixins/style.js b/html5/render/vue/mixins/style.js index 647119d..ba11ed5 100644 --- a/html5/render/vue/mixins/style.js +++ b/html5/render/vue/mixins/style.js @@ -67,16 +67,14 @@ function getIdentifiedBeforeCreate () { for (; thisHookIdx < len; thisHookIdx++) { if (hooks[thisHookIdx]._styleMixin) { break } } - for (let i = thisHookIdx + 1; i < len; i++) { -const func = hooks[i] -if (func.name === 'injectStyle') { - hooks[i] = function () { -// call the original injectStyle hook. -func.call(this) -// scan the new appended styleSheet. -extend(weex._styleMap, getHeadStyleMap()) -hooks[i] = func - } + if (thisHookIdx !== len - 1) { +const func = hooks[len - 1] +hooks[len - 1] = function () { + // call the original injectStyle hook. + func.call(this) + // scan the new appended styleSheet. + extend(weex._styleMap, getHeadStyleMap()) + hooks[len - 1] = func } } }
[14/47] 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/768b13ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/768b13ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/768b13ae Branch: refs/heads/master Commit: 768b13ae7d150b438bc1fc2fd392d38dd3a3a3a3 Parents: 316dfa2 53dfdbf Author: MrRaindropAuthored: Thu Aug 24 18:00:00 2017 +0800 Committer: MrRaindrop Committed: Thu Aug 24 18:00:00 2017 +0800 -- .../commons/adapter/FrescoImageComponent.java | 2 +- .../java/com/alibaba/weex/WXPageActivity.java | 9 +- android/sdk/libs/armeabi/libweexjsb.so | Bin 0 -> 22556 bytes android/sdk/libs/armeabi/libweexjsc.so | Bin 7570392 -> 325660 bytes android/sdk/libs/armeabi/libweexjss.so | Bin 0 -> 6754012 bytes .../java/com/taobao/weex/WXEnvironment.java |16 +- .../main/java/com/taobao/weex/WXSDKEngine.java | 3 +- .../java/com/taobao/weex/WXSDKInstance.java |38 +- .../taobao/weex/adapter/IDrawableLoader.java|11 +- .../java/com/taobao/weex/bridge/WXBridge.java |14 + .../com/taobao/weex/bridge/WXBridgeManager.java | 175 +- .../java/com/taobao/weex/common/IWXBridge.java | 2 + .../com/taobao/weex/common/WXErrorCode.java |14 +- .../taobao/weex/common/WXJSBridgeMsgType.java | 2 + .../com/taobao/weex/dom/action/Actions.java | 3 + .../weex/dom/action/ReloadPageAction.java |64 + .../taobao/weex/dom/action/TraceableAction.java | 1 + .../ui/component/AbstractEditComponent.java | 4 +- .../com/taobao/weex/ui/component/WXImage.java |75 +- .../com/taobao/weex/ui/component/WXText.java|52 +- .../ui/component/list/BasicListComponent.java | 7 +- .../com/taobao/weex/ui/view/WXImageView.java|16 +- .../com/taobao/weex/utils/ImageDrawable.java|17 +- .../com/taobao/weex/utils/TypefaceUtil.java | 8 + .../java/com/taobao/weex/utils/WXUtils.java |52 +- .../taobao/weex/bridge/WXWebsocketBridge.java | 6 + dangerfile.js | 1 + examples/vue/index.vue | 1 - examples/vue/transition.vue |75 + html5/frameworks/legacy/app/differ.js | 2 +- html5/frameworks/legacy/vm/directive.js | 2 +- .../complex/component-append-tree.output.js |22 + .../complex/component-append-tree.source.js |87 + html5/test/case/tester.js |19 + ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 5 +- .../WeexSDK/Sources/Component/WXListComponent.m |52 +- .../WeexSDK/Sources/Component/WXTextComponent.m |15 +- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h | 7 + .../WeexSDK/Sources/Module/WXAnimationModule.h | 4 - .../WeexSDK/Sources/Module/WXAnimationModule.m | 7 - ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 2 - ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 214 +- ios/sdk/WeexSDK/Sources/Utility/WXConvert.h | 1 + ios/sdk/WeexSDK/Sources/Utility/WXConvert.m |17 + .../Sources/View/WXComponent+ViewManagement.m | 1 - ios/sdk/WeexSDKTests/WXConvertTests.m |21 +- package.json| 5 +- packages/weex-js-framework/index.js | 43740 + packages/weex-js-framework/index.min.js | 9 +- pre-build/native-bundle-main.js |16 +- test/pages/components/switch-event.vue | 7 +- test/pages/include/wxc-desc.vue |27 +- test/pages/modules/vue_timer.vue| 8 +- test/scripts/components/text.test.js|61 +- test/scripts/dom.test.js| 5 +- test/scripts/modules/globalEvent.test.js|20 +- test/scripts/modules/modal-event.test.js| 2 +- test/scripts/modules/timer.test.js |51 +- test/scripts/util.js| 2 + 59 files changed, 23020 insertions(+), 22079 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/768b13ae/package.json --
[05/47] incubator-weex git commit: Revert "* [html5] release vue-render 0.12.2"
Revert "* [html5] release vue-render 0.12.2" This reverts commit bb844b90aa013ca946c6ffdce57a1281f5340374. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/486c6f4d Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/486c6f4d Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/486c6f4d Branch: refs/heads/dev Commit: 486c6f4dffcb9865739731c34fbabf276395dd16 Parents: bb844b9 Author: MrRaindropAuthored: Mon Aug 21 11:31:55 2017 +0800 Committer: MrRaindrop Committed: Mon Aug 21 11:31:55 2017 +0800 -- package.json | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/486c6f4d/package.json -- diff --git a/package.json b/package.json index 2148df1..4579a27 100644 --- a/package.json +++ b/package.json @@ -3,13 +3,8 @@ "version": "0.12.2", "subversion": { "browser": "0.5.0", -<<< HEAD "framework": "0.21.9", "vue-render": "0.12.3", -=== -"framework": "0.20.6", -"vue-render": "0.12.2", ->>> 850811c... * [html5] release vue-render 0.12.2 "transformer": ">=0.1.5 <0.5" }, "description": "A framework for building Mobile cross-platform UI",
[21/47] incubator-weex git commit: * [html5] fix return event of input component on android UC browser.
* [html5] fix return event of input component on android UC browser. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0ae0fcfa Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0ae0fcfa Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0ae0fcfa Branch: refs/heads/dev Commit: 0ae0fcfaf0ae3a2802a76f5aeb6d7b2c53978af5 Parents: 125f17d Author: MrRaindropAuthored: Mon Sep 4 18:20:46 2017 +0800 Committer: MrRaindrop Committed: Mon Sep 4 18:20:46 2017 +0800 -- html5/render/vue/mixins/input-common.js | 6 +++--- vue.html| 15 +-- 2 files changed, 12 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0ae0fcfa/html5/render/vue/mixins/input-common.js -- diff --git a/html5/render/vue/mixins/input-common.js b/html5/render/vue/mixins/input-common.js index f5fa18b..db86079 100644 --- a/html5/render/vue/mixins/input-common.js +++ b/html5/render/vue/mixins/input-common.js @@ -46,10 +46,10 @@ export default { const keyboardEvents = { 'keyup': function (ev) { const code = ev.keyCode -let key = ev.key +const key = ev.key if (code === 13) { - if (key.toLowerCase() === 'tab') { -key = 'next' + if (!key || key.toLowerCase() === 'tab') { +ev.key = 'next' } const rightKeyType = findEnterKeyType(customKeyType) ev.returnKeyType = rightKeyType http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0ae0fcfa/vue.html -- diff --git a/vue.html b/vue.html index aa8b353..f403a2f 100644 --- a/vue.html +++ b/vue.html @@ -44,21 +44,24 @@ opacity: 0.7; } - + + + + - + - - - -
[23/47] incubator-weex git commit: * [html5] update README
* [html5] update README Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/60ce6306 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/60ce6306 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/60ce6306 Branch: refs/heads/master Commit: 60ce6306fca87be38b10da56724149bbd7c592cf Parents: b8aae6f Author: MrRaindropAuthored: Tue Sep 5 10:56:21 2017 +0800 Committer: MrRaindrop Committed: Tue Sep 5 10:56:21 2017 +0800 -- html5/render/vue/README.md | 1 + packages/weex-vue-render/README.md | 1 + 2 files changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/60ce6306/html5/render/vue/README.md -- diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md index bcdd2de..2c915a6 100644 --- a/html5/render/vue/README.md +++ b/html5/render/vue/README.md @@ -145,6 +145,7 @@ vue: { 0.12.8 * optimize event binding. +* fix a-jump interception condition. ## component -> dom map http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/60ce6306/packages/weex-vue-render/README.md -- diff --git a/packages/weex-vue-render/README.md b/packages/weex-vue-render/README.md index bcdd2de..2c915a6 100644 --- a/packages/weex-vue-render/README.md +++ b/packages/weex-vue-render/README.md @@ -145,6 +145,7 @@ vue: { 0.12.8 * optimize event binding. +* fix a-jump interception condition. ## component -> dom map
[42/47] incubator-weex git commit: Merge branch 'html5-feature-offset-appear' into 0.16-dev-web
Merge branch 'html5-feature-offset-appear' 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/51ceff10 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/51ceff10 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/51ceff10 Branch: refs/heads/master Commit: 51ceff10aec22a99fbd2b006ec4cd34c555653bc Parents: 3c2ad1c 5554d51 Author: MrRaindropAuthored: Mon Sep 25 16:12:23 2017 +0800 Committer: MrRaindrop Committed: Mon Sep 25 16:12:23 2017 +0800 -- html5/render/vue/README.md| 4 + html5/render/vue/mixins/base.js | 4 +- html5/render/vue/utils/component.js | 160 ++--- package.json | 2 +- packages/weex-vue-render/README.md| 4 + packages/weex-vue-render/package.json | 2 +- 6 files changed, 112 insertions(+), 64 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/51ceff10/package.json --
[10/47] incubator-weex git commit: * [html5] add event manager to delegate events.
* [html5] add event manager to delegate events. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2504db58 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2504db58 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2504db58 Branch: refs/heads/dev Commit: 2504db58d113ae7964d07c934c4fa745b05c2f0c Parents: 52b0497 Author: MrRaindropAuthored: Thu Aug 24 14:52:22 2017 +0800 Committer: MrRaindrop Committed: Thu Aug 24 14:52:22 2017 +0800 -- html5/render/vue/components/a.js| 19 +-- html5/render/vue/components/div.js | 4 +- html5/render/vue/components/input.js| 7 +- html5/render/vue/components/scrollable/cell.js | 3 +- .../render/vue/components/scrollable/header.js | 5 +- html5/render/vue/components/scrollable/list.js | 2 +- .../components/scrollable/mixins/scrollable.js | 6 - .../vue/components/scrollable/scroller.js | 2 +- .../vue/components/scrollable/waterfall.js | 2 +- html5/render/vue/components/slider/index.js | 2 + html5/render/vue/config.js | 3 +- html5/render/vue/core/node.js | 117 ++- html5/render/vue/env/event-manager.js | 148 +++ html5/render/vue/index.js | 4 + html5/render/vue/lib/gesture.js | 2 +- html5/render/vue/utils/event.js | 16 ++ 16 files changed, 195 insertions(+), 147 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504db58/html5/render/vue/components/a.js -- diff --git a/html5/render/vue/components/a.js b/html5/render/vue/components/a.js index 1d8946f..ff4a59d 100644 --- a/html5/render/vue/components/a.js +++ b/html5/render/vue/components/a.js @@ -28,8 +28,7 @@ let cnt = 0 function getA (weex) { const { extractComponentStyle, -trimTextVNodes, -createEventMap +trimTextVNodes } = weex return { @@ -37,21 +36,6 @@ function getA (weex) { props: { href: String }, -mounted () { - const $el = this.$el - const id = $el.id - - /** - * if there is a child component already triggered a click handler, then - * this link jumping should be prevented. - */ - $el.addEventListener('click', (e) => { -const el = e._triggered && e._triggered.el -if (el && (el !== $el) && !el.querySelector(`#${id}`)) { - e.preventDefault() -} - }) -}, render (createElement) { /* istanbul ignore next */ // if (process.env.NODE_ENV === 'development') { @@ -64,7 +48,6 @@ function getA (weex) { 'id': `weex-a-${id}`, href: this.href }, -on: createEventMap(this), staticClass: 'weex-a weex-ct', staticStyle: extractComponentStyle(this) }, trimTextVNodes(this.$slots.default)) http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504db58/html5/render/vue/components/div.js -- diff --git a/html5/render/vue/components/div.js b/html5/render/vue/components/div.js index 8f05163..8b29a70 100644 --- a/html5/render/vue/components/div.js +++ b/html5/render/vue/components/div.js @@ -26,8 +26,7 @@ body > .weex-div { function getDiv (weex) { const { extractComponentStyle, -trimTextVNodes, -createEventMap +trimTextVNodes } = weex return { @@ -35,7 +34,6 @@ function getDiv (weex) { render (createElement) { return createElement('html:div', { attrs: { 'weex-type': 'div' }, -on: createEventMap(this), staticClass: 'weex-div weex-ct', staticStyle: extractComponentStyle(this) }, trimTextVNodes(this.$slots.default)) http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504db58/html5/render/vue/components/input.js -- diff --git a/html5/render/vue/components/input.js b/html5/render/vue/components/input.js index 0e8d466..b9d403d 100644 --- a/html5/render/vue/components/input.js +++ b/html5/render/vue/components/input.js @@ -21,8 +21,7 @@ * @fileOverview Input component. * Support v-model only if vue version is large than 2.2.0 */ -let extractComponentStyle, createEventMap -let extend, mapFormEvents, appendCss +let extractComponentStyle, mapFormEvents, appendCss const ID_PREFIX_PLACEHOLDER_COLOR = 'wipt_plc_' const ID_PREFIX_INPUT = 'wipt_' @@ -104,7 +103,7 @@ function getInput (weex) { if (!this._id) { this._id = idCount++ } - const events =
[22/47] incubator-weex git commit: * [html5] intercept the a-jump.
* [html5] intercept the a-jump. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b8aae6ff Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b8aae6ff Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b8aae6ff Branch: refs/heads/dev Commit: b8aae6ffc9e95677641046a7dd47b1e3650028e0 Parents: 0ae0fcf Author: MrRaindropAuthored: Mon Sep 4 18:34:22 2017 +0800 Committer: MrRaindrop Committed: Mon Sep 4 18:34:22 2017 +0800 -- html5/render/vue/env/event-manager.js | 38 +- 1 file changed, 17 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b8aae6ff/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 243daa0..06a00a3 100644 --- a/html5/render/vue/env/event-manager.js +++ b/html5/render/vue/env/event-manager.js @@ -27,20 +27,6 @@ const needPassive = ['touchmove'] const events = gestureEvents.concat(nativeEvents) -// /** -// * 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 -// } -// } - /** * if el is a `` element. * @param {HTMLElement} el @@ -82,7 +68,12 @@ function _init (doc) { _inited = true const _sp = supportsPassive() events.forEach(function (evt) { -const option = evt === 'click' +/** + * use capture for click handling, therefore there's a chance to handle + * it before any other listeners binding on document or document.body. + */ +const option = + evt === 'click' ? true : needPassive.indexOf(evt) > -1 && _sp ? { passive: true } : false doc.addEventListener(evt, function (e) { @@ -133,19 +124,24 @@ function _init (doc) { */ if (evtName === 'click' && isANode(elm)) { const href = elm.getAttribute('href') - const target = elm.getAttribute('target') disposed = true - if (target !== '_blank') { + /** + * Give the chance to the listeners binding on doc or doc.body for + * handling the a-jump. + * Should set a _should_intercept_a_jump function on window to test + * whether we should intercept the a-jump. + */ + if (window._should_intercept_a_jump && window._should_intercept_a_jump(elm)) { +// do nothing. leave it to the intercept handler. + } + else { if (!!href) { location.href = href } else { - console.warn('[weex-vue-render] If you want to use the A tag jump, set the href attribute') + console.warn('[vue-render] If you want to use the A tag jump, set the href attribute') } } - else { -// do nothing. - } } if (disposed) {
[11/47] incubator-weex git commit: * [html5] update slider version.
* [html5] update slider 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/3153784a Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3153784a Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3153784a Branch: refs/heads/master Commit: 3153784a73c12abd7dc8880d83ebd9de61c90366 Parents: 2504db5 Author: MrRaindropAuthored: Thu Aug 24 14:52:56 2017 +0800 Committer: MrRaindrop Committed: Thu Aug 24 14:52:56 2017 +0800 -- packages/weex-vue-plugins/weex-vue-slider/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3153784a/packages/weex-vue-plugins/weex-vue-slider/package.json -- diff --git a/packages/weex-vue-plugins/weex-vue-slider/package.json b/packages/weex-vue-plugins/weex-vue-slider/package.json index 427fdc2..1b0d8a5 100644 --- a/packages/weex-vue-plugins/weex-vue-slider/package.json +++ b/packages/weex-vue-plugins/weex-vue-slider/package.json @@ -1,6 +1,6 @@ { "name": "weex-vue-slider", - "version": "0.1.2", + "version": "0.1.3", "description": "Weex built-in 'slider' and 'slider-neighbor' component for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.js",
[28/47] incubator-weex git commit: * [html5] release v0.12.9 & fix clicking on none-vue element.
* [html5] release v0.12.9 & fix clicking on none-vue element. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/73d2f134 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/73d2f134 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/73d2f134 Branch: refs/heads/master Commit: 73d2f134fa14b2600983e6647ed15d0f4f8e2fb9 Parents: eb81e1c Author: MrRaindropAuthored: Mon Sep 11 16:15:59 2017 +0800 Committer: MrRaindrop Committed: Mon Sep 11 16:15:59 2017 +0800 -- html5/render/vue/README.md| 4 html5/render/vue/env/event-manager.js | 3 +++ package.json | 2 +- packages/weex-vue-render/README.md| 4 packages/weex-vue-render/package.json | 6 +- 5 files changed, 13 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/73d2f134/html5/render/vue/README.md -- diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md index 2c915a6..d27bdac 100644 --- a/html5/render/vue/README.md +++ b/html5/render/vue/README.md @@ -147,6 +147,10 @@ vue: { * optimize event binding. * fix a-jump interception condition. + 0.12.9 + +* event handling ignore none-vue element. + ## component -> dom map | component | dom element | children | note | http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/73d2f134/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 a72f9b6..914981d 100644 --- a/html5/render/vue/env/event-manager.js +++ b/html5/render/vue/env/event-manager.js @@ -81,6 +81,9 @@ function _init (doc) { let vm = el.__vue__ let disposed = false let evtName = e.type + if (!vm) { // not a vue component. +return + } /** * take full control of redirection of element. */ http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/73d2f134/package.json -- diff --git a/package.json b/package.json index 0b79cde..8346fc2 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "subversion": { "browser": "0.5.0", "framework": "0.21.11", -"vue-render": "0.12.8", +"vue-render": "0.12.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/73d2f134/packages/weex-vue-render/README.md -- diff --git a/packages/weex-vue-render/README.md b/packages/weex-vue-render/README.md index 2c915a6..d27bdac 100644 --- a/packages/weex-vue-render/README.md +++ b/packages/weex-vue-render/README.md @@ -147,6 +147,10 @@ vue: { * optimize event binding. * fix a-jump interception condition. + 0.12.9 + +* event handling ignore none-vue element. + ## component -> dom map | component | dom element | children | note | http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/73d2f134/packages/weex-vue-render/package.json -- diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json index b29cfdc..220744f 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.8", + "version": "0.12.9", "description": "Weex built-in components for Vue 2.x.", "license": "Apache-2.0", "main": "dist/index.common.js", @@ -24,9 +24,5 @@ "httpurl": "^0.1.1", "query-string": "^4.3.2", "inline-style-prefixer": "^3.0.2" - }, - "peerDependencies": { -"vue": "^2.0", -"vue-loader": "^12.0" } }
[20/47] incubator-weex git commit: Merge pull request #1 from erha19/html5-bugfix-event
Merge pull request #1 from erha19/html5-bugfix-event * [html5] add _triggered on event when evtName is click Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/125f17d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/125f17d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/125f17d3 Branch: refs/heads/master Commit: 125f17d3a2a7fc10f8645f189066d60d0f2668d9 Parents: 1ceb374 aeb55f3 Author: _HSAuthored: Mon Sep 4 17:59:18 2017 +0800 Committer: GitHub Committed: Mon Sep 4 17:59:18 2017 +0800 -- examples/vue/showcase/a-node-click.vue | 6 +++--- html5/render/vue/env/event-manager.js | 15 +++ 2 files changed, 14 insertions(+), 7 deletions(-) --
[02/47] 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/a105b22b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a105b22b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a105b22b Branch: refs/heads/master Commit: a105b22b15281fbf7b37ae2b326ee5a77a490da2 Parents: a672d2f 2a52a58 Author: MrRaindropAuthored: Mon Aug 21 11:04:34 2017 +0800 Committer: MrRaindrop Committed: Mon Aug 21 11:04:34 2017 +0800 -- HOW-TO-BUILD.md |17 +- SCRIPTS.md | 4 +- .../main/java/com/taobao/weex/WXSDKManager.java | 6 + .../java/com/taobao/weex/common/Constants.java | 1 + .../taobao/weex/dom/WXRecyclerDomObject.java| 9 + .../weex/dom/action/GetComponentRectAction.java |12 - .../weex/ui/component/ContentMeasurable.java|29 - .../taobao/weex/ui/component/WXComponent.java |14 +- .../taobao/weex/ui/component/WXScroller.java|16 +- .../com/taobao/weex/ui/component/WXSlider.java | 8 +- .../ui/component/list/BasicListComponent.java |69 +- .../weex/ui/view/WXBaseCircleIndicator.java | 3 +- .../taobao/weex/ui/view/WXCircleViewPager.java |57 +- .../ui/view/refresh/core/WXSwipeLayout.java |17 +- .../ui/view/refresh/wrapper/BaseBounceView.java | 2 +- build/build.js | 1 + build/config.js |21 +- dangerfile.js |27 +- examples/vanilla/index.js | 4 +- examples/vue/index.vue | 2 + html5/frameworks/vanilla/index.js |32 +- html5/render/browser/extend/api/storage.js | 4 +- html5/render/native/setup.js| 2 +- html5/runtime/api/config.js |37 + html5/runtime/api/init.js | 227 + html5/runtime/api/service.js|77 + html5/runtime/bridge/CallbackManager.js |58 + html5/runtime/bridge/Handler.js |91 + html5/runtime/bridge/Listener.js| 220 + html5/runtime/bridge/TaskCenter.js | 130 + html5/runtime/bridge/normalize.js |91 + html5/runtime/callback-manager.js |58 - html5/runtime/config.js |36 - html5/runtime/handler.js|91 - html5/runtime/index.js |11 +- html5/runtime/init.js | 215 - html5/runtime/listener.js | 227 - html5/runtime/normalize.js |98 - html5/runtime/service.js|77 - html5/runtime/task-center.js| 130 - html5/runtime/utils.js |54 + html5/runtime/vdom/Comment.js |43 + html5/runtime/vdom/Document.js | 188 + html5/runtime/vdom/Element.js | 454 + html5/runtime/vdom/Node.js |47 + html5/runtime/vdom/WeexElement.js |84 + html5/runtime/vdom/comment.js |47 - html5/runtime/vdom/directive.js |69 + html5/runtime/vdom/document.js | 194 - html5/runtime/vdom/element-types.js |83 - html5/runtime/vdom/element.js | 459 - html5/runtime/vdom/index.js |16 +- html5/runtime/vdom/node.js |49 - html5/runtime/vdom/operation.js | 8 - html5/test/case/prepare.js | 4 +- html5/test/unit/default/app/bundle.js |98 +- html5/test/unit/default/helper/document.js | 145 - html5/test/unit/default/runtime.js | 485 - html5/test/unit/default/vm/compiler.js | 614 - html5/test/unit/default/vm/directive.js | 279 - html5/test/unit/default/vm/dom-helper.js| 2 +- html5/test/unit/default/vm/vm.js| 2 +- html5/test/unit/runtime/legacy-framework.js | 353 + html5/test/unit/runtime/runner/helper.js|73 + html5/test/unit/runtime/runner/vanilla.js |59 + html5/test/unit/runtime/runner/vue.js |67 + html5/test/unit/runtime/vdom/directive.js | 101 + html5/test/unit/runtime/vdom/index.js | 639 + html5/test/unit/runtime/vdom/listener.js| 381 + html5/test/unit/runtime/vdom/node.js|39 + html5/test/unit/shared/BroadcastChannel.js | 7 - html5/test/unit/shared/arrayFrom.js | 5 - html5/test/unit/shared/index.js |
[47/51] [abbrv] incubator-weex git commit: Merge branch '0.16-dev' of https://github.com/gubaojian/incubator-weex into wip-us-0.16-dev
Merge branch '0.16-dev' of https://github.com/gubaojian/incubator-weex into wip-us-0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7d9f00d0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7d9f00d0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7d9f00d0 Branch: refs/heads/master Commit: 7d9f00d029ebd6a57a429ab940e754664bf9219c Parents: 9c541b8 73cc3b0 Author: acton393Authored: Mon Sep 25 23:30:50 2017 +0800 Committer: acton393 Committed: Mon Sep 25 23:30:50 2017 +0800 -- .../java/com/taobao/weex/ui/component/binding/Statements.java | 3 +++ 1 file changed, 3 insertions(+) --
[25/51] [abbrv] incubator-weex git commit: * [jsfm] release 0.22.4
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7ae75e3c/packages/weex-js-framework/index.min.js -- diff --git a/packages/weex-js-framework/index.min.js b/packages/weex-js-framework/index.min.js index 3f2c154..941b012 100644 --- a/packages/weex-js-framework/index.min.js +++ b/packages/weex-js-framework/index.min.js @@ -1 +1 @@ -(this.nativeLog||function(e){console.log(e)})("START JS FRAMEWORK 0.22.0, Build 2017-09-21 18:58."),this.getJSFMVersion=function(){return"0.22.0"};var global=this,process={env:{}},setTimeout=global.setTimeout;!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t():"function"==typeof define&?define(t):t()}(0,function(){"use strict";function e(e){return e&__esModule?e.default:e}function t(e,t){return t={exports:{}},e(t,t.exports),t.exports}function n(e){var t,n;this.promise=new e(function(e,r){if(void 0!==t||void 0!==n)throw TypeError("Bad Promise constructor");t=e,n=r}),this.resolve=qi(t),this.reject=qi(n)}function r(){Ra.forEach(function(e){var t=Ra.indexOf(e);Da[e]={},Ra.forEach(function(n){Ra.indexOf(n)<=t&&(Da[e][n]=!0)})})}function o(e){var t=global.WXEnvironment&||"log";return Da[t]&[t][e]}function i(e){return e.map(function(e){return e="[object object]"===Object.prototype.toString.call(e).toLowerCase()?JSON.stringi fy(e):String(e)})}function a(){if(void 0===setTimeout&&"function"==typeof Wa){var e={},t=0;global.setTimeout=function(n,r){e[++t]=n,Wa(t.toString(),r)},global.setTimeoutCallback=function(t){"function"==typeof e[t]&&(e[t](),delete e[t])}}}function s(){Object.freeze(Object),Object.freeze(Array),u(),Object.freeze(Array.prototype),Object.freeze(String.prototype),Object.freeze(Number.prototype),Object.freeze(Boolean.prototype),c(),Object.freeze(Date.prototype),Object.freeze(RegExp.prototype)}function u(){var e=Object.prototype,t="Object.prototype";l(e,"__defineGetter__",t),l(e,"__defineSetter__",t),l(e,"__lookupGetter__",t),l(e,"__lookupSetter__",t),l(e,"constructor",t),l(e,"hasOwnProperty",t),l(e,"isPrototypeOf",t),l(e,"propertyIsEnumerable",t),l(e,"toLocaleString",t),l(e,"toString",t),l(e,"valueOf",t),Object.seal(e)}function c(){var e=Error.prototype,t="Error.prototype";l(e,"name",t),l(e,"message",t),l(e,"toString",t),l(e,"constructor",t),Object.seal(e)}function l(e,t,n){if(e.hasOwnPro perty(t)){var r=e[t];Object.defineProperty(e,t,{get:function(){return r},set:function(r){if(this===e)throw Error("Cannot assign to read only property "+t+" of "+n);return Object.defineProperty(this,t,{value:r,writable:!0}),r}})}}function f(){return(Ba++).toString()}function p(e){var t=Object.prototype.toString.call(e);return t.substring(8,t.length-1)}function d(e){if("function"!=typeof btoa)return"";var t=Array.prototype.map.call(new Uint8Array(e),function(e){return String.fromCharCode(e)}).join("");return btoa(t)}function h(e){if("function"!=typeof atob)return new ArrayBuffer(0);var t=atob(e),n=new Uint8Array(t.length);return Array.prototype.forEach.call(t,function(e,t){n[t]=e.charCodeAt(0)}),n.buffer}function v(e){var t=p(e);switch(t){case"Undefined":case"Null":return"";case"RegExp":return e.toString();case"Date":return e.toISOString();case"Number":case"String":case"Boolean":case"Array":case"Object":return e;case"ArrayBuffer":return{"@type":"binary",dataType:t,base64:d(e)};case"In t8Array":case"Uint8Array":case"Uint8ClampedArray":case"Int16Array":case"Uint16Array":case"Int32Array":case"Uint32Array":case"Float32Array":case"Float64Array":return{"@type":"binary",dataType:t,base64:d(e.buffer)};default:return JSON.stringify(e)}}function y(e){if("Object"===p(e)){if(e["@type"]&&"binary"===e["@type"])return h(e.base64||"");var t={};for(var n in e)t[n]=y(e[n]);return t}return"Array"===p(e)?e.map(y):e}function m(e,t){e&&(Ua[e]=t)}function _(e){return Ua[e]}function g(e){delete Ua[e]}function b(e){var t=Ua[e];return t&?t.taskCenter:null}function w(e,t,n){var r=e.documentElement;if(!(r.pureChildren.length>0||t.parentNode)){var o=r.children,i=o.indexOf(n);i<0?o.push(t):o.splice(i,0,t),1===t.nodeType?("body"===t.role?(t.docId=e.id,t.ownerDocument=e,t.parentNode=r,C(t,r)):(t.children.forEach(function(e){e.parentNode=t}),x(e,t),t.docId=e.id,t.ownerDocument=e,C(t,r),delete e.nodeMap[t.nodeId]),r.pureChildren.push(t),E(e,t)):(t.parentNode=r,e.nodeMap[t.ref]=t)}}fu nction E(e,t){var n=t.toJSON(),r=n.children;delete n.children;var o=e.taskCenter.send("dom",{action:"createBody"},[n]);return r&(function(t){o=e.taskCenter.send("dom",{action:"addElement"},[n.ref,t,-1])}),o}function x(e,t){t.role="body",t.depth=1,delete e.nodeMap[t.nodeId],t.ref="_root",e.nodeMap._root=t,e.body=t}function C(e,t){e.parentNode=t,t.docId&&(e.docId=t.docId,e.ownerDocument=t.ownerDocument,e.ownerDocument.nodeMap[e.nodeId]=e,e.depth=t.depth+1),e.children.forEach(function(t){C(t,e)})}function O(e){for(;e;){if(1===e.nodeType)return e;e=e.nextSibling}}function
[41/51] [abbrv] incubator-weex git commit: resume true
resume true Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/db27e40f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/db27e40f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/db27e40f Branch: refs/heads/master Commit: db27e40f7f41bfedbf583cdb18d5a2afa852e3b8 Parents: eaf537e Author: jianbai.gbjAuthored: Mon Sep 25 22:14:59 2017 +0800 Committer: jianbai.gbj Committed: Mon Sep 25 22:14:59 2017 +0800 -- .../java/com/taobao/weex/ui/component/binding/Statements.java | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/db27e40f/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Statements.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Statements.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Statements.java index 6f4e3cd..24e38ce 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Statements.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Statements.java @@ -226,6 +226,9 @@ public class Statements { if(!Operators.isTrue(vif.execute(context))){ component.setWaste(true); return 1; +}else{ +component.setWaste(false); +return 1; } } }
[01/51] [abbrv] incubator-weex git commit: * [jsfm] add miss jsfm version
Repository: incubator-weex Updated Branches: refs/heads/master 7ee01070b -> 2513b0f43 http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/73dbdf07/pre-build/native-bundle-main.js -- diff --git a/pre-build/native-bundle-main.js b/pre-build/native-bundle-main.js index c737167..70f4b57 100644 --- a/pre-build/native-bundle-main.js +++ b/pre-build/native-bundle-main.js @@ -1,8 +1,8 @@ -(this.nativeLog||function(e){console.log(e)})("START JS FRAMEWORK 0.22.2, Build 2017-09-21 15:46."),this.getJSFMVersion=function(){return"0.22.2"};var global=this,process={env:{}},setTimeout=global.setTimeout;!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t():"function"==typeof define&?define(t):t()}(0,function(){"use strict";function e(e){Hn.Document=e.Document,Hn.Element=e.Element,Hn.Comment=e.Comment,Hn.sendTasks=e.sendTasks}function t(e,t,n,r,o){void 0===n&&(n={}),void 0===r&&(r={}),void 0===o&&(o={});var i=new Hn.Document(e,n.bundleUrl),a={},s={id:e,data:r,document:i,callbacks:a},u=0;i.addCallback=function(e){return u++,a[u]=e,u},i.handleCallback=function(e,t,n){var r=a[e];return n& a[e],r(t)},Gn[e]=s;var c=Object.assign({Document:Hn.Document,Element:Hn.Element,Comment:Hn.Comment,sendTasks:function(t){return Hn.sendTasks(e,t,-1)},options:n,document:i},o),l=[],f=[];for(var p in c)l.push(p),f.push(c[p]);return l.push(t),(new(Function.prototy pe.bind.apply(Function,[null].concat(l.apply(void 0,f),Hn.sendTasks(e,[{module:"dom",method:"createFinish",args:[]}],-1),s}function n(e){delete Gn[e]}function r(e){return Gn[e].document.body.toJSON()}function o(e,t){var n={fireEvent:function(e,t,n,r,o){var i=Gn[e],a=i.document,s=a.getRef(t);return a.fireEvent(s,n,r,o)},callback:function(e,t,n,r){return Gn[e].document.handleCallback(t,n,r)}};if((Gn[e]||{}).document&(t)){var r=[];return t.forEach(function(t){var o=n[t.method],i=[].concat(t.args);"function"==typeof o&&(i.unshift(e),r.push(o.apply(void 0,i)))}),r}}function i(e){return e&__esModule?e.default:e}function a(e,t){return t={exports:{}},e(t,t.exports),t.exports}function s(e){console.warn("[JS Framework] Vm#$ is deprecated, please use Vm#$vm instead");var t=this._ids[e];if(t)return t.vm}function u(e){var t=this._ids[e];if(t)return t.el}function c(e){var t=this._ids[e];if(t)return t.vm}function l(e){return this._app.differ.then(function(){e()})}function f(e, t){console.warn("[JS Framework] Vm#$scrollTo is deprecated, please use \"require('@weex-module/dom').scrollTo(el, options)\" instead");var n=this.$el(e);if(n){this._app.requireModule("dom").scrollToElement(n.ref,{offset:t})}}function p(e,t,n){var r=this,o=this.$el(e);if(o&&){this._app.requireModule("animation").transition(o.ref,t,function(){for(var e=[],i=arguments.length;i--;)e[i]=arguments[i];r._setStyle(o,t.styles),n&(void 0,e)})}}function d(e){var t=this._app.options;return"function"==typeof e&&(console.warn("[JS Framework] the callback of Vm#$getConfig(callback) is deprecated, this api now can directly RETURN config info."),e(t)),t}function h(e,t){console.warn("[JS Framework] Vm#$sendHttp is deprecated, please use \"require('@weex-module/stream').sendHttp(params, callback)\" instead"),this._app.requireModule("stream").sendHttp(e,t)}function v(e){console.warn("[JS Framework] Vm#$openURL is deprecated, please use \"require('@weex-module/event').openURL(url)\" i nstead"),this._app.requireModule("event").openURL(e)}function y(e){console.warn("[JS Framework] Vm#$setTitle is deprecated, please use \"require('@weex-module/pageInfo').setTitle(title)\" instead"),this._app.requireModule("pageInfo").setTitle(e)}function m(e,t){for(var n=[],r=arguments.length-2;r-- >0;)n[r]=arguments[r+2];console.warn("[JS Framework] Vm#$call is deprecated, please use \"require('@weex-module/moduleName')\" instead");var o=this._app.requireModule(e);o&[t]&[t].apply(o,n)}function _(e){for(var t=[],n=arguments.length-1;n-- >0;)t[n]=arguments[n+1];if("function"==typeof Object.assign)Object.assign.apply(Object,[e].concat(t));else{var r=t.shift();for(var o in r)e[o]=r[o];t.length&&_.apply(void 0,[e].concat(t))}return e}function g(e,t,n,r){Object.defineProperty(e,t,{value:n,enumerable:!!r,writable:!0,configurable:!0})}function b(e,t){if(e.length){var n=e.indexOf(t);if(n>-1)return e.splice(n,1)}}function w(e,t){return hr.call(e,t)}function x(e,t){return function(n){var r=arguments.length;return r?r>1?e.apply(t,arguments):e.call(t,n):e.call(t)}}function E(e){return null!==e&&"object"==typeof e}function O(e){return vr.call(e)===yr}function S(e){var t=(e+"").charCodeAt(0);return 36===t||95===t}function C(){return"object"==typeof nativeSet?nativeSet.create():new Jn}function k(e){var t=Object.prototype.toString.call(e);return t.substring(8,t.length-1).toLowerCase()}function j(e){return e.replace(_r,"").replace(gr,"")}function A(e){return e.replace(wr,"")}function
[40/51] [abbrv] incubator-weex git commit: Merge branch 'ios-feature-layoutanimation-0.16dev' of https://github.com/doumafang/incubator-weex into wip-us-0.16-dev
Merge branch 'ios-feature-layoutanimation-0.16dev' of https://github.com/doumafang/incubator-weex into wip-us-0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/28ed1227 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/28ed1227 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/28ed1227 Branch: refs/heads/master Commit: 28ed12278c1b907f17d4985aaf614a007f9dd9ad Parents: 4b5672d 2985c58 Author: acton393Authored: Mon Sep 25 22:13:59 2017 +0800 Committer: acton393 Committed: Mon Sep 25 22:13:59 2017 +0800 -- .../Sources/Display/WXComponent+Display.m | 14 +--- .../Sources/Manager/WXComponentManager.m| 4 +-- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 38 +--- ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 16 + ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 24 + 5 files changed, 59 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/28ed1227/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/28ed1227/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/28ed1227/ios/sdk/WeexSDK/Sources/Model/WXComponent.m -- diff --cc ios/sdk/WeexSDK/Sources/Model/WXComponent.m index 2bad1c2,13affb8..1df3d93 --- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m +++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m @@@ -85,10 -85,8 +85,9 @@@ _attributes = attributes ? [NSMutableDictionary dictionaryWithDictionary:attributes] : [NSMutableDictionary dictionary]; _events = events ? [NSMutableArray arrayWithArray:events] : [NSMutableArray array]; _subcomponents = [NSMutableArray array]; - _absolutePosition = CGPointMake(NAN, NAN); +_displayType = WXDisplayTypeBlock; _isNeedJoinLayoutSystem = YES; _isLayoutDirty = YES; _isViewFrameSyncWithCalculated = YES;
[43/51] [abbrv] incubator-weex git commit: Merge branch '0.16-dev' of https://github.com/gubaojian/incubator-weex into wip-us-0.16-dev
Merge branch '0.16-dev' of https://github.com/gubaojian/incubator-weex into wip-us-0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/371d0c0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/371d0c0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/371d0c0c Branch: refs/heads/master Commit: 371d0c0c2f86366cf0b2e8cc1fafdf93873f2ada Parents: 28ed122 db27e40 Author: acton393Authored: Mon Sep 25 22:27:41 2017 +0800 Committer: acton393 Committed: Mon Sep 25 22:27:41 2017 +0800 -- .../java/com/taobao/weex/ui/component/binding/Statements.java | 3 +++ .../weex/ui/component/list/template/WXRecyclerTemplateList.java | 3 +++ 2 files changed, 6 insertions(+) --
[17/51] [abbrv] incubator-weex git commit: * [ios] fix pr bug about filter crash
* [ios] fix pr bug about filter crash Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ac1abc9a Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ac1abc9a Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ac1abc9a Branch: refs/heads/master Commit: ac1abc9a1a941c14df143a983ad618b331504479 Parents: 2252798 Author: doumafangAuthored: Fri Sep 22 13:57:41 2017 +0800 Committer: doumafang Committed: Fri Sep 22 13:57:41 2017 +0800 -- ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ac1abc9a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m -- diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m index c53d5f1..a1dd9b7 100644 --- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m +++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m @@ -436,11 +436,11 @@ static css_node_t * rootNodeGetChild(void *context, int i) NSMutableDictionary *normalStyles = [NSMutableDictionary new]; NSMutableArray *resetStyles = [NSMutableArray new]; [self filterStyles:styles normalStyles:normalStyles resetStyles:resetStyles]; -[component _updateStylesOnMainThread:[normalStyles copy] resetStyles:resetStyles]; +[component _updateStylesOnMainThread:normalStyles resetStyles:resetStyles]; [component readyToRender]; WXPerformBlockOnComponentThread(^{ -[component _updateStylesOnComponentThread:[normalStyles copy] resetStyles:resetStyles isUpdateStyles:isUpdateStyles]; +[component _updateStylesOnComponentThread:normalStyles resetStyles:resetStyles isUpdateStyles:isUpdateStyles]; }); }
[23/51] [abbrv] incubator-weex git commit: Merge remote-tracking branch 'upstream/pr685' into apache-0.16-dev
Merge remote-tracking branch 'upstream/pr685' into apache-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/0e9760ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0e9760ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0e9760ac Branch: refs/heads/master Commit: 0e9760ac6a760efacfe57eb7d426ab347584ce9c Parents: cfc4393 7b2150a Author: misakuoAuthored: Mon Sep 25 11:11:30 2017 +0800 Committer: misakuo Committed: Mon Sep 25 11:11:30 2017 +0800 -- .../java/com/taobao/weex/common/Constants.java | 1 + .../taobao/weex/ui/component/WXComponent.java | 63 ++- .../com/taobao/weex/utils/BoxShadowUtil.java| 510 +++ .../com/taobao/weex/utils/WXResourceUtils.java | 4 + test/screenshot/border-android.png | Bin 162929 -> 0 bytes 5 files changed, 575 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0e9760ac/android/sdk/src/main/java/com/taobao/weex/common/Constants.java -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0e9760ac/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java --
[06/51] [abbrv] incubator-weex git commit: Merge remote-tracking branch 'origin/0.16-dev' into 0.16-dev-template-list
Merge remote-tracking branch 'origin/0.16-dev' into 0.16-dev-template-list Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9172cdde Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9172cdde Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9172cdde Branch: refs/heads/master Commit: 9172cdde0bbd250cc4c10418454499fe893c6e8d Parents: ff0af4e 5a08279 Author: jianbai.gbjAuthored: Thu Sep 21 22:09:52 2017 +0800 Committer: jianbai.gbj Committed: Thu Sep 21 22:09:52 2017 +0800 -- .travis.yml | 4 - doc/source/cn/guide/index.md| 9 +- doc/source/cn/guide/set-up-env.md | 4 +- doc/source/cn/guide/tools/toolkit.md| 2 +- .../cn/references/advanced/extend-to-android.md | 21 +- doc/source/cn/references/common-style.md| 1 + doc/source/cn/references/components/text.md | 6 +- doc/source/cn/references/modules/animation.md | 2 + doc/source/cn/references/modules/dom.md | 2 +- doc/source/guide/index.md | 4 +- doc/source/guide/set-up-env.md | 6 +- doc/source/guide/tools/toolkit.md | 5 +- doc/source/references/common-style.md | 1 + doc/source/references/components/text.md| 8 +- doc/source/references/modules/animation.md | 3 +- doc/source/references/modules/dom.md| 2 +- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 109 ++- .../Component/RecycleList/WXCellSlotComponent.h | 32 + .../Component/RecycleList/WXCellSlotComponent.m | 93 ++ .../RecycleList/WXComponent+DataBinding.h | 31 + .../RecycleList/WXComponent+DataBinding.mm | 451 + .../Component/RecycleList/WXJSASTParser.h | 100 ++ .../Component/RecycleList/WXJSASTParser.mm | 919 +++ .../RecycleList/WXRecycleListComponent.h| 25 + .../RecycleList/WXRecycleListComponent.m| 459 + .../RecycleList/WXRecycleListDataManager.h | 34 + .../RecycleList/WXRecycleListDataManager.m | 71 ++ .../Component/RecycleList/WXRecycleListLayout.h | 32 + .../Component/RecycleList/WXRecycleListLayout.m | 113 +++ .../RecycleList/WXRecycleListTemplateManager.h | 33 + .../RecycleList/WXRecycleListTemplateManager.m | 94 ++ .../RecycleList/WXRecycleListUpdateManager.h| 50 + .../RecycleList/WXRecycleListUpdateManager.m| 262 ++ .../Recycler/WXSectionDataController.m | 2 +- .../WeexSDK/Sources/Component/WXCellComponent.m | 4 +- .../Sources/Component/WXComponent_internal.h| 28 + .../Sources/Component/WXImageComponent.m| 7 +- .../Sources/Component/WXScrollerComponent.h | 2 + .../Sources/Component/WXScrollerComponent.m | 13 +- .../WeexSDK/Sources/Component/WXWebComponent.m | 1 + ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m| 4 + .../WeexSDK/Sources/Events/WXComponent+Events.m | 5 +- .../WeexSDK/Sources/Manager/WXBridgeManager.h | 13 +- .../WeexSDK/Sources/Manager/WXBridgeManager.m | 10 + .../Sources/Manager/WXComponentFactory.h| 12 + .../Sources/Manager/WXComponentFactory.m| 30 +- .../Sources/Manager/WXComponentManager.h| 13 +- .../Sources/Manager/WXComponentManager.m| 147 ++- ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 19 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 83 ++ ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.h| 23 +- ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.m| 86 +- ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 20 +- .../Sources/View/WXComponent+ViewManagement.m | 4 + ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 + 55 files changed, 3438 insertions(+), 77 deletions(-) --
[38/51] [abbrv] incubator-weex git commit: * [ios] add js contentLength and md5 value when js runtime exception
* [ios] add js contentLength and md5 value when js runtime exception Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ca5ad34f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ca5ad34f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ca5ad34f Branch: refs/heads/master Commit: ca5ad34f11c5a583ac149e16a16e0040b5e15a9c Parents: 0753f50 Author: acton393Authored: Mon Sep 25 21:39:24 2017 +0800 Committer: acton393 Committed: Mon Sep 25 21:39:24 2017 +0800 -- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 5 + 2 files changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ca5ad34f/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m -- diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m index fb07935..ec81b22 100644 --- a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m +++ b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m @@ -158,7 +158,7 @@ id jsExceptionHandler = [WXHandlerFactory handlerForProtocol:@protocol(WXJSExceptionProtocol)]; WXSDKInstance *instance = [WXSDKEngine topInstance]; -WXJSExceptionInfo * jsExceptionInfo = [[WXJSExceptionInfo alloc] initWithInstanceId:instance.instanceId bundleUrl:[instance.scriptURL absoluteString] errorCode:[NSString stringWithFormat:@"%d", WX_ERR_JS_EXECUTE] functionName:@"" exception:[NSString stringWithFormat:@"[%@:%@] %@\n%@",exception[@"line"], exception[@"column"],[exception toString], exception[@"stack"]] userInfo:nil]; +WXJSExceptionInfo * jsExceptionInfo = [[WXJSExceptionInfo alloc] initWithInstanceId:instance.instanceId bundleUrl:[instance.scriptURL absoluteString] errorCode:[NSString stringWithFormat:@"%d", WX_ERR_JS_EXECUTE] functionName:@"" exception:[NSString stringWithFormat:@"[%@:%@] %@\n%@ \njsMainBundleStringContentLength:%@\njsMainBundleStringContentMd5:%@",exception[@"line"], exception[@"column"],[exception toString], exception[@"stack"], instance.userInfo[@"jsMainBundleStringContentLength"]?:@"",instance.userInfo[@"jsMainBundleStringContentMd5"]?:@""] userInfo:nil]; if ([jsExceptionHandler respondsToSelector:@selector(onJSException:)]) { [jsExceptionHandler onJSException:jsExceptionInfo]; } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ca5ad34f/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m -- diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m index 2afcf46..8fc2511 100644 --- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m +++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m @@ -300,6 +300,11 @@ typedef enum : NSUInteger { WX_MONITOR_FAIL_ON_PAGE(WXMTJSDownload, WX_ERR_JSBUNDLE_STRING_CONVERT, @"data converting to string failed.", strongSelf.pageName) return; } +if (!strongSelf.userInfo) { +strongSelf.userInfo = [NSMutableDictionary new]; +} +strongSelf.userInfo[@"jsMainBundleStringContentLength"] = @([jsBundleString length]); +strongSelf.userInfo[@"jsMainBundleStringContentMd5"] = [WXUtility md5:jsBundleString]; WX_MONITOR_SUCCESS_ON_PAGE(WXMTJSDownload, strongSelf.pageName); WX_MONITOR_INSTANCE_PERF_END(WXPTJSDownload, strongSelf);
[09/51] [abbrv] incubator-weex git commit: + [android] support the box-shadow attribute on android 4.3 or higher
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0e072a4/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m -- diff --git a/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m b/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m index 5d22939..52af2ba 100644 --- a/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m +++ b/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m @@ -331,13 +331,13 @@ WXRadii *radii = borderRect.radii; CGFloat topLeft = radii.topLeft, topRight = radii.topRight, bottomLeft = radii.bottomLeft, bottomRight = radii.bottomRight; +CGContextSetAlpha(context, _opacity); // fill background color if (_backgroundColor && CGColorGetAlpha(_backgroundColor.CGColor) > 0) { CGContextSetFillColorWithColor(context, _backgroundColor.CGColor); UIBezierPath *bezierPath = [UIBezierPath wx_bezierPathWithRoundedRect:rect topLeft:topLeft topRight:topRight bottomLeft:bottomLeft bottomRight:bottomRight]; [bezierPath fill]; } - // Top if (_borderTopWidth > 0) { if(_borderTopStyle == WXBorderStyleDashed || _borderTopStyle == WXBorderStyleDotted){ http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0e072a4/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m -- diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m index c2db44a..cc9373b 100644 --- a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m +++ b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m @@ -28,7 +28,6 @@ #import "WXResourceRequestHandlerDefaultImpl.h" #import "WXNavigationDefaultImpl.h" #import "WXURLRewriteDefaultImpl.h" -#import "WXWebSocketDefaultImpl.h" #import "WXSDKManager.h" #import "WXSDKError.h" @@ -168,9 +167,6 @@ [self registerHandler:[WXResourceRequestHandlerDefaultImpl new] withProtocol:@protocol(WXResourceRequestHandler)]; [self registerHandler:[WXNavigationDefaultImpl new] withProtocol:@protocol(WXNavigationProtocol)]; [self registerHandler:[WXURLRewriteDefaultImpl new] withProtocol:@protocol(WXURLRewriteProtocol)]; -if (NSClassFromString(@"WXWebSocketDefaultImpl")) { -[self registerHandler:[NSClassFromString(@"WXWebSocketDefaultImpl") new] withProtocol:NSProtocolFromString(@"WXWebSocketHandler")]; -} } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0e072a4/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m -- diff --git a/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m b/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m index d3dceb0..8eb799b 100644 --- a/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m +++ b/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m @@ -271,9 +271,12 @@ if ([removeEventName isEqualToString:@#eventName]) {\ { if (_tapGesture) { _tapGesture.delegate = nil; -if ([self.view.gestureRecognizers containsObject:_tapGesture]) { -[self.view removeGestureRecognizer:_tapGesture]; +if ([self isViewLoaded]) { +if ([self.view.gestureRecognizers containsObject:_tapGesture]) { +[self.view removeGestureRecognizer:_tapGesture]; +} } +[_tapGesture removeTarget:self action:@selector(onClick:)]; _tapGesture = nil; } } @@ -345,9 +348,12 @@ if ([removeEventName isEqualToString:@#eventName]) {\ for (UISwipeGestureRecognizer *recognizer in _swipeGestures) { recognizer.delegate = nil; -if ([[self.view gestureRecognizers] containsObject:recognizer]) { -[self.view removeGestureRecognizer:recognizer]; +if([self isViewLoaded]) { +if ([[self.view gestureRecognizers] containsObject:recognizer]) { +[self.view removeGestureRecognizer:recognizer]; +} } +[recognizer removeTarget:self action:@selector(onSwipe:)]; } _swipeGestures = nil; } @@ -400,10 +406,12 @@ if ([removeEventName isEqualToString:@#eventName]) {\ { if (_longPressGesture) { _longPressGesture.delegate = nil; - -if([[self.view gestureRecognizers] containsObject:_longPressGesture]) { -[self.view removeGestureRecognizer:_longPressGesture]; +if ([self isViewLoaded]) { +if([[self.view gestureRecognizers] containsObject:_longPressGesture]) { +[self.view removeGestureRecognizer:_longPressGesture]; +} } +[_longPressGesture removeTarget:self action:@selector(onLongPress:)]; _longPressGesture = nil; } } @@ -550,11 +558,14 @@ if ([removeEventName isEqualToString:@#eventName]) {\ && !_listenHorizontalPan && !_listenVerticalPan ) { -if ([[self.view gestureRecognizers]
[15/51] [abbrv] incubator-weex git commit: Revert "+ [android] support the box-shadow attribute on android 4.3 or higher"
Revert "+ [android] support the box-shadow attribute on android 4.3 or higher" This reverts commit b0e072a4211d2b39cc3618c753a50efc3647cf23. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7b2150a5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7b2150a5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7b2150a5 Branch: refs/heads/master Commit: 7b2150a55b63b8150d4394b8cef8e3c38495b6c7 Parents: b0e072a Author: misakuoAuthored: Fri Sep 22 10:49:41 2017 +0800 Committer: misakuo Committed: Fri Sep 22 10:49:41 2017 +0800 -- .travis.yml | 47 +- POSSIBLE-NOTICES-FOR-BIN-DIST |5 +- WeexSDK.podspec |2 + android/build.gradle| 13 +- .../gradle/wrapper/gradle-wrapper.properties|2 +- .../alibaba/weex/benchmark/BenchmarkTest.java |6 +- android/sdk/libs/armeabi/libweexjsc.so | Bin 325660 -> 325660 bytes android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754012 bytes .../java/com/taobao/weex/WXSDKInstance.java | 102 +- .../appfram/websocket/WebSocketCloseCodes.java |2 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 27 +- .../java/com/taobao/weex/common/Constants.java |2 - .../com/taobao/weex/dom/ImmutableDomObject.java | 21 +- .../main/java/com/taobao/weex/dom/WXStyle.java | 17 + .../com/taobao/weex/dom/WXTextDomObject.java| 11 +- .../com/taobao/weex/dom/action/Actions.java |4 +- .../weex/dom/action/CreateBodyAction.java | 12 +- .../weex/dom/action/ReloadPageAction.java |6 +- .../taobao/weex/ui/component/WXComponent.java | 143 +- .../com/taobao/weex/ui/component/WXDiv.java | 74 +- .../com/taobao/weex/ui/component/WXSlider.java |4 +- .../com/taobao/weex/ui/component/WXText.java| 65 +- .../taobao/weex/ui/component/WXVContainer.java | 44 +- .../taobao/weex/ui/component/list/WXCell.java | 61 +- .../weex/ui/component/list/WXListComponent.java | 53 +- .../com/taobao/weex/ui/flat/FlatComponent.java | 33 - .../com/taobao/weex/ui/flat/FlatGUIContext.java | 146 -- .../taobao/weex/ui/flat/WidgetContainer.java| 93 - .../weex/ui/flat/widget/AndroidViewWidget.java | 76 - .../taobao/weex/ui/flat/widget/BaseWidget.java | 130 -- .../taobao/weex/ui/flat/widget/TextWidget.java | 49 - .../com/taobao/weex/ui/flat/widget/Widget.java | 51 - .../taobao/weex/ui/flat/widget/WidgetGroup.java | 54 - .../taobao/weex/ui/module/WXTimerModule.java|9 +- .../weex/ui/view/WXBaseCircleIndicator.java | 131 +- .../com/taobao/weex/ui/view/WXFrameLayout.java | 53 +- .../weex/ui/view/border/BorderCorner.java | 37 +- .../taobao/weex/ui/view/border/BorderUtil.java | 26 + .../weex/ui/view/border/BottomLeftCorner.java |7 +- .../weex/ui/view/border/BottomRightCorner.java |7 +- .../weex/ui/view/border/TopLeftCorner.java |7 +- .../weex/ui/view/border/TopRightCorner.java |7 +- .../com/taobao/weex/utils/FunctionParser.java |6 + .../java/com/taobao/weex/utils/LogLevel.java|4 +- .../java/com/taobao/weex/utils/OsVersion.java |2 +- .../main/java/com/taobao/weex/utils/Trace.java |4 +- .../java/com/taobao/weex/utils/WXLogUtils.java | 14 - .../java/com/taobao/weex/utils/WXViewUtils.java | 31 - .../com/taobao/weex/ui/component/WXDivTest.java | 12 +- .../taobao/weex/ui/component/WXTextTest.java| 18 +- .../weex/ui/module/WXTimerModuleTest.java | 45 +- dangerfile-android.js | 108 -- dangerfile-ios.js | 107 -- dangerfile-jsfm.js | 105 - ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 42 + .../Sources/Bridge/WXDebugLoggerBridge.h| 26 + .../Sources/Bridge/WXDebugLoggerBridge.m| 213 +++ ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 89 +- .../Component/Recycler/WXMultiColumnLayout.m| 32 +- .../Sources/Component/WXComponent_internal.h|2 +- .../Sources/Component/WXImageComponent.m| 34 +- .../WeexSDK/Sources/Component/WXTextComponent.m |6 +- .../Sources/Display/WXComponent+Display.m |2 +- ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m|4 + .../WeexSDK/Sources/Events/WXComponent+Events.m | 35 +- .../Sources/Manager/WXComponentManager.m|9 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 30 +- .../WeexSDK/Sources/Module/WXAnimationModule.m | 26 +- .../WeexSDK/Sources/Module/WXModalUIModule.m|4 +- .../WeexSDK/Sources/Module/WXWebSocketModule.m |1 + ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 24 +-
[30/51] [abbrv] incubator-weex git commit: * [ios] try to fix remove gesture crash
* [ios] try to fix remove gesture crash Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8fff8cd8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8fff8cd8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8fff8cd8 Branch: refs/heads/master Commit: 8fff8cd813ee3bf269c4bc527261399d1536d8b4 Parents: 0e9760a Author: acton393Authored: Mon Sep 25 14:46:40 2017 +0800 Committer: acton393 Committed: Mon Sep 25 14:46:40 2017 +0800 -- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 21 - 1 file changed, 20 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8fff8cd8/ios/sdk/WeexSDK/Sources/Model/WXComponent.m -- diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m index 2bad1c2..9a2966a 100644 --- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m +++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m @@ -38,6 +38,7 @@ #import "WXComponent+PseudoClassManagement.h" #import "WXComponent+BoxShadow.h" #import "WXTracingManager.h" +#import "WXComponent+Events.h" #pragma clang diagnostic ignored "-Wincomplete-implementation" #pragma clang diagnostic ignored "-Wobjc-protocol-method-implementation" @@ -190,7 +191,25 @@ { free_css_node(_cssNode); -[self _removeAllEvents]; +//[self _removeAllEvents]; +// remove all gesture and all +if (_tapGesture) { +[_tapGesture removeTarget:nil action:NULL]; +} +if ([_swipeGestures count]) { +for (UISwipeGestureRecognizer *swipeGestures in _swipeGestures) { +[swipeGestures removeTarget:nil action:NULL]; +} +} + +if (_longPressGesture) { +[_longPressGesture removeTarget:nil action:NULL]; +} + +if (_panGesture) { +[_panGesture removeTarget:nil action:NULL]; +} + if (_positionType == WXPositionTypeFixed) { [self.weexInstance.componentManager removeFixedComponent:self]; }
[08/51] [abbrv] incubator-weex git commit: + [android] support the box-shadow attribute on android 4.3 or higher
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0e072a4/ios/sdk/WeexSDK/dependency/SRWebSocket.m -- diff --git a/ios/sdk/WeexSDK/dependency/SRWebSocket.m b/ios/sdk/WeexSDK/dependency/SRWebSocket.m deleted file mode 100644 index 03ad557..000 --- a/ios/sdk/WeexSDK/dependency/SRWebSocket.m +++ /dev/null @@ -1,1806 +0,0 @@ -// -// Copyright 2012 Square Inc. -// Portions Copyright (c) 2016-present, Facebook, Inc. -// -// All rights reserved. -// -// This source code is licensed under the BSD-style license found in the -// LICENSE file in the root directory of this source tree. An additional grant -// of patent rights can be found in the PATENTS file in the same directory. -// - -#import "SRWebSocket.h" - -#if TARGET_OS_IPHONE -#define HAS_ICU -#endif - -#ifdef HAS_ICU -#import -#endif - -#if TARGET_OS_IPHONE -#import -#else -#import -#endif - -#import -#import - -#if OS_OBJECT_USE_OBJC_RETAIN_RELEASE -#define sr_dispatch_retain(x) -#define sr_dispatch_release(x) -#define maybe_bridge(x) ((__bridge void *) x) -#else -#define sr_dispatch_retain(x) dispatch_retain(x) -#define sr_dispatch_release(x) dispatch_release(x) -#define maybe_bridge(x) (x) -#endif - -#if !__has_feature(objc_arc) -#error SocketRocket must be compiled with ARC enabled -#endif - - -typedef enum { -SROpCodeTextFrame = 0x1, -SROpCodeBinaryFrame = 0x2, -// 3-7 reserved. -SROpCodeConnectionClose = 0x8, -SROpCodePing = 0x9, -SROpCodePong = 0xA, -// B-F reserved. -} SROpCode; - -typedef struct { -BOOL fin; -// BOOL rsv1; -// BOOL rsv2; -// BOOL rsv3; -uint8_t opcode; -BOOL masked; -uint64_t payload_length; -} frame_header; - -static NSString *const SRWebSocketAppendToSecKeyString = @"258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; - -static inline int32_t validate_dispatch_data_partial_string(NSData *data); -static inline void SRFastLog(NSString *format, ...); - -@interface NSData (SRWebSocket) - -- (NSString *)stringBySHA1ThenBase64Encoding; - -@end - - -@interface NSString (SRWebSocket) - -- (NSString *)stringBySHA1ThenBase64Encoding; - -@end - - -@interface NSURL (SRWebSocket) - -// The origin isn't really applicable for a native application. -// So instead, just map ws -> http and wss -> https. -- (NSString *)SR_origin; - -@end - - -@interface _SRRunLoopThread : NSThread - -@property (nonatomic, readonly) NSRunLoop *runLoop; - -@end - - -static NSString *newSHA1String(const char *bytes, size_t length) { -uint8_t md[CC_SHA1_DIGEST_LENGTH]; - -assert(length >= 0); -assert(length <= UINT32_MAX); -CC_SHA1(bytes, (CC_LONG)length, md); - -NSData *data = [NSData dataWithBytes:md length:CC_SHA1_DIGEST_LENGTH]; - -if ([data respondsToSelector:@selector(base64EncodedStringWithOptions:)]) { -return [data base64EncodedStringWithOptions:0]; -} - -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -return [data base64Encoding]; -#pragma clang diagnostic pop -} - -@implementation NSData (SRWebSocket) - -- (NSString *)stringBySHA1ThenBase64Encoding; -{ -return newSHA1String(self.bytes, self.length); -} - -@end - - -@implementation NSString (SRWebSocket) - -- (NSString *)stringBySHA1ThenBase64Encoding; -{ -return newSHA1String(self.UTF8String, self.length); -} - -@end - -NSString *const SRWebSocketErrorDomain = @"SRWebSocketErrorDomain"; -NSString *const SRHTTPResponseErrorKey = @"HTTPResponseStatusCode"; - -// Returns number of bytes consumed. Returning 0 means you didn't match. -// Sends bytes to callback handler; -typedef size_t (^stream_scanner)(NSData *collected_data); - -typedef void (^data_callback)(SRWebSocket *webSocket, NSData *data); - -@interface SRIOConsumer : NSObject { -stream_scanner _scanner; -data_callback _handler; -size_t _bytesNeeded; -BOOL _readToCurrentFrame; -BOOL _unmaskBytes; -} -@property (nonatomic, copy, readonly) stream_scanner consumer; -@property (nonatomic, copy, readonly) data_callback handler; -@property (nonatomic, assign) size_t bytesNeeded; -@property (nonatomic, assign, readonly) BOOL readToCurrentFrame; -@property (nonatomic, assign, readonly) BOOL unmaskBytes; - -@end - -// This class is not thread-safe, and is expected to always be run on the same queue. -@interface SRIOConsumerPool : NSObject - -- (id)initWithBufferCapacity:(NSUInteger)poolSize; - -- (SRIOConsumer *)consumerWithScanner:(stream_scanner)scanner handler:(data_callback)handler bytesNeeded:(size_t)bytesNeeded readToCurrentFrame:(BOOL)readToCurrentFrame unmaskBytes:(BOOL)unmaskBytes; -- (void)returnConsumer:(SRIOConsumer *)consumer; - -@end - -@interface SRWebSocket () - -@property (nonatomic) SRReadyState readyState; - -@property (nonatomic) NSOperationQueue *delegateOperationQueue; -@property (nonatomic) dispatch_queue_t delegateDispatchQueue; - -// Specifies whether SSL trust chain should NOT be evaluated.
[26/51] [abbrv] incubator-weex git commit: * [jsfm] release 0.22.4
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7ae75e3c/packages/weex-js-framework/index.js -- diff --git a/packages/weex-js-framework/index.js b/packages/weex-js-framework/index.js index 216e829..95ec054 100644 --- a/packages/weex-js-framework/index.js +++ b/packages/weex-js-framework/index.js @@ -1,5 +1,5 @@ -(this.nativeLog || function(s) {console.log(s)})('START JS FRAMEWORK 0.22.0, Build 2017-09-21 18:58.'); -;(this.getJSFMVersion = function(){return "0.22.0"}); +(this.nativeLog || function(s) {console.log(s)})('START JS FRAMEWORK 0.22.4, Build 2017-09-25 11:14.'); +;(this.getJSFMVersion = function(){return "0.22.4"}); var global = this, process = { env: {} };var setTimeout = global.setTimeout; (function (global, factory) { @@ -8,7 +8,7 @@ var global = this, process = { env: {} };var setTimeout = global.setTimeout; (factory()); }(this, (function () { 'use strict'; -var subversion = {"browser":"0.5.0","framework":"0.22.0","vue-render":"0.12.3","transformer":">=0.1.5 <0.5"}; +var subversion = {"browser":"0.5.0","framework":"0.22.4","vue-render":"0.12.3","transformer":">=0.1.5 <0.5"}; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -11456,8 +11456,12 @@ function createInstance ( function destroyInstance (instanceId) { var instance = instances[instanceId]; if (instance && instance.app instanceof instance.Vue) { -instance.app.$destroy(); -instance.document.destroy(); +try { + instance.app.$destroy(); +} catch (e) { +} finally { + instance.document.destroy(); +} } delete instances[instanceId]; } @@ -26425,4 +26429,4 @@ var frameworks$1 = { setup(frameworks$1); }))); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjpudWxsLCJzb3VyY2VzIjpbIi4uLy4uL2h0bWw1L3NoYXJlZC9hcnJheUZyb20uanMiLCIuLi8uLi9ub2RlX21vZHVsZXMvY29yZS1qcy9tb2R1bGVzL19nbG9iYWwuanMiLCIuLi8uLi9ub2RlX21vZHVsZXMvY29yZS1qcy9tb2R1bGVzL19jb3JlLmpzIiwiLi4vLi4vbm9kZV9tb2R1bGVzL2NvcmUtanMvbW9kdWxlcy9faXMtb2JqZWN0LmpzIiwiLi4vLi4vbm9kZV9tb2R1bGVzL2NvcmUtanMvbW9kdWxlcy9fYW4tb2JqZWN0LmpzIiwiLi4vLi4vbm9kZV9tb2R1bGVzL2NvcmUtanMvbW9kdWxlcy9fZmFpbHMuanMiLCIuLi8uLi9ub2RlX21vZHVsZXMvY29yZS1qcy9tb2R1bGVzL19kZXNjcmlwdG9ycy5qcyIsIi4uLy4uL25vZGVfbW9kdWxlcy9jb3JlLWpzL21vZHVsZXMvX2RvbS1jcmVhdGUuanMiLCIuLi8uLi9ub2RlX21vZHVsZXMvY29yZS1qcy9tb2R1bGVzL19pZTgtZG9tLWRlZmluZS5qcyIsIi4uLy4uL25vZGVfbW9kdWxlcy9jb3JlLWpzL21vZHVsZXMvX3RvLXByaW1pdGl2ZS5qcyIsIi4uLy4uL25vZGVfbW9kdWxlcy9jb3JlLWpzL21vZHVsZXMvX29iamVjdC1kcC5qcyIsIi4uLy4uL25vZGVfbW9kdWxlcy9jb3JlLWpzL21vZHVsZXMvX3Byb3BlcnR5LWRlc2MuanMiLCIuLi8uLi9ub2RlX21vZHVsZXMvY29yZS1qcy9tb2R1bGVzL19oaWRlLmpzIiwiLi4vLi4vbm9kZV9tb2R1bGVzL 2NvcmUtanMvbW9kdWxlcy9faGFzLmpzIiwiLi4vLi4vbm9kZV9tb2R1bGVzL2NvcmUtanMvbW9kdWxlcy9fdWlkLmpzIiwiLi4vLi4vbm9kZV9tb2R1bGVzL2NvcmUtanMvbW9kdWxlcy9fcmVkZWZpbmUuanMiLCIuLi8uLi9ub2RlX21vZHVsZXMvY29yZS1qcy9tb2R1bGVzL19hLWZ1bmN0aW9uLmpzIiwiLi4vLi4vbm9kZV9tb2R1bGVzL2NvcmUtanMvbW9kdWxlcy9fY3R4LmpzIiwiLi4vLi4vbm9kZV9tb2R1bGVzL2NvcmUtanMvbW9kdWxlcy9fZXhwb3J0LmpzIiwiLi4vLi4vbm9kZV9tb2R1bGVzL2NvcmUtanMvbW9kdWxlcy9fY29mLmpzIiwiLi4vLi4vbm9kZV9tb2R1bGVzL2NvcmUtanMvbW9kdWxlcy9faW9iamVjdC5qcyIsIi4uLy4uL25vZGVfbW9kdWxlcy9jb3JlLWpzL21vZHVsZXMvX2RlZmluZWQuanMiLCIuLi8uLi9ub2RlX21vZHVsZXMvY29yZS1qcy9tb2R1bGVzL190by1pb2JqZWN0LmpzIiwiLi4vLi4vbm9kZV9tb2R1bGVzL2NvcmUtanMvbW9kdWxlcy9fdG8taW50ZWdlci5qcyIsIi4uLy4uL25vZGVfbW9kdWxlcy9jb3JlLWpzL21vZHVsZXMvX3RvLWxlbmd0aC5qcyIsIi4uLy4uL25vZGVfbW9kdWxlcy9jb3JlLWpzL21vZHVsZXMvX3RvLWFic29sdXRlLWluZGV4LmpzIiwiLi4vLi4vbm9kZV9tb2R1bGVzL2NvcmUtanMvbW9kdWxlcy9fYXJyYXktaW5jbHVkZXMuanMiLCIuLi8uLi9ub2RlX21vZHVsZXMvY29yZS1qcy9tb2R1bGVzL19zaGFyZWQuanMiLCIuLi8uLi9ub2RlX21vZHVsZXMvY2 9yZS1qcy9tb2R1bGVzL19zaGFyZWQta2V5LmpzIiwiLi4vLi4vbm9kZV9tb2R1bGVzL2NvcmUtanMvbW9kdWxlcy9fb2JqZWN0LWtleXMtaW50ZXJuYWwuanMiLCIuLi8uLi9ub2RlX21vZHVsZXMvY29yZS1qcy9tb2R1bGVzL19lbnVtLWJ1Zy1rZXlzLmpzIiwiLi4vLi4vbm9kZV9tb2R1bGVzL2NvcmUtanMvbW9kdWxlcy9fb2JqZWN0LWtleXMuanMiLCIuLi8uLi9ub2RlX21vZHVsZXMvY29yZS1qcy9tb2R1bGVzL19vYmplY3QtZ29wcy5qcyIsIi4uLy4uL25vZGVfbW9kdWxlcy9jb3JlLWpzL21vZHVsZXMvX29iamVjdC1waWUuanMiLCIuLi8uLi9ub2RlX21vZHVsZXMvY29yZS1qcy9tb2R1bGVzL190by1vYmplY3QuanMiLCIuLi8uLi9ub2RlX21vZHVsZXMvY29yZS1qcy9tb2R1bGVzL19vYmplY3QtYXNzaWduLmpzIiwiLi4vLi4vbm9kZV9tb2R1bGVzL2NvcmUtanMvbW9kdWxlcy9lczYub2JqZWN0LmFzc2lnbi5qcyIsIi4uLy4uL2h0bWw1L3NoYXJlZC9vYmplY3RBc3NpZ24uanMiLCIuLi8uLi9odG1sNS9zaGFyZWQvb2JqZWN0U2V0UHJvdG90eXBlT2YuanMiLCIuLi8uLi9odG1sNS9zaGFyZWQvcHJvbWlzZS5qcyIsIi4uLy4uL25vZGVfbW9kdWxlcy9jb3JlLWpzL21vZHVsZXMvX3drcy5qcyIsIi4uLy4uL25vZGVfbW9kdWxlcy9jb3JlLWpzL21vZHVsZXMvX2NsYXNzb2YuanMiLCIuLi8uLi9ub2RlX21vZHVsZXMvY29yZS1qcy9tb2R1bGVzL2VzNi5vYmplY3QudG8tc3RyaW5nLmpzIiwiLi4vLi4vbm9
[50/51] [abbrv] incubator-weex git commit: Merge branch 'dev' into 0.16-dev
Merge branch 'dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a1416183 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a1416183 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a1416183 Branch: refs/heads/master Commit: a14161834165a745625ae234e7024c48f424739c Parents: 671b6c5 db666a2 Author: gurisxie <279483...@qq.com> Authored: Tue Sep 26 01:17:04 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Tue Sep 26 01:17:04 2017 +0800 -- doc/source/cn/guide/set-up-env.md | 64 -- doc/source/cn/references/modules/animation.md | 5 +- doc/source/guide/set-up-env.md| 58 +++- doc/source/references/modules/animation.md| 6 +- html5/render/vue/components/input.js | 2 +- start | 5 +- 6 files changed, 75 insertions(+), 65 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a1416183/html5/render/vue/components/input.js -- diff --cc html5/render/vue/components/input.js index 0e8d466,e4d5952..a3e608b --- a/html5/render/vue/components/input.js +++ b/html5/render/vue/components/input.js @@@ -19,10 -19,12 +19,10 @@@ /** * @fileOverview Input component. - * Support v-model only if vue version is large than 2.2.0 + * Support v-model only if vue version is larger than 2.2.0 */ -import { extractComponentStyle, createEventMap } from '../core' -import { inputCommon } from '../mixins' -import { extend, mapFormEvents, appendCss } from '../utils' -// import { validateStyles } from '../validator' +let extractComponentStyle, createEventMap +let extend, mapFormEvents, appendCss const ID_PREFIX_PLACEHOLDER_COLOR = 'wipt_plc_' const ID_PREFIX_INPUT = 'wipt_'
[37/51] [abbrv] incubator-weex git commit: * [ios] post notification when sdk instance destroy
* [ios] post notification when sdk instance destroy Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0753f504 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0753f504 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0753f504 Branch: refs/heads/master Commit: 0753f504d55116e46a69b0360657cdebc615bbe3 Parents: 9fe39ad Author: acton393Authored: Mon Sep 25 10:53:20 2017 +0800 Committer: acton393 Committed: Mon Sep 25 21:17:37 2017 +0800 -- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 3 +++ ios/sdk/WeexSDK/Sources/Utility/WXDefine.h| 2 ++ 2 files changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0753f504/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m -- diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m index 39645ca..2afcf46 100644 --- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m +++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m @@ -356,6 +356,9 @@ typedef enum : NSUInteger { WXLogError(@"Fail to find instanceï¼"); return; } + +[[NSNotificationCenter defaultCenter] postNotificationName:WX_INSTANCE_WILL_DESTROY_NOTIFICATION object:nil userInfo:@{@"instanceId":self.instanceId}]; + [WXTracingManager destroyTraincgTaskWithInstance:self.instanceId]; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0753f504/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h -- diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h b/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h index 6fd5781..0867e99 100644 --- a/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h +++ b/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h @@ -81,6 +81,8 @@ parts = [parts subarrayWithRange:(NSRange){0, parts.count - 1}];\ #define WX_COMPONENT_NOTIFICATION_VIEW_LOADED@"WXComponentViewLoaded" +#define WX_INSTANCE_WILL_DESTROY_NOTIFICATION @"WXSDKInstanceWillDestroyNotification" + #define WX_SDKINSTANCE_WILL_RENDER@"WXSDKInstanceWillRender" #define WX_COMPONENT_THREAD_NAME @"com.taobao.weex.component"
[39/51] [abbrv] incubator-weex git commit: set adapter to null
set adapter to null Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/eaf537e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eaf537e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eaf537e2 Branch: refs/heads/master Commit: eaf537e2413b324f5d37b82b02f41d638b74fcf2 Parents: 9172cdd Author: jianbai.gbjAuthored: Mon Sep 25 21:44:41 2017 +0800 Committer: jianbai.gbj Committed: Mon Sep 25 21:44:41 2017 +0800 -- .../weex/ui/component/list/template/WXRecyclerTemplateList.java | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eaf537e2/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java index 43422a5..fb60fab 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java @@ -969,6 +969,9 @@ public class WXRecyclerTemplateList extends WXVContainer imp public void destroy() { if(getHostView() != null){ getHostView().removeCallbacks(listUpdateRunnable); +if(getHostView().getInnerView() != null){ +getHostView().getInnerView().setAdapter(null); +} } if(listData != null){ listData = null;
[49/51] [abbrv] incubator-weex git commit: Merge branch '0.16-dev' of https://github.com/gubaojian/incubator-weex into wip-us-0.16-dev
Merge branch '0.16-dev' of https://github.com/gubaojian/incubator-weex into wip-us-0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/671b6c5f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/671b6c5f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/671b6c5f Branch: refs/heads/master Commit: 671b6c5fcfa5c78568adaf61e39b198f01208139 Parents: 7d9f00d 018bc3c Author: acton393Authored: Mon Sep 25 23:56:21 2017 +0800 Committer: acton393 Committed: Mon Sep 25 23:56:21 2017 +0800 -- .../com/taobao/weex/ui/component/binding/Statements.java| 9 + 1 file changed, 5 insertions(+), 4 deletions(-) --
[20/51] [abbrv] incubator-weex git commit: * [html5] update start command for develop
* [html5] update start command for develop Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ab9ef1b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ab9ef1b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ab9ef1b2 Branch: refs/heads/master Commit: ab9ef1b24f65fd7f8edb858556d103f5e08634eb Parents: a64ce53 Author: erha19Authored: Fri Sep 22 17:03:33 2017 +0800 Committer: erha19 Committed: Fri Sep 22 17:03:33 2017 +0800 -- start | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ab9ef1b2/start -- diff --git a/start b/start index 435df74..eeb965e 100755 --- a/start +++ b/start @@ -3,9 +3,8 @@ THIS_DIR=$(dirname "$0") pushd "$THIS_DIR" -npm run build:native -npm run build:browser +npm run build npm run serve & -npm run dev:examples +npm run dev:examples:web popd
[33/51] [abbrv] incubator-weex git commit: * [doc] complete the set-up-env documentation
* [doc] complete the set-up-env documentation Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f8a3a23d Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f8a3a23d Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f8a3a23d Branch: refs/heads/master Commit: f8a3a23d506cb693a3780d9cca28b511a7b4dfdd Parents: ab9ef1b Author: erha19Authored: Mon Sep 25 16:50:55 2017 +0800 Committer: erha19 Committed: Mon Sep 25 16:50:55 2017 +0800 -- doc/source/cn/guide/set-up-env.md | 64 ++ doc/source/guide/set-up-env.md| 58 -- 2 files changed, 66 insertions(+), 56 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f8a3a23d/doc/source/cn/guide/set-up-env.md -- diff --git a/doc/source/cn/guide/set-up-env.md b/doc/source/cn/guide/set-up-env.md index 98d1b0d..48ae606 100644 --- a/doc/source/cn/guide/set-up-env.md +++ b/doc/source/cn/guide/set-up-env.md @@ -28,26 +28,26 @@ brew install node ```bash $ node -v -v6.3.1 +v6.11.3 $ npm -v -3.10.3 +3.10.10 ``` é常ï¼å®è£ äº Node.js ç¯å¢ï¼npm å 管çå·¥å ·ä¹éä¹å®è£ äºãå æ¤ï¼ç´æ¥ä½¿ç¨ npm æ¥å®è£ weex-toolkitã > npm æ¯ä¸ä¸ª JavaScript å 管çå·¥å ·ï¼å®å¯ä»¥è®©å¼åè è½»æ¾å > ±äº«åéç¨ä»£ç ãWeex å¾å¤ä¾èµæ¥èªç¤¾åºï¼åæ ·ï¼Weex > ä¹å°å¾å¤å·¥å ·åå¸å°ç¤¾åºæ¹ä¾¿å¼åè 使ç¨ã -**注æ: ** weex-toolkit å¨ 1.0.1 ä¹åææ¯æåå§å Vue 项ç®ï¼ä½¿ç¨å请确认çæ¬æ¯å¦æ£ç¡®ã +**注æ: ** å¨`weex-toolkit`1.0.8çæ¬åæ·»å äºnpm5è§èç`npm-shrinkwrap.json`ç¨äºéå®å ä¾èµï¼æ npmçæ¬<5çç¨æ·éè¦éè¿`npm i npm@latest -g`æ´æ°ä¸ä¸npmççæ¬ï¼ä½¿ç¨å请确认çæ¬æ¯å¦æ£ç¡®ã ```bash $ npm install -g weex-toolkit -$ weex -v - -v1.0.3 -weex-builder : v0.2.4 -weex-previewer : v1.3.4 +$ weex -v //æ¥çå½åweexçæ¬ ``` +weex-toolkitä¹æ¯æç´æ¥å级åä¾èµï¼å¦ï¼ +``` +weex update weex-devtool@latest //@åæ 注çæ¬åï¼latest表示ææ° +``` å½å å¼åè å¯ä»¥èè使ç¨æ·å®ç npm éå ââ [cnpm](https://npm.taobao.org/) å®è£ weex-toolkit @@ -87,42 +87,46 @@ $ weex create awesome-project - `build`: æºç æå ï¼çæ JS Bundle - `dev`: webpack watch 模å¼ï¼æ¹ä¾¿å¼å -- `serve`: å¼å¯éææå¡å¨ -- `debug`: è°è¯æ¨¡å¼ +- `serve`: å¼å¯HotReloadæå¡å¨ï¼ä»£ç æ¹å¨çå°ä¼å®æ¶åæ¥å°ç½é¡µä¸ æ们å éè¿ `npm install` å®è£ 项ç®ä¾èµãä¹åè¿è¡æ ¹ç®å½ä¸ç `npm run dev & npm run serve` å¼å¯ watch 模å¼åéææå¡å¨ã ç¶åæ们æå¼æµè§å¨ï¼è¿å ¥ `http://localhost:8080/index.html` å³å¯çå° weex h5 页é¢ã -åå§åæ¶å·²ç»ä¸ºæ们å建äºåºæ¬ç示ä¾ï¼æ们å¯ä»¥å¨ `src/foo.vue` ä¸æ¥çã +åå§åæ¶å·²ç»ä¸ºæ们å建äºåºæ¬ç示ä¾ï¼æ们å¯ä»¥å¨ `src/index.vue` ä¸æ¥çã 代ç å¦ä¸æç¤ºï¼ ```html - -Hello Weex ! -Hello Vue ! + + +Hello {{target}} +Now, let's use vue to build your weex app. - - .wrapper { -flex-direction: column; -justify-content: center; - } - .weex { - font-size: 60px; - text-align: center; - color: #1B90F7; - } - .vue { - font-size: 60px; - text-align: center; - margin-top: 30px; - color: #41B883; - } +