[18/47] incubator-weex git commit: * [html5] add _triggered on event when evtName is click
* [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/aeb55f30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/aeb55f30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/aeb55f30
Branch: refs/heads/master
Commit: aeb55f304c2f05bc6e9f8f24047aeff1a12f4f60
Parents: 31411dd
Author: erha19
Authored: Mon Aug 28 23:33:09 2017 +0800
Committer: erha19
Committed: Mon Aug 28 23:33:09 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(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aeb55f30/examples/vue/showcase/a-node-click.vue
--
diff --git a/examples/vue/showcase/a-node-click.vue
b/examples/vue/showcase/a-node-click.vue
index bf4d5a4..26d5282 100644
--- a/examples/vue/showcase/a-node-click.vue
+++ b/examples/vue/showcase/a-node-click.vue
@@ -1,9 +1,9 @@
-
-
- CLICK ME
+
+
+ CLICK ME
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aeb55f30/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 c19a649..243daa0 100644
--- a/html5/render/vue/env/event-manager.js
+++ b/html5/render/vue/env/event-manager.js
@@ -82,9 +82,9 @@ function _init (doc) {
_inited = true
const _sp = supportsPassive()
events.forEach(function (evt) {
-const option = needPassive.indexOf(evt) > -1 && _sp
- ? { passive: true }
- : false
+const option = evt === 'click'
+ ? true : needPassive.indexOf(evt) > -1 && _sp
+ ? { passive: true } : false
doc.addEventListener(evt, function (e) {
const el = e.target
let vm = el.__vue__
@@ -94,6 +94,8 @@ function _init (doc) {
* take full control of redirection of element.
*/
if (evtName === 'click') {
+// use '_triggered' to control bubbles event.
+e._triggered = { target: vm.$el }
e.preventDefault()
return
}
@@ -134,7 +136,12 @@ function _init (doc) {
const target = elm.getAttribute('target')
disposed = true
if (target !== '_blank') {
-location.href = href
+if (!!href) {
+ location.href = href
+}
+else {
+ console.warn('[weex-vue-render] If you want to use the A tag
jump, set the href attribute')
+}
}
else {
// do nothing.
[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/master
Commit: b8aae6ffc9e95677641046a7dd47b1e3650028e0
Parents: 0ae0fcf
Author: MrRaindrop
Authored: 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) {
[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: MrRaindrop
Authored: 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.
*/
[32/47] incubator-weex git commit: * [html5] release v0.12.11 & fix firefox & impl methods of selection range.
* [html5] release v0.12.11 & fix firefox & impl methods of selection range.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f58c820c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f58c820c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f58c820c
Branch: refs/heads/dev
Commit: f58c820c3d8b74fb19bfd359e3a0bc00e64ab36f
Parents: 2f3af6f
Author: MrRaindrop
Authored: Tue Sep 12 15:27:40 2017 +0800
Committer: MrRaindrop
Committed: Tue Sep 12 15:27:40 2017 +0800
--
html5/render/vue/README.md| 9 +
package.json | 2 +-
packages/weex-vue-render/README.md| 9 +
packages/weex-vue-render/package.json | 2 +-
4 files changed, 20 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f58c820c/html5/render/vue/README.md
--
diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md
index d27bdac..d8f241a 100644
--- a/html5/render/vue/README.md
+++ b/html5/render/vue/README.md
@@ -151,6 +151,15 @@ vue: {
* event handling ignore none-vue element.
+ 0.12.10
+
+* fix accessing vm in dom which is not a vue component.
+
+ 0.12.11
+
+* fix styles in firefox.
+* implement methods about selection range.
+
## component -> dom map
| component | dom element | children | note |
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f58c820c/package.json
--
diff --git a/package.json b/package.json
index b4b605b..c98bc37 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"subversion": {
"browser": "0.5.0",
"framework": "0.21.11",
-"vue-render": "0.12.10",
+"vue-render": "0.12.11",
"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/f58c820c/packages/weex-vue-render/README.md
--
diff --git a/packages/weex-vue-render/README.md
b/packages/weex-vue-render/README.md
index d27bdac..d8f241a 100644
--- a/packages/weex-vue-render/README.md
+++ b/packages/weex-vue-render/README.md
@@ -151,6 +151,15 @@ vue: {
* event handling ignore none-vue element.
+ 0.12.10
+
+* fix accessing vm in dom which is not a vue component.
+
+ 0.12.11
+
+* fix styles in firefox.
+* implement methods about selection range.
+
## component -> dom map
| component | dom element | children | note |
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f58c820c/packages/weex-vue-render/package.json
--
diff --git a/packages/weex-vue-render/package.json
b/packages/weex-vue-render/package.json
index bf978ae..54cefab 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.10",
+ "version": "0.12.11",
"description": "Weex built-in components for Vue 2.x.",
"license": "Apache-2.0",
"main": "dist/index.common.js",
[36/47] incubator-weex git commit: * [html5] fix loading & refresh: pullingdown wrongly triggered.
* [html5] fix loading & refresh: pullingdown wrongly triggered.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/56df42dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/56df42dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/56df42dd
Branch: refs/heads/dev
Commit: 56df42ddc13c18ad960c6ef7f4e5c1f9e51d9997
Parents: babd33b
Author: MrRaindrop
Authored: Fri Sep 15 15:47:12 2017 +0800
Committer: MrRaindrop
Committed: Fri Sep 15 15:47:12 2017 +0800
--
.../components/scrollable/mixins/scrollable.js | 53 +++-
1 file changed, 30 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/56df42dd/html5/render/vue/components/scrollable/mixins/scrollable.js
--
diff --git a/html5/render/vue/components/scrollable/mixins/scrollable.js
b/html5/render/vue/components/scrollable/mixins/scrollable.js
index 8f39580..19ffe74 100644
--- a/html5/render/vue/components/scrollable/mixins/scrollable.js
+++ b/html5/render/vue/components/scrollable/mixins/scrollable.js
@@ -225,34 +225,41 @@ export default {
},
handleTouchMove (event) {
- if (this._touchParams) {
-const inner = this.$refs.inner
-const { startY, reachTop, reachBottom } = this._touchParams
-if (inner) {
- const touch = event.changedTouches[0]
- const offsetY = touch.pageY - startY
- this._touchParams.offsetY = offsetY
- if (reachTop && this._refresh) {
-this._refresh.pullingDown(offsetY)
- }
- else if (reachBottom && this._loading) {
-this._loading.pullingUp(-offsetY)
- }
+ if (!this._touchParams || !this._refresh && !this._loading) {
+return
+ }
+ const inner = this.$refs.inner
+ const { startY, reachTop, reachBottom } = this._touchParams
+ if (inner) {
+const touch = event.changedTouches[0]
+const offsetY = touch.pageY - startY
+const dir = offsetY > 0 ? 'down' : 'up'
+this._touchParams.offsetY = offsetY
+if (this._refresh && (dir === 'down') && reachTop) {
+ this._refresh.pullingDown(offsetY)
+}
+else if (this._loading && (dir === 'up') && reachBottom) {
+ this._loading.pullingUp(-offsetY)
}
}
},
handleTouchEnd (event) {
- if (this._touchParams) {
-const inner = this.$refs.inner
-const { reachTop, reachBottom } = this._touchParams
-if (inner) {
- if (reachTop && this._refresh) {
-this._refresh.pullingEnd()
- }
- else if (reachBottom && this._loading) {
-this._loading.pullingEnd()
- }
+ if (!this._touchParams || !this._refresh && !this._loading) {
+return
+ }
+ const inner = this.$refs.inner
+ const { startY, reachTop, reachBottom } = this._touchParams
+ if (inner) {
+const touch = event.changedTouches[0]
+const offsetY = touch.pageY - startY
+const dir = offsetY > 0 ? 'down' : 'up'
+this._touchParams.offsetY = offsetY
+if (this._refresh && (dir === 'down') && reachTop) {
+ this._refresh.pullingEnd()
+}
+else if (this._loading && (dir === 'up') && reachBottom) {
+ this._loading.pullingEnd()
}
}
delete this._touchParams
[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/master
Commit: 0ae0fcfaf0ae3a2802a76f5aeb6d7b2c53978af5
Parents: 125f17d
Author: MrRaindrop
Authored: 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;
}
-
+
+
+
+
-
+
-
-
-
-
[36/47] incubator-weex git commit: * [html5] fix loading & refresh: pullingdown wrongly triggered.
* [html5] fix loading & refresh: pullingdown wrongly triggered.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/56df42dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/56df42dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/56df42dd
Branch: refs/heads/master
Commit: 56df42ddc13c18ad960c6ef7f4e5c1f9e51d9997
Parents: babd33b
Author: MrRaindrop
Authored: Fri Sep 15 15:47:12 2017 +0800
Committer: MrRaindrop
Committed: Fri Sep 15 15:47:12 2017 +0800
--
.../components/scrollable/mixins/scrollable.js | 53 +++-
1 file changed, 30 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/56df42dd/html5/render/vue/components/scrollable/mixins/scrollable.js
--
diff --git a/html5/render/vue/components/scrollable/mixins/scrollable.js
b/html5/render/vue/components/scrollable/mixins/scrollable.js
index 8f39580..19ffe74 100644
--- a/html5/render/vue/components/scrollable/mixins/scrollable.js
+++ b/html5/render/vue/components/scrollable/mixins/scrollable.js
@@ -225,34 +225,41 @@ export default {
},
handleTouchMove (event) {
- if (this._touchParams) {
-const inner = this.$refs.inner
-const { startY, reachTop, reachBottom } = this._touchParams
-if (inner) {
- const touch = event.changedTouches[0]
- const offsetY = touch.pageY - startY
- this._touchParams.offsetY = offsetY
- if (reachTop && this._refresh) {
-this._refresh.pullingDown(offsetY)
- }
- else if (reachBottom && this._loading) {
-this._loading.pullingUp(-offsetY)
- }
+ if (!this._touchParams || !this._refresh && !this._loading) {
+return
+ }
+ const inner = this.$refs.inner
+ const { startY, reachTop, reachBottom } = this._touchParams
+ if (inner) {
+const touch = event.changedTouches[0]
+const offsetY = touch.pageY - startY
+const dir = offsetY > 0 ? 'down' : 'up'
+this._touchParams.offsetY = offsetY
+if (this._refresh && (dir === 'down') && reachTop) {
+ this._refresh.pullingDown(offsetY)
+}
+else if (this._loading && (dir === 'up') && reachBottom) {
+ this._loading.pullingUp(-offsetY)
}
}
},
handleTouchEnd (event) {
- if (this._touchParams) {
-const inner = this.$refs.inner
-const { reachTop, reachBottom } = this._touchParams
-if (inner) {
- if (reachTop && this._refresh) {
-this._refresh.pullingEnd()
- }
- else if (reachBottom && this._loading) {
-this._loading.pullingEnd()
- }
+ if (!this._touchParams || !this._refresh && !this._loading) {
+return
+ }
+ const inner = this.$refs.inner
+ const { startY, reachTop, reachBottom } = this._touchParams
+ if (inner) {
+const touch = event.changedTouches[0]
+const offsetY = touch.pageY - startY
+const dir = offsetY > 0 ? 'down' : 'up'
+this._touchParams.offsetY = offsetY
+if (this._refresh && (dir === 'down') && reachTop) {
+ this._refresh.pullingEnd()
+}
+else if (this._loading && (dir === 'up') && reachBottom) {
+ this._loading.pullingEnd()
}
}
delete this._touchParams
[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/dev
Commit: ec5b79142d13d319d21ed8092f8a2f5857cb341f
Parents: b0741d8
Author: MrRaindrop
Authored: 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.
[15/47] incubator-weex git commit: * [html5] fix click.
* [html5] fix 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/5bc58516
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5bc58516
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5bc58516
Branch: refs/heads/dev
Commit: 5bc585168ec5586901e1865a738ac521ec8a861b
Parents: 768b13a
Author: MrRaindrop
Authored: Thu Aug 24 21:37:14 2017 +0800
Committer: MrRaindrop
Committed: Thu Aug 24 21:37:14 2017 +0800
--
build/karma.vue.conf.js | 1 +
html5/render/vue/core/node.js | 2 +-
html5/render/vue/env/event-manager.js | 17 +
html5/render/vue/lib/gesture.js | 2 +-
4 files changed, 12 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5bc58516/build/karma.vue.conf.js
--
diff --git a/build/karma.vue.conf.js b/build/karma.vue.conf.js
index 6220025..693c241 100644
--- a/build/karma.vue.conf.js
+++ b/build/karma.vue.conf.js
@@ -74,6 +74,7 @@ module.exports = function (config) {
'../html5/test/render/vue/!(utils|core)/*.js'
],
exclude: [
+ '../html5/test/render/vue/core/node.js',
'../html5/test/render/vue/helper/*.js',
'../html5/test/render/vue/vender/**/*.js',
'../html5/test/render/vue/data/**/*.js'
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5bc58516/html5/render/vue/core/node.js
--
diff --git a/html5/render/vue/core/node.js b/html5/render/vue/core/node.js
index caf4230..d38cafd 100644
--- a/html5/render/vue/core/node.js
+++ b/html5/render/vue/core/node.js
@@ -85,7 +85,7 @@ export function createEventMap (context, ...events) {
*/
let vm = context
while (vm) {
-const ons = getListeners(vm.$vnode, listenTo)
+const ons = getListeners(vm._vnode || vm.$vnode, listenTo)
const len = ons.length
if (len > 0) {
let idx = 0
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5bc58516/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 7a074d5..3ecf618 100644
--- a/html5/render/vue/env/event-manager.js
+++ b/html5/render/vue/env/event-manager.js
@@ -88,25 +88,26 @@ function _init (doc) {
const el = e.target
let vm = el.__vue__
let disposed = false
-
+ let evtName = e.type
/**
* take full control of redirection of element.
*/
- if (evt === 'click') {
+ if (evtName === 'click') {
e.preventDefault()
+return
}
- if (evt === 'tap' && evt._for !== 'weex') {
+ if (evtName === 'tap' && e._for !== 'weex') {
return
}
- else if (evt === 'tap') {
-evt = 'click'
+ else if (evtName === 'tap') {
+evtName = 'click'
}
while (vm) {
-const vnode = vm.$vnode || vm._vnode
+const vnode = vm._vnode || vm.$vnode
const elm = vm.$el
-const ons = getListeners(vnode, evt)
+const ons = getListeners(vnode, evtName)
const len = ons && ons.length
if (len > 0) {
@@ -129,7 +130,7 @@ function _init (doc) {
* NOTE: if target==='_blank' then do no jumping and dispatch the
* click event to document.body for further disposing.
*/
-if (evt === 'click' && isANode(elm)) {
+if (evtName === 'click' && isANode(elm)) {
const href = elm.getAttribute('href')
const target = elm.getAttribute('target')
disposed = true
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5bc58516/html5/render/vue/lib/gesture.js
--
diff --git a/html5/render/vue/lib/gesture.js b/html5/render/vue/lib/gesture.js
index 62ad226..5294cb2 100644
--- a/html5/render/vue/lib/gesture.js
+++ b/html5/render/vue/lib/gesture.js
@@ -70,7 +70,7 @@ function getCommonAncestor(el1, el2) {
*/
function fireEvent(element, type, extra) {
var event = doc.createEvent('HTMLEvents')
- event.initEvent(type, false, true)
+ event.initEvent(type, true, true)
if (typeof extra === 'object') {
for (var p in extra) {
[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/dev
Commit: 386a0c611184da024fe1132e26d857cd4c4839a0
Parents: ec5b791
Author: MrRaindrop
Authored: 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')
}
}
[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/dev Commit: aab1d7455b474e949630b44f7e695a5d20225c65 Parents: cda836a Author: MrRaindrop Authored: 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",
[37/47] incubator-weex git commit: * [html5] release v0.12.14
* [html5] release v0.12.14
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6ec5a50b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6ec5a50b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6ec5a50b
Branch: refs/heads/master
Commit: 6ec5a50bc4c9309f3f39a01b7e91808185cfc406
Parents: 56df42d
Author: MrRaindrop
Authored: Fri Sep 15 17:21:02 2017 +0800
Committer: MrRaindrop
Committed: Fri Sep 15 17:21:02 2017 +0800
--
html5/render/vue/README.md| 4
package.json | 2 +-
packages/weex-vue-render/README.md| 4
packages/weex-vue-render/package.json | 2 +-
4 files changed, 10 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6ec5a50b/html5/render/vue/README.md
--
diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md
index 4433261..0554334 100644
--- a/html5/render/vue/README.md
+++ b/html5/render/vue/README.md
@@ -168,6 +168,10 @@ vue: {
* reset `env.deviceHeight` after window's resizing.
+ 0.12.14
+
+* fix loading & refresh: pulling down wrongly triggered.
+
## component -> dom map
| component | dom element | children | note |
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6ec5a50b/package.json
--
diff --git a/package.json b/package.json
index 57cde71..7176a73 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"subversion": {
"browser": "0.5.0",
"framework": "0.21.11",
-"vue-render": "0.12.13",
+"vue-render": "0.12.14",
"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/6ec5a50b/packages/weex-vue-render/README.md
--
diff --git a/packages/weex-vue-render/README.md
b/packages/weex-vue-render/README.md
index 4433261..0554334 100644
--- a/packages/weex-vue-render/README.md
+++ b/packages/weex-vue-render/README.md
@@ -168,6 +168,10 @@ vue: {
* reset `env.deviceHeight` after window's resizing.
+ 0.12.14
+
+* fix loading & refresh: pulling down wrongly triggered.
+
## component -> dom map
| component | dom element | children | note |
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6ec5a50b/packages/weex-vue-render/package.json
--
diff --git a/packages/weex-vue-render/package.json
b/packages/weex-vue-render/package.json
index c86c16b..b07535d 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.13",
+ "version": "0.12.14",
"description": "Weex built-in components for Vue 2.x.",
"license": "Apache-2.0",
"main": "dist/index.common.js",
[18/47] incubator-weex git commit: * [html5] add _triggered on event when evtName is click
* [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/aeb55f30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/aeb55f30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/aeb55f30
Branch: refs/heads/dev
Commit: aeb55f304c2f05bc6e9f8f24047aeff1a12f4f60
Parents: 31411dd
Author: erha19
Authored: Mon Aug 28 23:33:09 2017 +0800
Committer: erha19
Committed: Mon Aug 28 23:33:09 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(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aeb55f30/examples/vue/showcase/a-node-click.vue
--
diff --git a/examples/vue/showcase/a-node-click.vue
b/examples/vue/showcase/a-node-click.vue
index bf4d5a4..26d5282 100644
--- a/examples/vue/showcase/a-node-click.vue
+++ b/examples/vue/showcase/a-node-click.vue
@@ -1,9 +1,9 @@
-
-
- CLICK ME
+
+
+ CLICK ME
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aeb55f30/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 c19a649..243daa0 100644
--- a/html5/render/vue/env/event-manager.js
+++ b/html5/render/vue/env/event-manager.js
@@ -82,9 +82,9 @@ function _init (doc) {
_inited = true
const _sp = supportsPassive()
events.forEach(function (evt) {
-const option = needPassive.indexOf(evt) > -1 && _sp
- ? { passive: true }
- : false
+const option = evt === 'click'
+ ? true : needPassive.indexOf(evt) > -1 && _sp
+ ? { passive: true } : false
doc.addEventListener(evt, function (e) {
const el = e.target
let vm = el.__vue__
@@ -94,6 +94,8 @@ function _init (doc) {
* take full control of redirection of element.
*/
if (evtName === 'click') {
+// use '_triggered' to control bubbles event.
+e._triggered = { target: vm.$el }
e.preventDefault()
return
}
@@ -134,7 +136,12 @@ function _init (doc) {
const target = elm.getAttribute('target')
disposed = true
if (target !== '_blank') {
-location.href = href
+if (!!href) {
+ location.href = href
+}
+else {
+ console.warn('[weex-vue-render] If you want to use the A tag
jump, set the href attribute')
+}
}
else {
// do nothing.
[34/47] incubator-weex git commit: * [html5] release v0.12.12
* [html5] release v0.12.12
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/89b131fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/89b131fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/89b131fb
Branch: refs/heads/master
Commit: 89b131fb7c430dab67a41abf6c70365c57440395
Parents: 2cf1675
Author: MrRaindrop
Authored: Thu Sep 14 13:58:31 2017 +0800
Committer: MrRaindrop
Committed: Thu Sep 14 13:58:31 2017 +0800
--
html5/render/vue/README.md| 4
package.json | 2 +-
packages/weex-vue-render/README.md| 4
packages/weex-vue-render/package.json | 2 +-
4 files changed, 10 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/89b131fb/html5/render/vue/README.md
--
diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md
index d8f241a..31b6226 100644
--- a/html5/render/vue/README.md
+++ b/html5/render/vue/README.md
@@ -160,6 +160,10 @@ vue: {
* fix styles in firefox.
* implement methods about selection range.
+ 0.12.12
+
+* fix NS (svg) bug in vue.js@v2.4.3
+
## component -> dom map
| component | dom element | children | note |
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/89b131fb/package.json
--
diff --git a/package.json b/package.json
index fa2a332..534cc67 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"subversion": {
"browser": "0.5.0",
"framework": "0.21.11",
-"vue-render": "0.12.11",
+"vue-render": "0.12.12",
"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/89b131fb/packages/weex-vue-render/README.md
--
diff --git a/packages/weex-vue-render/README.md
b/packages/weex-vue-render/README.md
index d8f241a..31b6226 100644
--- a/packages/weex-vue-render/README.md
+++ b/packages/weex-vue-render/README.md
@@ -160,6 +160,10 @@ vue: {
* fix styles in firefox.
* implement methods about selection range.
+ 0.12.12
+
+* fix NS (svg) bug in vue.js@v2.4.3
+
## component -> dom map
| component | dom element | children | note |
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/89b131fb/packages/weex-vue-render/package.json
--
diff --git a/packages/weex-vue-render/package.json
b/packages/weex-vue-render/package.json
index 54cefab..8ff879e 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.11",
+ "version": "0.12.12",
"description": "Weex built-in components for Vue 2.x.",
"license": "Apache-2.0",
"main": "dist/index.common.js",
[06/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/77ab0f86 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/77ab0f86 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/77ab0f86 Branch: refs/heads/dev Commit: 77ab0f863ca57a51637a0c391bec42f7254fa0b9 Parents: 486c6f4 4bd54da Author: MrRaindrop Authored: Mon Aug 21 14:19:09 2017 +0800 Committer: MrRaindrop Committed: Mon Aug 21 14:19:09 2017 +0800 -- examples/vue/index.vue | 4 +- examples/vue/showcase/a-node-click.vue | 74 ++ examples/vue/showcase/tap-penetrate.vue | 206 +++ html5/render/vue/core/node.js | 64 ++--- html5/render/vue/utils/event.js | 32 - html5/test/render/vue/core/node.js | 1 - html5/test/render/vue/utils/event.js| 10 ++ 7 files changed, 364 insertions(+), 27 deletions(-) --
[46/47] incubator-weex git commit: * [ios] fix type convert warnings
* [ios] fix type convert warnings
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5b7c9a4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5b7c9a4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5b7c9a4e
Branch: refs/heads/master
Commit: 5b7c9a4e683300f63869c4fa50b21ec087570bdf
Parents: 2513b0f
Author: acton393
Authored: Tue Sep 26 11:56:49 2017 +0800
Committer: acton393
Committed: Tue Sep 26 11:56:49 2017 +0800
--
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5b7c9a4e/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 9e95e9b..7ad52f3 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -150,7 +150,7 @@
copyId = __copy % (1024*1024);
__copy++;
}
-NSString *copyRef = [NSString stringWithFormat:@"%ldcopy_of%@", copyId,
_isTemplate ? self.ref : self->_templateComponent.ref];
+NSString *copyRef = [NSString stringWithFormat:@"%zdcopy_of%@", copyId,
_isTemplate ? self.ref : self->_templateComponent.ref];
WXComponent *component = [[[self class] allocWithZone:zone]
initWithRef:copyRef type:self.type styles:self.styles
attributes:self.attributes events:self.events weexInstance:self.weexInstance];
if (_isTemplate) {
component->_templateComponent = self;
[04/47] incubator-weex git commit: * [html5] release vue-render 0.12.2
* [html5] release vue-render 0.12.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/bb844b90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bb844b90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bb844b90
Branch: refs/heads/master
Commit: bb844b90aa013ca946c6ffdce57a1281f5340374
Parents: 7e2d4ef
Author: MrRaindrop
Authored: Fri Aug 4 17:09:18 2017 +0800
Committer: MrRaindrop
Committed: Mon Aug 21 11:28:29 2017 +0800
--
package.json | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bb844b90/package.json
--
diff --git a/package.json b/package.json
index 4579a27..2148df1 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,13 @@
"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",
[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/master Commit: cda836a0f5526cbb6e5c73a408a019fce0203dd8 Parents: 52aed20 2513b0f Author: MrRaindrop Authored: 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 |49 + .../com/taobao/weex/ui/fla
[39/47] incubator-weex git commit: * [html5] release v0.12.16.
* [html5] release v0.12.16.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/524fbd13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/524fbd13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/524fbd13
Branch: refs/heads/dev
Commit: 524fbd131ad557d797274dfd0cb5aea2e78c20ce
Parents: b7fa6b0
Author: MrRaindrop
Authored: Sun Sep 24 12:01:19 2017 +0800
Committer: MrRaindrop
Committed: Sun Sep 24 12:01:19 2017 +0800
--
html5/render/vue/README.md| 2 +-
html5/render/vue/env/event-manager.js | 5 ++---
package.json | 2 +-
packages/weex-vue-render/README.md| 2 +-
packages/weex-vue-render/package.json | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/524fbd13/html5/render/vue/README.md
--
diff --git a/html5/render/vue/README.md b/html5/render/vue/README.md
index 31646a2..d2b8c89 100644
--- a/html5/render/vue/README.md
+++ b/html5/render/vue/README.md
@@ -172,7 +172,7 @@ vue: {
* fix loading & refresh: pulling down wrongly triggered.
- 0.12.15
+ 0.12.16
* not to prevent default behaviour of click events unless the click-binding
element is inside a `` link, or it is a `` link and has a `prevent`
attribute on it.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/524fbd13/html5/render/vue/env/event-manager.js
--
diff --git a/html5/render/vue/env/event-manager.js
b/html5/render/vue/env/event-manager.js
index e637b7d..4c777d0 100644
--- a/html5/render/vue/env/event-manager.js
+++ b/html5/render/vue/env/event-manager.js
@@ -131,13 +131,12 @@ function _init (doc) {
if (window._should_intercept_a_jump &&
window._should_intercept_a_jump(elm)) {
// e._triggered should not be true since we left the intercepter
to handle the event.
e._triggered = false
-e.preventDefault()
disposed = true
}
else if (href.match(voidHrefReg)
|| prevent === '' || prevent === 'true') {
- e._triggered = false
- e.preventDefault()
+e._triggered = false
+e.preventDefault()
}
else {
e._triggered = { target: elm }
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/524fbd13/package.json
--
diff --git a/package.json b/package.json
index cd90c76..49a5d76 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"subversion": {
"browser": "0.5.0",
"framework": "0.21.11",
-"vue-render": "0.12.15",
+"vue-render": "0.12.16",
"transformer": ">=0.1.5 <0.5"
},
"description": "A framework for building Mobile cross-platform UI",
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/524fbd13/packages/weex-vue-render/README.md
--
diff --git a/packages/weex-vue-render/README.md
b/packages/weex-vue-render/README.md
index 31646a2..d2b8c89 100644
--- a/packages/weex-vue-render/README.md
+++ b/packages/weex-vue-render/README.md
@@ -172,7 +172,7 @@ vue: {
* fix loading & refresh: pulling down wrongly triggered.
- 0.12.15
+ 0.12.16
* not to prevent default behaviour of click events unless the click-binding
element is inside a `` link, or it is a `` link and has a `prevent`
attribute on it.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/524fbd13/packages/weex-vue-render/package.json
--
diff --git a/packages/weex-vue-render/package.json
b/packages/weex-vue-render/package.json
index a08b4ce..57fed3f 100644
--- a/packages/weex-vue-render/package.json
+++ b/packages/weex-vue-render/package.json
@@ -1,6 +1,6 @@
{
"name": "weex-vue-render",
- "version": "0.12.15",
+ "version": "0.12.16",
"description": "Weex built-in components for Vue 2.x.",
"license": "Apache-2.0",
"main": "dist/index.common.js",
[03/47] incubator-weex git commit: * [html5] build for esm.
* [html5] build for esm.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7e2d4ef9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7e2d4ef9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7e2d4ef9
Branch: refs/heads/dev
Commit: 7e2d4ef9fe74638e788854e22ecc28932e3f72ae
Parents: a105b22
Author: MrRaindrop
Authored: Sat Aug 12 15:15:09 2017 +0800
Committer: MrRaindrop
Committed: Mon Aug 21 11:15:10 2017 +0800
--
build/build.js | 17 ++---
build/config.js| 12 ++--
packages/weex-vue-render/src/index.core.js | 17 +
packages/weex-vue-render/src/index.js | 17 +
4 files changed, 50 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7e2d4ef9/build/build.js
--
diff --git a/build/build.js b/build/build.js
index 9ddf8a1..02f1e8c 100644
--- a/build/build.js
+++ b/build/build.js
@@ -207,9 +207,20 @@ function build (name) {
else {
console.log(`\n => start to build ${name} (${pkgName})\n`)
return new Promise((resolve, reject) => {
- runRollup(config).then(() => {
-runRollup(minifyConfig).then(() => {
- zip(minifyConfig.dest, resolve)
+ return runRollup(config).then(() => {
+let p = Promise.resolve()
+if (name === 'vue') {
+ const esConfig = getConfig(pkgName, false, {
+format: 'es',
+_isProd: true
+ })
+ esConfig.dest = esConfig.dest.replace(/\.js$/, '.es.js')
+ p = runRollup(esConfig)
+}
+return p.then(function () {
+ return runRollup(minifyConfig).then(() => {
+zip(minifyConfig.dest, resolve)
+ })
})
})
})
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7e2d4ef9/build/config.js
--
diff --git a/build/config.js b/build/config.js
index a863919..3efccb2 100644
--- a/build/config.js
+++ b/build/config.js
@@ -157,8 +157,16 @@ console.log('START WEEX VUE RENDER CORE:
${subversion['vue-render']}, Build ${no
}
}
-function getConfig (name, minify) {
+function getConfig (name, minify, params) {
const opt = configs[name]
+ let isProd
+ if (params) {
+isProd = params._isProd
+delete params._isProd
+for (const k in params) {
+ opt[k] = params[k]
+}
+ }
const config = {
moduleName: opt.moduleName,
entry: opt.entry,
@@ -169,7 +177,7 @@ function getConfig (name, minify) {
json(),
replace({
'process.env.VIEWPORT_WIDTH': 750,
-'process.env.NODE_ENV': JSON.stringify(minify ? 'production' :
'development'),
+'process.env.NODE_ENV': JSON.stringify(isProd ? 'production' : minify
? 'production' : 'development'),
'process.env.VUE_ENV': JSON.stringify('WEEX'),
'process.env.NODE_DEBUG': false
}),
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7e2d4ef9/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 3bc8edb..dc49562 100644
--- a/packages/weex-vue-render/src/index.core.js
+++ b/packages/weex-vue-render/src/index.core.js
@@ -5,9 +5,18 @@ import text from '../../../html5/render/vue/components/text'
import image from '../../../html5/render/vue/components/image'
import scrollable from '../../../html5/render/vue/components/scrollable'
-weex.install(div)
-weex.install(text)
-weex.install(image)
-weex.install(scrollable)
+const preInit = weex.init
+
+weex.init = function () {
+ preInit.apply(weex, arguments)
+ weex.install(div)
+ weex.install(text)
+ weex.install(image)
+ weex.install(scrollable)
+}
+
+if (global.Vue) {
+ weex.init(global.Vue)
+}
export default weex
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7e2d4ef9/packages/weex-vue-render/src/index.js
--
diff --git a/packages/weex-vue-render/src/index.js
b/packages/weex-vue-render/src/index.js
index efbbaeb..178da4c 100644
--- a/packages/weex-vue-render/src/index.js
+++ b/packages/weex-vue-render/src/index.js
@@ -3,10 +3,19 @@ import weex from '../../../html5/render/vue'
import components from '../../../html5/render/vue/components'
import modules from '../../../html5/render/vue/modules'
-const plugins = components.concat(modules)
+const preInit = weex.init
-plugins.forEach(function (plugin) {
- weex.install(plugin)
-})
+weex.init = function () {
+ preInit.apply(we
[30/47] incubator-weex git commit: * [html5] release 0.12.10
* [html5] release 0.12.10
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/86cd036c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/86cd036c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/86cd036c
Branch: refs/heads/master
Commit: 86cd036ccbf1569253629e9fc33a462638a494b4
Parents: 19f0c01
Author: MrRaindrop
Authored: Tue Sep 12 10:47:08 2017 +0800
Committer: MrRaindrop
Committed: Tue Sep 12 10:47:08 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/86cd036c/package.json
--
diff --git a/package.json b/package.json
index 8346fc2..b4b605b 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"subversion": {
"browser": "0.5.0",
"framework": "0.21.11",
-"vue-render": "0.12.9",
+"vue-render": "0.12.10",
"transformer": ">=0.1.5 <0.5"
},
"description": "A framework for building Mobile cross-platform UI",
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/86cd036c/packages/weex-vue-render/package.json
--
diff --git a/packages/weex-vue-render/package.json
b/packages/weex-vue-render/package.json
index 220744f..bf978ae 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.9",
+ "version": "0.12.10",
"description": "Weex built-in components for Vue 2.x.",
"license": "Apache-2.0",
"main": "dist/index.common.js",
[GitHub] incubator-weex pull request #744: Doc feature pr rule
GitHub user gurisxie opened a pull request: https://github.com/apache/incubator-weex/pull/744 Doc feature pr rule **if** *isBugFix* **:** * [x] Make sure that you add at least one unit test for the bug which you had fixed. **elif** *isNewFeature* **:** * [ ] Update API docs for the component. * [ ] Update/Add demo to demonstrate new feature. * [ ] Update TypeScript definition for the component. * [ ] Add unit tests for the feature. You can merge this pull request into a Git repository by running: $ git pull https://github.com/gurisxie/incubator-weex doc-feature-pr-rule Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/744.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #744 commit f99bab945497568d2d0cc125709b22031d3e70a9 Author: gurisxie <279483...@qq.com> Date: 2017-09-26T07:44:02Z * [doc] update pr default desc commit c5d10645feab3dc2069d6ced70d93b48707322c6 Author: gurisxie <279483...@qq.com> Date: 2017-09-26T08:01:24Z * [doc] update pull request markdown ---
[1/2] incubator-weex git commit: * [doc] update pr default desc
Repository: incubator-weex Updated Branches: refs/heads/master 915935b09 -> c5d10645f * [doc] update pr default desc Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f99bab94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f99bab94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f99bab94 Branch: refs/heads/master Commit: f99bab945497568d2d0cc125709b22031d3e70a9 Parents: 915935b Author: gurisxie <279483...@qq.com> Authored: Tue Sep 26 15:44:02 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Tue Sep 26 15:44:02 2017 +0800 -- .github/PULL_REQUEST_TEMPLATE.md | 26 +- 1 file changed, 21 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f99bab94/.github/PULL_REQUEST_TEMPLATE.md -- diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0241dc5..95ce076 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,22 @@ +First of all, thank you for your contribution! +Please makes sure that these checkboxes are checked before submitting your PR, thank you! + +Extra checklist: + +**if** *isBugFix* **:** + + * [ ] Make sure that you add at least one unit test for the bug which you had fixed. + +**elif** *isNewFeature* **:** + + * [ ] Update API docs for the component. + * [ ] Update/Add demo to demonstrate new feature. + * [ ] Update test scripts for the feature. + * [ ] Add unit tests for the feature. + +
[2/2] incubator-weex git commit: * [doc] update pull request markdown
* [doc] update pull request markdown Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c5d10645 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c5d10645 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c5d10645 Branch: refs/heads/master Commit: c5d10645feab3dc2069d6ced70d93b48707322c6 Parents: f99bab9 Author: gurisxie <279483...@qq.com> Authored: Tue Sep 26 16:01:24 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Tue Sep 26 16:01:24 2017 +0800 -- .github/PULL_REQUEST_TEMPLATE.md | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c5d10645/.github/PULL_REQUEST_TEMPLATE.md -- diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 95ce076..0a6fb20 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,7 +1,16 @@ First of all, thank you for your contribution! + Please makes sure that these checkboxes are checked before submitting your PR, thank you! -Extra checklist: + + +CheckList: **if** *isBugFix* **:** @@ -14,7 +23,6 @@ Extra checklist: * [ ] Update test scripts for the feature. * [ ] Add unit tests for the feature. -
[GitHub] incubator-weex issue #70: * [example] fix bugs for 'npm run build:examples' ...
Github user gurisxie commented on the issue: https://github.com/apache/incubator-weex/pull/70 @yyqqing I'm sorry for that your pull request has not passed because of unknown repository, can you close it and make new pull request? thanks a lot! ---
[GitHub] incubator-weex issue #4: modified: WXRenderErrorCode.java WXSDKInstance.java
Github user gurisxie commented on the issue: https://github.com/apache/incubator-weex/pull/4 @alex1226 please read the review result and make sure whether need edit,thanks very much. You can close this pr [here](https://github.com/apache/incubator-weex/pull/4) ---
[GitHub] incubator-weex issue #260: Wrong a word in the documentation
Github user gurisxie commented on the issue: https://github.com/apache/incubator-weex/pull/260 @ulivz I'm sorry for that I can't found what a repository need been pulled.Can you close this pr [here](https://github.com/apache/incubator-weex/pull/260). If you have new change for weex,hope your new pull request.Thanks a lot! ---
[GitHub] incubator-weex issue #110: * [android] update embed
Github user gurisxie commented on the issue: https://github.com/apache/incubator-weex/pull/110 HI, @xkli ,sorry to tell that we develop code in master branch.you can close it [here](https://github.com/apache/incubator-weex/pull/110) . Welcome to you that pull request to us again, thanks a lot! ---
[2/2] incubator-weex git commit: Merge branch '0.13-dev' of https://github.com/caozhiyong/incubator-weex into 0.13-dev
Merge branch '0.13-dev' of https://github.com/caozhiyong/incubator-weex into 0.13-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/842c7d3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/842c7d3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/842c7d3b Branch: refs/heads/0.13-dev Commit: 842c7d3bd5a24faa0d8d6fe9c15d37cd04ad1d06 Parents: 833b0da 127b471 Author: gurisxie <279483...@qq.com> Authored: Tue Sep 26 16:58:07 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Tue Sep 26 16:58:07 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m | 2 ++ 1 file changed, 2 insertions(+) --
[1/2] incubator-weex git commit: Update WXWebComponent.m
Repository: incubator-weex
Updated Branches:
refs/heads/0.13-dev 833b0da5b -> 842c7d3bd
Update WXWebComponent.m
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/127b4718
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/127b4718
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/127b4718
Branch: refs/heads/0.13-dev
Commit: 127b4718077ae7ff279b2e60facc7b92e8e7479d
Parents: 02ce702
Author: caozhiyong
Authored: Fri May 19 09:37:49 2017 +0800
Committer: GitHub
Committed: Fri May 19 09:37:49 2017 +0800
--
ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/127b4718/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
b/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
index ab8b63d..b696b22 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
@@ -82,6 +82,8 @@ WX_EXPORT_METHOD(@selector(goForward))
_webview = (WXWebView *)self.view;
_webview.delegate = self;
_webview.allowsInlineMediaPlayback = YES;
+[_webview setBackgroundColor:[UIColor clearColor]];
+_webview.opaque = NO;
_jsContext = [_webview
valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
__weak typeof(self) weakSelf = self;
_jsContext[@"$notifyWeex"] = ^(JSValue *data) {
[3/7] incubator-weex git commit: * [android] native crash fix
* [android] native crash fix Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/bf30d5f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bf30d5f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bf30d5f6 Branch: refs/heads/master Commit: bf30d5f6133f22a05a5e2b9854d1cbf7d752b037 Parents: 005b74a Author: zshshr Authored: Thu Jun 15 15:21:24 2017 +0800 Committer: zshshr Committed: Thu Jun 15 15:21:24 2017 +0800 -- android/sdk/libs/armeabi/libweexjsc.so | Bin 7570392 -> 7570504 bytes android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 12121924 bytes 2 files changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bf30d5f6/android/sdk/libs/armeabi/libweexjsc.so -- diff --git a/android/sdk/libs/armeabi/libweexjsc.so b/android/sdk/libs/armeabi/libweexjsc.so index cb0f6b6..41b1ee8 100755 Binary files a/android/sdk/libs/armeabi/libweexjsc.so and b/android/sdk/libs/armeabi/libweexjsc.so differ http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bf30d5f6/android/sdk/libs/x86/libweexjsc.so -- diff --git a/android/sdk/libs/x86/libweexjsc.so b/android/sdk/libs/x86/libweexjsc.so index 83ef452..c45672a 100755 Binary files a/android/sdk/libs/x86/libweexjsc.so and b/android/sdk/libs/x86/libweexjsc.so differ
[2/7] incubator-weex git commit: * [ios] cache attributedString for improve performance while draw Text
* [ios] cache attributedString for improve performance while draw Text
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/24de80e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/24de80e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/24de80e5
Branch: refs/heads/master
Commit: 24de80e5d8481b6b6be9e28dbbc65e72f21ac485
Parents: 005b74a
Author: acton393
Authored: Mon Jun 12 17:43:46 2017 +0800
Committer: acton393
Committed: Thu Jun 15 14:54:52 2017 +0800
--
ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/24de80e5/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
index 721ce44..546ca03 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@ -118,6 +118,7 @@ CGFloat WXTextDefaultLineThroughWidth = 1.2;
BOOL _truncationLine; // support trunk tail
BOOL _needsRemoveObserver;
+NSMutableAttributedString * _ctAttributedString;
}
+ (void)setRenderUsingCoreText:(BOOL)usingCoreText
@@ -241,6 +242,7 @@ do {\
- (void)setNeedsRepaint
{
_textStorage = nil;
+_ctAttributedString = nil;
}
#pragma mark - Subclass
@@ -335,6 +337,14 @@ do {\
return _text;
}
+- (NSMutableAttributedString *)ctAttributedString
+{
+if (!_ctAttributedString) {
+_ctAttributedString = [self buildCTAttributeString];
+}
+return _ctAttributedString;
+}
+
- (void)repaintText:(NSNotification *)notification
{
if (![_fontFamily isEqualToString:notification.userInfo[@"fontFamily"]]) {
@@ -605,7 +615,7 @@ do {\
CGContextTranslateCTM(context, 0, textFrame.size.height);
CGContextScaleCTM(context, 1.0, -1.0);
-NSMutableAttributedString * attributedStringCopy = [self
buildCTAttributeString];
+NSMutableAttributedString * attributedStringCopy = [self
ctAttributedString];
//add path
CGPathRef cgPath = NULL;
cgPath = CGPathCreateWithRect(textFrame, NULL);
@@ -749,7 +759,7 @@ do {\
if (truncationTokenLine) {
// default truncationType is kCTLineTruncationEnd
CTLineTruncationType truncationType = kCTLineTruncationEnd;
-NSAttributedString *attributedString = [self buildCTAttributeString];
+NSAttributedString *attributedString = [self ctAttributedString];
NSAttributedString * lastLineText = nil;
NSRange lastLineTextRange =
WXNSRangeFromCFRange(CTLineGetStringRange(lastLine));
NSRange attributeStringRange = NSMakeRange(0,
attributedString.string.length);
@@ -817,7 +827,7 @@ do {\
CGFloat totalHeight = 0;
CGSize suggestSize = CGSizeZero;
-NSAttributedString * attributedStringCpy = [self buildCTAttributeString];
+NSAttributedString * attributedStringCpy = [self ctAttributedString];
CTFramesetterRef framesetterRef = NULL;
framesetterRef =
CTFramesetterCreateWithAttributedString((CFAttributedStringRef)attributedStringCpy);
[1/7] incubator-weex git commit: Update WXWebComponent.m
Repository: incubator-weex
Updated Branches:
refs/heads/master c6d5ce57c -> 0e8f151eb
Update WXWebComponent.m
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/127b4718
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/127b4718
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/127b4718
Branch: refs/heads/master
Commit: 127b4718077ae7ff279b2e60facc7b92e8e7479d
Parents: 02ce702
Author: caozhiyong
Authored: Fri May 19 09:37:49 2017 +0800
Committer: GitHub
Committed: Fri May 19 09:37:49 2017 +0800
--
ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/127b4718/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
b/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
index ab8b63d..b696b22 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
@@ -82,6 +82,8 @@ WX_EXPORT_METHOD(@selector(goForward))
_webview = (WXWebView *)self.view;
_webview.delegate = self;
_webview.allowsInlineMediaPlayback = YES;
+[_webview setBackgroundColor:[UIColor clearColor]];
+_webview.opaque = NO;
_jsContext = [_webview
valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
__weak typeof(self) weakSelf = self;
_jsContext[@"$notifyWeex"] = ^(JSValue *data) {
[5/7] incubator-weex git commit: Merge branch '0.13-dev' of https://github.com/caozhiyong/incubator-weex into 0.13-dev
Merge branch '0.13-dev' of https://github.com/caozhiyong/incubator-weex into 0.13-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/842c7d3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/842c7d3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/842c7d3b Branch: refs/heads/master Commit: 842c7d3bd5a24faa0d8d6fe9c15d37cd04ad1d06 Parents: 833b0da 127b471 Author: gurisxie <279483...@qq.com> Authored: Tue Sep 26 16:58:07 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Tue Sep 26 16:58:07 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m | 2 ++ 1 file changed, 2 insertions(+) --
[4/7] incubator-weex git commit: Merge branch '0.13-dev' of https://github.com/apache/incubator-weex into 0.13-dev
Merge branch '0.13-dev' of https://github.com/apache/incubator-weex into 0.13-dev * '0.13-dev' of https://github.com/apache/incubator-weex: * [ios] cache attributedString for improve performance while draw Text Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/833b0da5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/833b0da5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/833b0da5 Branch: refs/heads/master Commit: 833b0da5b36367807b214b16716b029f21c118f9 Parents: bf30d5f 24de80e Author: zshshr Authored: Thu Jun 15 15:23:23 2017 +0800 Committer: zshshr Committed: Thu Jun 15 15:23:23 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-) --
[6/7] incubator-weex git commit: * [ios] Merge branch '0.13-dev' that webview property update
* [ios] Merge branch '0.13-dev' that webview property update
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c2d3e3bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c2d3e3bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c2d3e3bd
Branch: refs/heads/master
Commit: c2d3e3bdc4054445558e53885e7b44d004281d31
Parents: c5d1064 842c7d3
Author: gurisxie <279483...@qq.com>
Authored: Tue Sep 26 17:03:23 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Sep 26 17:03:23 2017 +0800
--
ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c2d3e3bd/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
--
diff --cc ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
index 62a0aba,b696b22..f66bd11
--- a/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
@@@ -83,7 -82,8 +83,9 @@@ WX_EXPORT_METHOD(@selector(goForward)
_webview = (WXWebView *)self.view;
_webview.delegate = self;
_webview.allowsInlineMediaPlayback = YES;
+_webview.scalesPageToFit = YES;
+ [_webview setBackgroundColor:[UIColor clearColor]];
+ _webview.opaque = NO;
_jsContext = [_webview
valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
__weak typeof(self) weakSelf = self;
_jsContext[@"$notifyWeex"] = ^(JSValue *data) {
[7/7] incubator-weex git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-weex
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-weex Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0e8f151e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0e8f151e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0e8f151e Branch: refs/heads/master Commit: 0e8f151ebb42f6043fed2024069eb975c8a021fc Parents: c2d3e3b c6d5ce5 Author: gurisxie <279483...@qq.com> Authored: Tue Sep 26 17:03:38 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Tue Sep 26 17:03:38 2017 +0800 -- .../Sources/Component/RecycleList/WXComponent+DataBinding.h| 2 +- .../Sources/Component/RecycleList/WXComponent+DataBinding.mm | 2 ++ .../Sources/Component/RecycleList/WXRecycleListComponent.m | 3 +++ .../WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m | 3 +++ ios/sdk/WeexSDK/Sources/Component/WXListComponent.m| 3 +++ ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m| 3 +++ ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m | 6 +++--- ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.h | 3 ++- ios/sdk/WeexSDKTests/WXStreamModuleTests.m | 2 +- 9 files changed, 21 insertions(+), 6 deletions(-) --
[1/2] incubator-weex git commit: * [html5] add custom jsonp callback name support
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev c76b93859 -> d43a7a9d4
* [html5] add custom jsonp callback name support
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5f5fdd71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5f5fdd71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5f5fdd71
Branch: refs/heads/0.16-dev
Commit: 5f5fdd71eecc7b34f9fa7978db622c53c8723d3e
Parents: e52d273
Author: Yujingyi <349758...@qq.com>
Authored: Wed Sep 20 16:16:13 2017 +0800
Committer: Yujingyi <349758...@qq.com>
Committed: Wed Sep 20 16:16:13 2017 +0800
--
html5/render/browser/extend/api/stream.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5f5fdd71/html5/render/browser/extend/api/stream.js
--
diff --git a/html5/render/browser/extend/api/stream.js
b/html5/render/browser/extend/api/stream.js
index 8e27dd7..d843a10 100644
--- a/html5/render/browser/extend/api/stream.js
+++ b/html5/render/browser/extend/api/stream.js
@@ -30,7 +30,7 @@ let jsonpCnt = 0
const ERROR_STATE = -1
function _jsonp (config, callback, progressCallback) {
- const cbName = 'jsonp_' + (++jsonpCnt)
+ const cbName = config.jsonpCallbackName || 'jsonp_' + (++jsonpCnt)
let url
if (!config.url) {
[2/2] incubator-weex git commit: Merge branch '0.16-dev' of https://github.com/orifake/incubator-weex into 0.16-dev
Merge branch '0.16-dev' of https://github.com/orifake/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/d43a7a9d Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d43a7a9d Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d43a7a9d Branch: refs/heads/0.16-dev Commit: d43a7a9d46fc67591cdf7e0a6877dc03405d91e0 Parents: c76b938 5f5fdd7 Author: gurisxie <279483...@qq.com> Authored: Tue Sep 26 17:13:28 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Tue Sep 26 17:13:28 2017 +0800 -- html5/render/browser/extend/api/stream.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[GitHub] incubator-weex issue #298: + [html5] add jsonpCallback support
Github user gurisxie commented on the issue: https://github.com/apache/incubator-weex/pull/298 HI, @elover , Thanks a lot for your contribution about weex. I have merged your [pr-717](https://github.com/apache/incubator-weex/pull/717) ,please close this pr. Hope you continue to take part in weex. Best wishes! ---
[GitHub] incubator-weex issue #303: Update iconfont.vue
Github user gurisxie commented on the issue: https://github.com/apache/incubator-weex/pull/303 hi, @lammm , thanks a lot for your pr. We have fix this bug in master branch by native code. You can have a try, and close this pr [here](https://github.com/apache/incubator-weex/pull/303). Thanks a lot. ---
[2/4] incubator-weex git commit: Merge branch 'master' into master
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5cc6b257/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
--
diff --cc ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
index a0b7866,1c90b1e..52001e1
--- a/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
+++ b/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
@@@ -105,13 -113,6 +113,12 @@@
[self _renderWithURL:_sourceURL];
}
++
+- (void)addEdgePop
+{
+self.navigationController.interactivePopGestureRecognizer.delegate = self;
+}
+
-
-
- (void)_renderWithURL:(NSURL *)sourceURL
{
if (!sourceURL) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5cc6b257/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
--
diff --cc ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
index 7b20813,44bcf83..84426bb
--- a/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
+++ b/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
@@@ -21,7 -33,8 +33,9 @@@ typedef void(^OperationBlock)(void)
@implementation WXRootViewController
- - (void)viewDidLoad {
++
+ - (void)viewDidLoad
+ {
self.interactivePopGestureRecognizer.delegate = self;
}
[4/4] incubator-weex git commit: Merge branch 'master' of https://github.com/emptywalker/incubator-weex
Merge branch 'master' of https://github.com/emptywalker/incubator-weex Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/94f68f23 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/94f68f23 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/94f68f23 Branch: refs/heads/master Commit: 94f68f238a98c94592ba90549cf04950d3de627a Parents: 0e8f151 5cc6b25 Author: gurisxie <279483...@qq.com> Authored: Tue Sep 26 17:42:35 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Tue Sep 26 17:42:35 2017 +0800 -- ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m | 6 ++ ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m | 1 + 2 files changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/94f68f23/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m --
[1/4] incubator-weex git commit: 修复导航的问题
Repository: incubator-weex
Updated Branches:
refs/heads/master 0e8f151eb -> 94f68f238
ä¿®å¤å¯¼èªçé®é¢
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/82659dac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/82659dac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/82659dac
Branch: refs/heads/master
Commit: 82659dacd59482c98c0d2206561facbe5dff70b8
Parents: 6e71437
Author: xuyouhong <1647064...@qq.com>
Authored: Mon Apr 17 15:25:57 2017 +0800
Committer: xuyouhong <1647064...@qq.com>
Committed: Mon Apr 17 15:25:57 2017 +0800
--
.../Sources/Controller/WXBaseViewController.m | 9 -
.../Sources/Controller/WXRootViewController.m | 16 +++-
2 files changed, 15 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/82659dac/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
b/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
index 1523675..a0b7866 100644
--- a/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
+++ b/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
@@ -66,7 +66,6 @@
- (void)viewDidLoad
{
[super viewDidLoad];
-[self addEdgePop];
self.view.backgroundColor = [UIColor whiteColor];
self.automaticallyAdjustsScrollViewInsets = NO;
[self _renderWithURL:_sourceURL];
@@ -111,15 +110,7 @@
self.navigationController.interactivePopGestureRecognizer.delegate = self;
}
-#pragma mark- UIGestureRecognizerDelegate
-- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
-{
-if (!self.navigationController ||
[self.navigationController.viewControllers count] == 1) {
-return NO;
-}
-return YES;
-}
- (void)_renderWithURL:(NSURL *)sourceURL
{
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/82659dac/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
b/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
index befb010..7b20813 100644
--- a/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
+++ b/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
@@ -12,7 +12,7 @@
typedef void(^OperationBlock)(void);
-@interface WXRootViewController()
+@interface WXRootViewController()
@property(nonatomic, strong) WXThreadSafeMutableArray *operationArray;
@property (nonatomic, assign) BOOL operationInProcess;
@@ -21,6 +21,10 @@ typedef void(^OperationBlock)(void);
@implementation WXRootViewController
+- (void)viewDidLoad {
+self.interactivePopGestureRecognizer.delegate = self;
+}
+
- (id)initWithSourceURL:(NSURL *)sourceURL
{
WXBaseViewController *baseViewController = [[WXBaseViewController
alloc]initWithSourceURL:sourceURL];
@@ -103,6 +107,16 @@ typedef void(^OperationBlock)(void);
}
}
+#pragma mark- UIGestureRecognizerDelegate
+
+- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
+{
+if ([self.viewControllers count] == 1) {
+return NO;
+}
+return YES;
+}
+
- (NSMutableArray *)pendingBlocks
{
[3/4] incubator-weex git commit: Merge branch 'master' into master
Merge branch 'master' into master Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5cc6b257 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5cc6b257 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5cc6b257 Branch: refs/heads/master Commit: 5cc6b2574da7ea2e165f19f11c49794574c724fb Parents: 82659da 75101d5 Author: EmptyWalker <1647064...@qq.com> Authored: Sun Aug 20 09:37:23 2017 +0800 Committer: GitHub Committed: Sun Aug 20 09:37:23 2017 +0800 -- .eslintignore |1 + .eslintrc | 27 +- .flowconfig | 17 + .gitignore | 11 +- .rat-excludes | 11 + .travis.yml | 124 +- .wwprc |3 - CHANGELOG.md|7 + CONTRIBUTING.md | 38 +- DISCLAIMER |1 + Dangerfile-ios |5 + Gemfile | 15 + Gemfile.lock| 122 + HOW-TO-BUILD.md | 80 + LICENSE | 107 +- NOTICE | 19 +- POSSIBLE-NOTICES-FOR-BIN-DIST | 102 + README.md | 75 +- RUN-RAT.md | 12 + WeexSDK.podspec | 46 + android/.gitignore |5 +- android/README.md |6 + android/build.gradle| 48 + android/codeStyleSettings.xml | 393 + android/commons/build.gradle| 48 +- .../alibaba/weex/commons/ApplicationTest.java | 222 +- android/commons/src/main/AndroidManifest.xml| 18 + .../weex/commons/AbstractWeexActivity.java | 248 +- .../weex/commons/SimpleWeexActivity.java| 220 +- .../weex/commons/WXAnalyzerDelegate.java| 220 +- .../alibaba/weex/commons/adapter/BlurTool.java | 220 +- .../commons/adapter/BlurTransformation.java | 222 +- .../adapter/DefaultWebSocketAdapter.java| 274 +- .../adapter/DefaultWebSocketAdapterFactory.java | 220 +- .../commons/adapter/FrescoImageAdapter.java | 220 +- .../commons/adapter/FrescoImageComponent.java | 220 +- .../weex/commons/adapter/FrescoImageView.java | 220 +- .../weex/commons/adapter/ImageAdapter.java | 220 +- .../commons/adapter/JSExceptionAdapter.java | 220 +- .../alibaba/weex/commons/util/AssertUtil.java | 220 +- .../weex/commons/util/RequestIdGenerator.java | 15 + .../alibaba/weex/commons/util/ScreenUtil.java | 220 +- .../weex/commons/util/WSEventReporter.java | 192 + android/gradle.properties | 16 + android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 52266 bytes .../gradle/wrapper/gradle-wrapper.properties|6 + android/gradlew | 164 + android/gradlew.bat | 90 + android/license/LICENSE | 16 + android/playground/LICENSE | 202 - android/playground/NOTICE |7 - android/playground/README.md|5 - android/playground/app/build.gradle | 35 +- .../java/com/alibaba/weex/ApplicationTest.java | 20 +- .../com/alibaba/weex/WeappJsBaseTestCase.java | 18 + .../benchmark/BenchmarkActivityTestRule.java| 218 +- .../alibaba/weex/benchmark/BenchmarkTest.java | 218 +- .../com/alibaba/weex/benchmark/BoxPlot.java | 218 +- .../java/com/alibaba/weex/benchmark/Repeat.java | 218 +- .../com/alibaba/weex/benchmark/RepeatRule.java | 218 +- .../weex/benchmark/WeexNativeCompareTest.java | 218 +- .../weex/uitest/TC_AG/AG_AHref_A_Href.java | 18 + .../TC_AG/AG_Border_A_Border_Bottom_Color.java | 18 + .../AG_Border_A_Border_Bottom_Left_Radius.java | 18 + .../AG_Border_A_Border_Bottom_Right_Radius.java | 18 + .../TC_AG/AG_Border_A_Border_Bottom_Width.java | 18 + .../uitest/TC_AG/AG_Border_A_Border_Color.java | 18 + .../TC_AG/AG_Border_A_Border_Left_Color.java| 18 + .../TC_AG/AG_Border_A_Border_Left_Width.java| 18 + .../uitest/TC_AG/AG_Border_A_Border_Radius.java | 18 + .../TC_AG/AG_Border_A_Border_Right_Color.java | 18 + .../TC_AG/AG_Border_A_Border_Right_Width.java | 18 + .../uitest/TC_AG/AG_Border_A_Border_Style.java | 18 + .../TC_AG/AG_Border_A_Border_Top_Color.java | 18 + .../AG_Border_A
[GitHub] incubator-weex issue #70: * [example] fix bugs for 'npm run build:examples' ...
Github user gurisxie commented on the issue: https://github.com/apache/incubator-weex/pull/70 @yyqqing thanks a lot for your past attention about weex. Welcome back if you need weex or discuss other technology. Best Wishes! ---
[07/18] incubator-weex git commit: reduce method
reduce method
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/921c9715
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/921c9715
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/921c9715
Branch: refs/heads/master
Commit: 921c97156ca79b889de40beb9f246f27d95e1502
Parents: 2ff579c
Author: jianbai.gbj
Authored: Tue Sep 26 17:24:40 2017 +0800
Committer: jianbai.gbj
Committed: Tue Sep 26 17:24:40 2017 +0800
--
.../src/main/java/com/taobao/weex/el/parse/ArrayStack.java| 3 ---
android/sdk/src/main/java/com/taobao/weex/el/parse/Block.java | 7 ++-
.../sdk/src/main/java/com/taobao/weex/el/parse/Operator.java | 3 ++-
.../sdk/src/main/java/com/taobao/weex/el/parse/Operators.java | 3 ---
.../sdk/src/main/java/com/taobao/weex/el/parse/Symbol.java| 3 ++-
android/sdk/src/main/java/com/taobao/weex/el/parse/Token.java | 5 +++--
.../ui/component/list/template/WXRecyclerTemplateList.java| 4
android/sdk/src/test/java/com/taobao/weex/el/ParserTest.java | 4 ++--
8 files changed, 11 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/921c9715/android/sdk/src/main/java/com/taobao/weex/el/parse/ArrayStack.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/el/parse/ArrayStack.java
b/android/sdk/src/main/java/com/taobao/weex/el/parse/ArrayStack.java
index 6a4c3bc..0feb85e 100644
--- a/android/sdk/src/main/java/com/taobao/weex/el/parse/ArrayStack.java
+++ b/android/sdk/src/main/java/com/taobao/weex/el/parse/ArrayStack.java
@@ -45,9 +45,6 @@ public class ArrayStack {
stack.add(token);
}
-public boolean empty() {
- return isEmpty();
-}
public T peek() {
return stack.get(stack.size()-1);
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/921c9715/android/sdk/src/main/java/com/taobao/weex/el/parse/Block.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/el/parse/Block.java
b/android/sdk/src/main/java/com/taobao/weex/el/parse/Block.java
index 5db98f9..5d15220 100644
--- a/android/sdk/src/main/java/com/taobao/weex/el/parse/Block.java
+++ b/android/sdk/src/main/java/com/taobao/weex/el/parse/Block.java
@@ -57,10 +57,7 @@ class Block extends Token {
return token.execute(context);
}
-public List getTokens() {
-return tokens;
-}
-
+/**
@Override
public String toString() {
if(getType() == TYPE_ARRAY){
@@ -71,5 +68,5 @@ class Block extends Token {
}
return "{" + tokens + '}';
}
-}
+}*/
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/921c9715/android/sdk/src/main/java/com/taobao/weex/el/parse/Operator.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/el/parse/Operator.java
b/android/sdk/src/main/java/com/taobao/weex/el/parse/Operator.java
index d597be8..d592579 100644
--- a/android/sdk/src/main/java/com/taobao/weex/el/parse/Operator.java
+++ b/android/sdk/src/main/java/com/taobao/weex/el/parse/Operator.java
@@ -93,6 +93,7 @@ class Operator extends Token {
}
}
+/**
@Override
public String toString() {
if(Operators.AND_NOT.equals(getToken())){
@@ -102,5 +103,5 @@ class Operator extends Token {
return "{" + first + getToken() + second + "}";
}
return "{" + self + getToken() + first + ":" + second + "}";
-}
+}*/
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/921c9715/android/sdk/src/main/java/com/taobao/weex/el/parse/Operators.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/el/parse/Operators.java
b/android/sdk/src/main/java/com/taobao/weex/el/parse/Operators.java
index 610b058..b2e1c02 100644
--- a/android/sdk/src/main/java/com/taobao/weex/el/parse/Operators.java
+++ b/android/sdk/src/main/java/com/taobao/weex/el/parse/Operators.java
@@ -484,9 +484,6 @@ public class Operators {
}
-public static final Object keywordValue(String keyword){
-return KEYWORDS.get(keyword);
-}
public static final Map KEYWORDS = new HashMap<>();
static {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/921c9715/android/sdk/src/main/java/com/taobao/weex/el/parse/Symbol.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/el/parse/Symbol.java
b/android/sdk/src/main/java/com/taobao/weex/el/parse/Symbol.java
index 2586d31..e42aa78 100644
--- a/a
[15/18] incubator-weex git commit: reduce method
reduce method
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/aab31956
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/aab31956
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/aab31956
Branch: refs/heads/master
Commit: aab319565d38311588eca6d639a4c5e7edf5fb58
Parents: ca7d560
Author: jianbai.gbj
Authored: Tue Sep 26 19:08:32 2017 +0800
Committer: jianbai.gbj
Committed: Tue Sep 26 19:08:32 2017 +0800
--
.../main/java/com/taobao/weex/dom/WXAttr.java | 9 +-
.../com/taobao/weex/dom/binding/ELUtils.java| 12 ---
.../taobao/weex/dom/binding/WXStatement.java| 93 ++--
3 files changed, 11 insertions(+), 103 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aab31956/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
b/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
index 3434fe3..c3b0399 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
@@ -30,6 +30,7 @@ import com.taobao.weex.common.Constants.Name;
import com.taobao.weex.common.WXImageSharpen;
import com.taobao.weex.dom.binding.ELUtils;
import com.taobao.weex.dom.binding.WXStatement;
+import com.taobao.weex.el.parse.Parser;
import com.taobao.weex.ui.view.listview.WXRecyclerView;
import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXUtils;
@@ -484,15 +485,17 @@ public class WXAttr implements Map,Cloneable {
mBindingAttrs.put(key, value);
return true;
}
-if(ELUtils.isVif(key)){
+if(WXStatement.WX_IF.equals(key)){
if(mStatement == null){
mStatement = new WXStatement();
}
- mStatement.put(key, ELUtils.vifBlock(value.toString()));
+ if(value != null) {
+mStatement.put(key, Parser.parse(value.toString()));
+ }
return true;
}
-if(ELUtils.isVfor(key)){
+if(WXStatement.WX_FOR.equals(key)){
if(mStatement == null){
mStatement = new WXStatement();
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aab31956/android/sdk/src/main/java/com/taobao/weex/dom/binding/ELUtils.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/binding/ELUtils.java
b/android/sdk/src/main/java/com/taobao/weex/dom/binding/ELUtils.java
index c2f3bb8..c0924f0 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/binding/ELUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/binding/ELUtils.java
@@ -93,18 +93,6 @@ public class ELUtils {
return value;
}
-public static boolean isVif(String name){
-return WXStatement.WX_IF.equals(name);
-}
-
-public static boolean isVfor(String name){
-return WXStatement.WX_FOR.equals(name);
-}
-
-public static Token vifBlock(String code){
-return Parser.parse(code);
-}
-
public static Object vforBlock(Object vfor){
if(vfor instanceof JSONObject){
if(((JSONObject) vfor).containsKey(WXStatement.WX_FOR_LIST)){
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aab31956/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java
--
diff --git
a/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java
b/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java
index e17c708..726951d 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java
@@ -18,18 +18,14 @@
*/
package com.taobao.weex.dom.binding;
-import android.support.annotation.NonNull;
import android.support.v4.util.ArrayMap;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
+import android.support.v4.util.SimpleArrayMap;
/**
* Created by furture on 2017/8/17.
* statement expression for template list, like v-if v-for
*/
-public class WXStatement implements Map,Cloneable {
+public class WXStatement extends ArrayMap implements Cloneable {
/**
* v-for statement, like
@@ -67,94 +63,15 @@ public class WXStatement implements Map,Cloneable {
* */
public static final String WX_IF = "[[match]]";
-
-private final ArrayMap map;
-
public WXStatement() {
-this.map = new ArrayMap<>();
-}
-
-public WXStatement(ArrayMap map) {
-this.map = map;
-
[06/18] incubator-weex git commit: Merge branch '0.16-dev' of https://github.com/orifake/incubator-weex into 0.16-dev
Merge branch '0.16-dev' of https://github.com/orifake/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/d43a7a9d Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d43a7a9d Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d43a7a9d Branch: refs/heads/master Commit: d43a7a9d46fc67591cdf7e0a6877dc03405d91e0 Parents: c76b938 5f5fdd7 Author: gurisxie <279483...@qq.com> Authored: Tue Sep 26 17:13:28 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Tue Sep 26 17:13:28 2017 +0800 -- html5/render/browser/extend/api/stream.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[11/18] incubator-weex git commit: * [ios] add available API
* [ios] add available API
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b1ba5136
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b1ba5136
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b1ba5136
Branch: refs/heads/master
Commit: b1ba5136046a13dd151e1dd6d248e85f5e49fd2b
Parents: e293d20
Author: acton393
Authored: Tue Sep 26 17:58:31 2017 +0800
Committer: acton393
Committed: Tue Sep 26 17:58:31 2017 +0800
--
.../Sources/Component/RecycleList/WXRecycleListComponent.m | 6 +-
.../WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m | 6 +-
ios/sdk/WeexSDK/Sources/Component/WXListComponent.m| 6 +-
ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m| 6 +-
4 files changed, 20 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b1ba5136/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m
--
diff --git
a/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m
b/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m
index b434f6d..a1be149 100644
--- a/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m
@@ -102,7 +102,11 @@ WX_EXPORT_METHOD(@selector(scrollTo:options:))
_collectionView.dataSource = self;
_collectionView.delegate = self;
#ifdef __IPHONE_11_0
-_collectionView.contentInsetAdjustmentBehavior =
UIScrollViewContentInsetAdjustmentNever;
+if (@available(iOS 11.0, *)) {
+_collectionView.contentInsetAdjustmentBehavior =
UIScrollViewContentInsetAdjustmentNever;
+} else {
+// Fallback on earlier versions
+}
#endif
_templateManager.collectionView = _collectionView;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b1ba5136/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
index b8ae634..63cbf29 100644
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
@@ -174,7 +174,11 @@ typedef enum : NSUInteger {
_dragController.dragingCell = [[WXCollectionViewCell alloc]
initWithFrame:CGRectMake(0, 0, 100, 100/2.0f)];
_dragController.collectionView = _collectionView;
#ifdef __IPHONE_11_0
-_collectionView.contentInsetAdjustmentBehavior =
UIScrollViewContentInsetAdjustmentNever;
+if (@available(iOS 11.0, *)) {
+_collectionView.contentInsetAdjustmentBehavior =
UIScrollViewContentInsetAdjustmentNever;
+} else {
+// Fallback on earlier versions
+}
#endif
[self performUpdatesWithCompletion:^(BOOL finished) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b1ba5136/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
index 74516fa..f1b3361 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
@@ -156,7 +156,11 @@
_tableView.dataSource = self;
_tableView.userInteractionEnabled = YES;
#ifdef __IPHONE_11_0
-_tableView.contentInsetAdjustmentBehavior =
UIScrollViewContentInsetAdjustmentNever;
+if (@available(iOS 11.0, *)) {
+_tableView.contentInsetAdjustmentBehavior =
UIScrollViewContentInsetAdjustmentNever;
+} else {
+// Fallback on earlier versions
+}
#endif
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b1ba5136/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
index 8ef35e4..1add98f 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -147,7 +147,11 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
scrollView.scrollEnabled = _scrollable;
scrollView.pagingEnabled = _pagingEnabled;
#ifdef __IPHONE_11_0
-scrollView.contentInsetAdjustmentBehavior =
UIScrollViewContentInsetAdjustmentNever;
+if (@available(iOS 11.0, *)) {
+scrollView.contentInsetAdjustmentBehavior =
UIScrollViewContentInsetAdjustment
[16/18] incubator-weex git commit: Merge remote-tracking branch 'origin/0.16-dev-template-list' into 0.16-dev
Merge remote-tracking branch 'origin/0.16-dev-template-list' 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/d6394108 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d6394108 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d6394108 Branch: refs/heads/master Commit: d6394108fd433f63daafa0f5968ca607b4d10b36 Parents: d1e733b aab3195 Author: jianbai.gbj Authored: Tue Sep 26 19:09:11 2017 +0800 Committer: jianbai.gbj Committed: Tue Sep 26 19:09:11 2017 +0800 -- .../main/java/com/taobao/weex/dom/WXAttr.java | 9 +- .../com/taobao/weex/dom/binding/ELUtils.java| 12 --- .../taobao/weex/dom/binding/WXStatement.java| 93 ++-- 3 files changed, 11 insertions(+), 103 deletions(-) --
[05/18] incubator-weex git commit: update
update
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2ff579cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2ff579cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2ff579cf
Branch: refs/heads/master
Commit: 2ff579cf6d422de71e14f8b41136a39f16ca4c6f
Parents: b8ee9c4
Author: jianbai.gbj
Authored: Tue Sep 26 13:32:03 2017 +0800
Committer: jianbai.gbj
Committed: Tue Sep 26 13:32:03 2017 +0800
--
.../weex/ui/component/list/template/WXRecyclerTemplateList.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2ff579cf/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 a854a7c..519c97d 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
@@ -713,10 +713,13 @@ public class WXRecyclerTemplateList extends
WXVContainer imp
cellLifecycleManager.onDestory(i);
}
}
+boolean update = listData != null;
if(param instanceof JSONArray){
listData = (JSONArray) param;
}
-notifyUpdateList();
+if(update){
+notifyUpdateList();
+}
if(listData != null){
for(int i=0; i
[04/18] incubator-weex git commit: notify update data
notify update data
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b8ee9c4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b8ee9c4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b8ee9c4d
Branch: refs/heads/master
Commit: b8ee9c4dec789911c4bd4f0705ab00b93fc822a6
Parents: 671b6c5
Author: jianbai.gbj
Authored: Tue Sep 26 10:16:30 2017 +0800
Committer: jianbai.gbj
Committed: Tue Sep 26 10:16:30 2017 +0800
--
.../list/template/WXRecyclerTemplateList.java | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b8ee9c4d/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 fb60fab..a854a7c 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
@@ -23,6 +23,7 @@ import android.content.Context;
import android.graphics.Point;
import android.graphics.PointF;
import android.os.Build;
+import android.os.Looper;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.util.ArrayMap;
@@ -712,13 +713,10 @@ public class WXRecyclerTemplateList extends
WXVContainer imp
cellLifecycleManager.onDestory(i);
}
}
-boolean update = listData != null;
if(param instanceof JSONArray){
listData = (JSONArray) param;
}
-if(update){
-notifyUpdateList();
-}
+notifyUpdateList();
if(listData != null){
for(int i=0; i imp
if(getHostView() != null
&& listUpdateRunnable != null
&& getHostView().getInnerView() != null){
-getHostView().removeCallbacks(listUpdateRunnable);
-getHostView().post(listUpdateRunnable);
+if(Looper.getMainLooper().getThread().getId() !=
Thread.currentThread().getId()){
+getHostView().removeCallbacks(listUpdateRunnable);
+getHostView().post(listUpdateRunnable);
+}else{
+listUpdateRunnable.run();
+}
}
}
[12/18] incubator-weex git commit: Merge branch '0.16-dev' into 0.16-dev-gitlab
Merge branch '0.16-dev' into 0.16-dev-gitlab Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/81d08efc Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/81d08efc Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/81d08efc Branch: refs/heads/master Commit: 81d08efceb8cbece20246e6d794135cf35dd9350 Parents: 6278d5d b1ba513 Author: zshshr Authored: Tue Sep 26 18:10:28 2017 +0800 Committer: zshshr Committed: Tue Sep 26 18:10:28 2017 +0800 -- .../Sources/Component/RecycleList/WXRecycleListComponent.m | 6 +- .../WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m | 6 +- ios/sdk/WeexSDK/Sources/Component/WXListComponent.m| 6 +- ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m| 6 +- 4 files changed, 20 insertions(+), 4 deletions(-) --
[02/18] incubator-weex git commit: bugfix
bugfix
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/09935a0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/09935a0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/09935a0a
Branch: refs/heads/master
Commit: 09935a0a8b16b161e7828edc77532a7ff59b18fe
Parents: 7d9f00d
Author: jianbai.gbj
Authored: Mon Sep 25 23:47:09 2017 +0800
Committer: jianbai.gbj
Committed: Mon Sep 25 23:47:09 2017 +0800
--
.../com/taobao/weex/ui/component/binding/Statements.java | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/09935a0a/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 559a7d9..243fc22 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
@@ -181,13 +181,16 @@ public class Statements {
WXComponent renderNode = null;
if(renderIndex < parent.getChildCount()){
renderNode = parent.getChild(renderIndex);
-if(renderNode.isWaste()){
-renderNode.setWaste(false);
-}
+
//check is same statment, if true, it is
usabled.
if(!isCreateFromNodeStatement(renderNode,
component)){
renderNode = null;
}
+if(renderNode != null){
+if(renderNode.isWaste()){
+renderNode.setWaste(false);
+}
+}
}
//none resuable render node, create node, add to
parent, but clear node's statement
if(renderNode == null){
@@ -231,7 +234,6 @@ public class Statements {
return 1;
}else{
component.setWaste(false);
-return 1;
}
}
}
[08/18] incubator-weex git commit: Merge remote-tracking branch 'origin/0.16-dev-template-list' into 0.16-dev
Merge remote-tracking branch 'origin/0.16-dev-template-list' 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/e293d206 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e293d206 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e293d206 Branch: refs/heads/master Commit: e293d20683d6c3e8918dd086fa6ebe760833b033 Parents: d43a7a9 921c971 Author: jianbai.gbj Authored: Tue Sep 26 17:26:34 2017 +0800 Committer: jianbai.gbj Committed: Tue Sep 26 17:26:34 2017 +0800 -- .../main/java/com/taobao/weex/el/parse/ArrayStack.java | 3 --- .../src/main/java/com/taobao/weex/el/parse/Block.java | 7 ++- .../main/java/com/taobao/weex/el/parse/Operator.java | 3 ++- .../main/java/com/taobao/weex/el/parse/Operators.java | 3 --- .../src/main/java/com/taobao/weex/el/parse/Symbol.java | 3 ++- .../src/main/java/com/taobao/weex/el/parse/Token.java | 5 +++-- .../list/template/WXRecyclerTemplateList.java | 13 +++-- .../src/test/java/com/taobao/weex/el/ParserTest.java | 4 ++-- 8 files changed, 18 insertions(+), 23 deletions(-) --
[03/18] incubator-weex git commit: Merge branch '0.16-dev' of github.com:gubaojian/incubator-weex into 0.16-dev
Merge branch '0.16-dev' of github.com:gubaojian/incubator-weex into 0.16-dev # Conflicts: # android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Statements.java Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5d8ad08e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5d8ad08e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5d8ad08e Branch: refs/heads/master Commit: 5d8ad08e14d37ec89cce2fd68ef31b51231c3125 Parents: 09935a0 671b6c5 Author: jianbai.gbj Authored: Tue Sep 26 00:00:49 2017 +0800 Committer: jianbai.gbj Committed: Tue Sep 26 00:00:49 2017 +0800 -- .../main/java/com/taobao/weex/ui/component/binding/Statements.java | 1 - 1 file changed, 1 deletion(-) --
[18/18] incubator-weex git commit: Merge branch '0.16-dev'
Merge branch '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/403563d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/403563d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/403563d8 Branch: refs/heads/master Commit: 403563d8fcd308f3f855d1908418ed9322f5fe93 Parents: 94f68f2 fa4726a Author: gurisxie <279483...@qq.com> Authored: Wed Sep 27 10:07:14 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Sep 27 10:07:14 2017 +0800 -- .../main/java/com/taobao/weex/dom/WXAttr.java | 9 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 3 + .../com/taobao/weex/dom/binding/ELUtils.java| 12 --- .../taobao/weex/dom/binding/WXStatement.java| 93 ++-- .../com/taobao/weex/el/parse/ArrayStack.java| 3 - .../java/com/taobao/weex/el/parse/Block.java| 7 +- .../java/com/taobao/weex/el/parse/Operator.java | 3 +- .../com/taobao/weex/el/parse/Operators.java | 3 - .../java/com/taobao/weex/el/parse/Symbol.java | 3 +- .../java/com/taobao/weex/el/parse/Token.java| 5 +- .../ui/component/list/BasicListComponent.java | 52 +-- .../list/template/WXRecyclerTemplateList.java | 13 +-- .../java/com/taobao/weex/el/ParserTest.java | 4 +- html5/render/browser/extend/api/stream.js | 2 +- .../RecycleList/WXRecycleListComponent.m| 6 +- .../Component/Recycler/WXRecyclerComponent.m| 6 +- .../WeexSDK/Sources/Component/WXListComponent.m | 6 +- .../Sources/Component/WXScrollerComponent.m | 6 +- 18 files changed, 54 insertions(+), 182 deletions(-) --
[17/18] incubator-weex git commit: string key, object value
string key, object value
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fa4726a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fa4726a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fa4726a1
Branch: refs/heads/master
Commit: fa4726a1db7c02cdbf7d3e55da593ddb65b319f2
Parents: d639410
Author: jianbai.gbj
Authored: Tue Sep 26 19:11:03 2017 +0800
Committer: jianbai.gbj
Committed: Tue Sep 26 19:11:03 2017 +0800
--
.../sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fa4726a1/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java
--
diff --git
a/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java
b/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java
index 726951d..ca20dca 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java
@@ -25,7 +25,7 @@ import android.support.v4.util.SimpleArrayMap;
* Created by furture on 2017/8/17.
* statement expression for template list, like v-if v-for
*/
-public class WXStatement extends ArrayMap implements Cloneable {
+public class WXStatement extends ArrayMap implements
Cloneable {
/**
* v-for statement, like
[10/18] incubator-weex git commit: handle null
handle 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/96ce41b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/96ce41b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/96ce41b6
Branch: refs/heads/master
Commit: 96ce41b6391bc46fa10c3768581e830db2d6e511
Parents: e293d20
Author: jianbai.gbj
Authored: Tue Sep 26 17:57:08 2017 +0800
Committer: jianbai.gbj
Committed: Tue Sep 26 17:57:08 2017 +0800
--
android/sdk/src/main/java/com/taobao/weex/dom/WXEvent.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/96ce41b6/android/sdk/src/main/java/com/taobao/weex/dom/WXEvent.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXEvent.java
b/android/sdk/src/main/java/com/taobao/weex/dom/WXEvent.java
index 942979f..fe7f8cf 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXEvent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXEvent.java
@@ -109,6 +109,9 @@ public class WXEvent extends ArrayList implements
Serializable, Cloneabl
String eventName = bindings.getString(WXEvent.EVENT_KEY_TYPE);
return eventName;
}
+if(event == null){
+ return null;
+}
return event.toString();
}
[14/18] incubator-weex git commit: Merge branch '0.16-dev-template-list' of https://github.com/gubaojian/incubator-weex into 0.16-dev
Merge branch '0.16-dev-template-list' of https://github.com/gubaojian/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/d1e733b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d1e733b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d1e733b2 Branch: refs/heads/master Commit: d1e733b2aaf049c19a3c34283e2727a9c2f53cb1 Parents: 81d08ef ca7d560 Author: YorkShen Authored: Tue Sep 26 18:24:05 2017 +0800 Committer: YorkShen Committed: Tue Sep 26 18:24:05 2017 +0800 -- .../main/java/com/taobao/weex/dom/WXEvent.java | 3 ++ .../ui/component/list/BasicListComponent.java | 52 +--- 2 files changed, 4 insertions(+), 51 deletions(-) --
[13/18] incubator-weex git commit: common method
common method Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ca7d560e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ca7d560e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ca7d560e Branch: refs/heads/master Commit: ca7d560e08cef0f0d9bb2edaa730261c6f54f549 Parents: 96ce41b Author: jianbai.gbj Authored: Tue Sep 26 18:20:48 2017 +0800 Committer: jianbai.gbj Committed: Tue Sep 26 18:20:48 2017 +0800 -- .../ui/component/list/BasicListComponent.java | 52 +--- 1 file changed, 1 insertion(+), 51 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ca7d560e/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java index f6fe78d..296946a 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java @@ -225,56 +225,6 @@ public abstract class BasicListComponent
[09/18] incubator-weex git commit: Merge branch '0.16-github-dev' into 0.16-dev
Merge branch '0.16-github-dev' into 0.16-dev * 0.16-github-dev: (53 commits) reduce method * [ios] never auto adjust water fall component contentInset * [ios] never adjust contentInset in recyleList view * [ios] set never adjust scrollview contentInset * [ios] change import inner file header method update * [ios] fix type convert warnings * [html5] pair versions for vue & vue-template-compiler. * [html5] fix vue-render tests. notify update data * [doc] complete the set-up-env documentation * [html5] add feature offset appear. * [html5] fix ci. * [doc] Closes #489: already merged to 0.16-dev. * [html5] release v0.12.16. * [html5] fix trigger click problem. * [html5] update start command for develop * [doc] add message about animation callback * [html5] add custom jsonp callback name support * [html5] release v0.12.14 ... Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6278d5df Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6278d5df Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6278d5df Branch: refs/heads/master Commit: 6278d5df25ad18e86273d90429a8839ed0d7f818 Parents: 5d8ad08 e293d20 Author: atomtong Authored: Tue Sep 26 17:48:42 2017 +0800 Committer: atomtong Committed: Tue Sep 26 17:48:42 2017 +0800 -- .../com/taobao/weex/el/parse/ArrayStack.java| 3 - .../java/com/taobao/weex/el/parse/Block.java| 7 +- .../java/com/taobao/weex/el/parse/Operator.java | 3 +- .../com/taobao/weex/el/parse/Operators.java | 3 - .../java/com/taobao/weex/el/parse/Symbol.java | 3 +- .../java/com/taobao/weex/el/parse/Token.java| 5 +- .../list/template/WXRecyclerTemplateList.java | 13 +- .../java/com/taobao/weex/el/ParserTest.java | 4 +- build/build.js | 17 +- build/config.js | 12 +- build/karma.vue.conf.js | 2 + 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 +- examples/vue/showcase/a-node-click.vue | 6 +- html5/render/browser/extend/api/stream.js | 2 +- html5/render/vue/README.md | 42 + html5/render/vue/components/a.js| 19 +-- html5/render/vue/components/div.js | 4 +- html5/render/vue/components/input.js| 9 +- 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/loading-indicator.js | 13 +- .../components/scrollable/mixins/scrollable.js | 59 +++ .../vue/components/scrollable/scroller.js | 2 +- .../render/vue/components/scrollable/style.css | 22 ++- .../vue/components/scrollable/waterfall.js | 2 +- html5/render/vue/components/slider/index.js | 2 + 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/core/node.js | 148 +--- html5/render/vue/env/event-manager.js | 168 +++ html5/render/vue/env/viewport.js| 8 + html5/render/vue/env/weex.js| 21 +++ html5/render/vue/index.js | 15 ++ html5/render/vue/lib/envd/index.js | 6 +- html5/render/vue/lib/gesture.js | 2 +- html5/render/vue/mixins/base.js | 4 +- html5/render/vue/mixins/input-common.js | 38 - html5/render/vue/mixins/style.js| 18 +- html5/render/vue/modules/animation.js | 44 +++-- html5/render/vue/modules/index.js | 4 +- html5/render/vue/modules/meta.js| 36 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/component.js | 166 +++--- html5/render/vue/utils/event.js | 16 ++ html5/render/vue/utils/func.js | 5 +- html5/render/vue/utils/style.js | 13 +- 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.j
[01/18] incubator-weex git commit: * [html5] add custom jsonp callback name support
Repository: incubator-weex
Updated Branches:
refs/heads/master 94f68f238 -> 403563d8f
* [html5] add custom jsonp callback name support
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5f5fdd71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5f5fdd71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5f5fdd71
Branch: refs/heads/master
Commit: 5f5fdd71eecc7b34f9fa7978db622c53c8723d3e
Parents: e52d273
Author: Yujingyi <349758...@qq.com>
Authored: Wed Sep 20 16:16:13 2017 +0800
Committer: Yujingyi <349758...@qq.com>
Committed: Wed Sep 20 16:16:13 2017 +0800
--
html5/render/browser/extend/api/stream.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5f5fdd71/html5/render/browser/extend/api/stream.js
--
diff --git a/html5/render/browser/extend/api/stream.js
b/html5/render/browser/extend/api/stream.js
index 8e27dd7..d843a10 100644
--- a/html5/render/browser/extend/api/stream.js
+++ b/html5/render/browser/extend/api/stream.js
@@ -30,7 +30,7 @@ let jsonpCnt = 0
const ERROR_STATE = -1
function _jsonp (config, callback, progressCallback) {
- const cbName = 'jsonp_' + (++jsonpCnt)
+ const cbName = config.jsonpCallbackName || 'jsonp_' + (++jsonpCnt)
let url
if (!config.url) {
[incubator-weex] Git Push Summary
Repository: incubator-weex Updated Branches: refs/heads/release [created] 403563d8f
[2/2] incubator-weex git commit: Merge branch 'patch-1' of https://github.com/iamqk/incubator-weex
Merge branch 'patch-1' of https://github.com/iamqk/incubator-weex Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/72a41b80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/72a41b80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/72a41b80 Branch: refs/heads/master Commit: 72a41b804938fde1f239e6ad8ddf5dea3eff328f Parents: 403563d 5b59d18 Author: gurisxie <279483...@qq.com> Authored: Wed Sep 27 11:02:07 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Sep 27 11:02:07 2017 +0800 -- examples/component/web-demo.we | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
[1/2] incubator-weex git commit: Update web-demo.we
Repository: incubator-weex
Updated Branches:
refs/heads/master 403563d8f -> 72a41b804
Update web-demo.we
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5b59d18f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5b59d18f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5b59d18f
Branch: refs/heads/master
Commit: 5b59d18f38ba5a16cb2070c860b45fec3f30308b
Parents: 75101d5
Author: iamqk
Authored: Thu Sep 21 16:06:28 2017 +0800
Committer: GitHub
Committed: Thu Sep 21 16:06:28 2017 +0800
--
examples/component/web-demo.we | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5b59d18f/examples/component/web-demo.we
--
diff --git a/examples/component/web-demo.we b/examples/component/web-demo.we
index 2be930c..0b7e953 100644
--- a/examples/component/web-demo.we
+++ b/examples/component/web-demo.we
@@ -46,6 +46,7 @@
module.exports = {
methods: {
goback: function() {
+var $webview = require('@weex-module/webview');
var webElement = this.$el('webview');
$webview.goBack(webElement.ref);
},
@@ -70,4 +71,4 @@
}
}
}
-
\ No newline at end of file
+
[2/2] incubator-weex git commit: Merge branch 'doc-bugfix-typo' of https://github.com/rubenoost/incubator-weex
Merge branch 'doc-bugfix-typo' of https://github.com/rubenoost/incubator-weex Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9f96caef Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9f96caef Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9f96caef Branch: refs/heads/master Commit: 9f96caefca27cba0b12539929cee89778f366f34 Parents: 72a41b8 54c7cd0 Author: gurisxie <279483...@qq.com> Authored: Wed Sep 27 11:20:38 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Sep 27 11:20:38 2017 +0800 -- --
[1/2] incubator-weex git commit: Fix typo on homepage
Repository: incubator-weex Updated Branches: refs/heads/master 72a41b804 -> 9f96caefc Fix typo on homepage Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/54c7cd0a Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/54c7cd0a Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/54c7cd0a Branch: refs/heads/master Commit: 54c7cd0aa467433dd1264b8aa0548a920bc56ccd Parents: 75101d5 Author: Ruben Oost Authored: Thu Sep 14 14:31:50 2017 +0200 Committer: GitHub Committed: Thu Sep 14 14:31:50 2017 +0200 -- doc/themes/weex/languages/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/54c7cd0a/doc/themes/weex/languages/en.yml -- diff --git a/doc/themes/weex/languages/en.yml b/doc/themes/weex/languages/en.yml index 12cec69..f0e5270 100644 --- a/doc/themes/weex/languages/en.yml +++ b/doc/themes/weex/languages/en.yml @@ -90,7 +90,7 @@ menu: download: Download resources: Resources tools: Tools - invovled: Get Invovled + invovled: Get Involved advanced: Advanced github: GitHub legacy: Old Syntax Doc
[01/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Repository: incubator-weex Updated Branches: refs/heads/master 9f96caefc -> 717913371 Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/901be692 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/901be692 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/901be692 Branch: refs/heads/master Commit: 901be692f9b2469b88460f13881b78a094c80a0c Parents: 5123304 20b1157 Author: misakuo Authored: Thu Sep 21 14:18:37 2017 +0800 Committer: misakuo Committed: Thu Sep 21 14:18:37 2017 +0800 -- .travis.yml | 47 +--- POSSIBLE-NOTICES-FOR-BIN-DIST | 5 +- .../com/taobao/weex/dom/WXTextDomObject.java| 11 +- .../java/com/taobao/weex/utils/LogLevel.java| 4 +- .../java/com/taobao/weex/utils/WXLogUtils.java | 14 +++ dangerfile-android.js | 108 +++ dangerfile-ios.js | 107 ++ dangerfile-jsfm.js | 105 ++ package.json| 5 +- scripts/generate_apache_release.sh | 2 +- test/pages/components/iconfont.vue | 6 +- test/scripts/components/scroll-event.test.js| 2 +- 12 files changed, 360 insertions(+), 56 deletions(-) --
[12/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4656959c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4656959c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4656959c Branch: refs/heads/master Commit: 4656959c140dc3f8f540e4ad2e62a030cf9303b8 Parents: fc7bcca 27f69b7 Author: misakuo Authored: Wed Sep 27 18:42:30 2017 +0800 Committer: misakuo Committed: Wed Sep 27 18:42:30 2017 +0800 -- .../taobao/weex/ui/component/WXComponent.java | 10 ++- .../com/taobao/weex/utils/BoxShadowUtil.java| 65 +++- 2 files changed, 42 insertions(+), 33 deletions(-) --
[02/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9314f309 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9314f309 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9314f309 Branch: refs/heads/master Commit: 9314f30904dd47ce496968dc54a6a4f18652e9b1 Parents: 901be69 cfc4393 Author: misakuo Authored: Mon Sep 25 11:00:50 2017 +0800 Committer: misakuo Committed: Mon Sep 25 11:00:50 2017 +0800 -- .travis.yml | 13 +- WeexSDK.podspec |2 - .../main/java/com/taobao/weex/WXSDKEngine.java |5 + .../java/com/taobao/weex/WXSDKInstance.java | 12 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 31 +- .../java/com/taobao/weex/common/Constants.java | 30 +- .../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 +- .../com/taobao/weex/dom/WXTextDomObject.java| 13 +- .../com/taobao/weex/dom/action/Actions.java |4 +- .../taobao/weex/dom/action/AddEventAction.java | 11 +- .../weex/dom/action/CreateBodyAction.java | 12 +- .../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 | 93 +- .../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 +- .../weex/ui/component/binding/Layouts.java | 92 + .../weex/ui/component/binding/Statements.java | 413 .../ui/component/list/RecyclerTransform.java| 90 + .../taobao/weex/ui/component/list/WXCell.java |2 +- .../list/template/CellLifecycleManager.java | 211 ++ .../list/template/TemplateStickyHelper.java | 252 +++ .../list/template/TemplateViewHolder.java | 79 + .../list/template/WXRecyclerTemplateList.java | 1460 ++ .../weex/ui/view/WXBaseCircleIndicator.java |4 +- .../listview/ExtendedLinearLayoutManager.java | 20 + .../weex/ui/view/listview/WXRecyclerView.java | 50 + .../java/com/taobao/weex/utils/WXUtils.java | 21 + .../com/taobao/weex/el/IfStatementTest.java | 155 ++ .../java/com/taobao/weex/el/ParserTest.java | 244 +++ .../ui/component/binding/BindingValueTest.java | 65 + .../ui/component/binding/StatementTest.java | 184 ++ .../ui/component/list/WXListComponentTest.java |3 +- dangerfile-android.js |2 +- dangerfile-ios.js |2 +- dangerfile-jsfm.js |2 +- dangerfile.js |2 +- 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/cn/references/weex-variable.md | 48 + 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 +- doc/source/references/weex-variable.md | 52 +- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 151 +- .../Sources/Bridge/WXDebugLoggerBridge.h| 26 - .../Sources/Bridge/WXDebugLoggerBridge.m| 213 --- ios/sdk/WeexSDK/Sources/Bridge/WXJSCor
[08/14] incubator-weex git commit: * [android] better solution for draw box-shadow
* [android] better solution for draw box-shadow
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0839ee18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0839ee18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0839ee18
Branch: refs/heads/master
Commit: 0839ee18c27c52a9030e06c3e2cd5142ee6db616
Parents: fa4726a
Author: misakuo
Authored: Wed Sep 27 15:22:02 2017 +0800
Committer: misakuo
Committed: Wed Sep 27 15:22:02 2017 +0800
--
.../com/taobao/weex/utils/BoxShadowUtil.java| 47
1 file changed, 19 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0839ee18/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
index b1ebb63..c1cc693 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
@@ -20,6 +20,7 @@ package com.taobao.weex.utils;
import android.content.res.Resources;
import android.graphics.Bitmap;
+import android.graphics.BlurMaskFilter;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.ColorFilter;
@@ -40,6 +41,8 @@ import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
+import com.taobao.weex.WXEnvironment;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -103,18 +106,21 @@ public class BoxShadowUtil {
float[] radii, float shadowRadius,
float shadowSpread,
float dx, float dy, int
shadowColor) {
-
-if (shadowRadius == 0) {
- // 0 can not draw shadow layer
- shadowRadius = 0.01f;
-}
-
int canvasWidth = viewWidth + 2 * (int) (shadowRadius + shadowSpread +
Math.abs(dx));
int canvasHeight = viewHeight + 2 * (int) (shadowRadius + shadowSpread +
Math.abs(dy));
Bitmap output = Bitmap.createBitmap(canvasWidth, canvasHeight,
Bitmap.Config.ARGB_);
Canvas canvas = new Canvas(output);
+if (false && WXEnvironment.isApkDebugable()) {
+ // Using for debug
+ Paint strokePaint = new Paint();
+ strokePaint.setColor(Color.BLACK);
+ strokePaint.setStrokeWidth(2);
+ strokePaint.setStyle(Paint.Style.STROKE);
+ canvas.drawRect(canvas.getClipBounds(), strokePaint);
+}
+
float offsetX = shadowRadius + shadowSpread + Math.abs(dx);
float offsetY = shadowRadius + shadowSpread + Math.abs(dy);
RectF selfRect = new RectF(
@@ -127,36 +133,21 @@ public class BoxShadowUtil {
// can not antialias
canvas.clipPath(contentPath, Region.Op.DIFFERENCE);
-float shadowLeft, shadowTop;
-if (shadowSpread == 0f) {
- shadowLeft = shadowRadius;
- shadowTop = shadowRadius;
-} else {
- shadowLeft = shadowRadius + dx - shadowSpread;
- shadowTop = shadowRadius + dy - shadowSpread;
-}
RectF shadowRect = new RectF(
-shadowLeft,
-shadowTop,
-canvasWidth - shadowRadius + shadowSpread,
-canvasHeight - shadowRadius + shadowSpread);
+0f, 0f,
+viewWidth + 2f * shadowSpread, viewHeight + 2f * shadowSpread
+);
-shadowRect.top += Math.abs(dy);
-shadowRect.bottom -= Math.abs(dy);
-shadowRect.left += Math.abs(dx);
-shadowRect.right -= Math.abs(dx);
+float shadowDx = 2f * dx + shadowRadius;
+float shadowDy = 2f * dy + shadowRadius;
+shadowRect.offset(shadowDx, shadowDy);
Paint shadowPaint = new Paint();
shadowPaint.setAntiAlias(true);
shadowPaint.setColor(shadowColor);
shadowPaint.setStyle(Paint.Style.FILL);
-float shadowDx = 0f, shadowDy = 0f;
-if (shadowSpread == 0f) {
- shadowDx = dx;
- shadowDy = dy;
-}
-shadowPaint.setShadowLayer(shadowRadius, shadowDx, shadowDy, shadowColor);
+shadowPaint.setMaskFilter(new BlurMaskFilter(shadowRadius,
BlurMaskFilter.Blur.NORMAL));
Path shadowPath = new Path();
float[] shadowRadii = new float[8];
[04/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/08e1c3e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/08e1c3e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/08e1c3e4 Branch: refs/heads/master Commit: 08e1c3e4e81c57e8fc50852d0452b8d32d78fe47 Parents: 5e342b4 0faa131 Author: misakuo Authored: Mon Sep 25 17:11:28 2017 +0800 Committer: misakuo Committed: Mon Sep 25 17:11:28 2017 +0800 -- pre-build/native-bundle-main.js | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) --
[11/14] incubator-weex git commit: * [android] fix negative offset
* [android] fix negative offset
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/27f69b75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/27f69b75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/27f69b75
Branch: refs/heads/master
Commit: 27f69b75a2881afcc229a78e00b43ae2a2d0abd6
Parents: 007dd16
Author: misakuo
Authored: Wed Sep 27 18:05:08 2017 +0800
Committer: misakuo
Committed: Wed Sep 27 18:05:08 2017 +0800
--
.../main/java/com/taobao/weex/utils/BoxShadowUtil.java| 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/27f69b75/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
index 892e80c..3f522dd 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
@@ -139,8 +139,14 @@ public class BoxShadowUtil {
viewWidth + 2f * shadowSpread, viewHeight + 2f * shadowSpread
);
-float shadowDx = 2f * dx + shadowRadius;
-float shadowDy = 2f * dy + shadowRadius;
+float shadowDx = shadowRadius;
+float shadowDy = shadowRadius;
+if (dx > 0) {
+ shadowDx = shadowDx + 2f * dx;
+}
+if (dy > 0) {
+ shadowDy = shadowDy + 2f * dy;
+}
shadowRect.offset(shadowDx, shadowDy);
Paint shadowPaint = new Paint();
[05/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8eb26bb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8eb26bb7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8eb26bb7 Branch: refs/heads/master Commit: 8eb26bb76572ad4d3c31302da3d5793380fbddd7 Parents: 08e1c3e 2513b0f Author: misakuo Authored: Tue Sep 26 11:24:07 2017 +0800 Committer: misakuo Committed: Tue Sep 26 11:24:07 2017 +0800 -- .../dom/action/AbstractAddElementAction.java|12 +- .../weex/ui/component/binding/Statements.java | 7 + .../list/template/WXRecyclerTemplateList.java | 3 + build/config.js | 3 +- 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 +- html5/runtime/index.js | 4 +- html5/runtime/vdom/Document.js |15 +- html5/runtime/vdom/Element.js |45 +- html5/test/unit/default/vm/events.js| 4 +- html5/test/unit/default/vm/vm.js| 2 +- html5/test/unit/runtime/vdom/index.js | 2 +- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +- .../RecycleList/WXComponent+DataBinding.mm | 9 +- .../RecycleList/WXRecycleListUpdateManager.h| 1 + .../Sources/Component/WXImageComponent.m| 1 + .../WeexSDK/Sources/Component/WXTextComponent.m | 8 +- .../Sources/Display/WXComponent+Display.m |14 +- .../WeexSDK/Sources/Manager/WXBridgeManager.h | 4 +- .../Sources/Manager/WXComponentManager.m| 4 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m |61 +- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 8 + ios/sdk/WeexSDK/Sources/Module/WXTransition.h |16 + ios/sdk/WeexSDK/Sources/Module/WXTransition.m |24 + ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 + package.json| 6 +- packages/weex-js-framework/index.js | 44451 + packages/weex-js-framework/index.min.js | 9 +- packages/weex-js-framework/package.json | 2 +- packages/weex-js-runtime/index.js | 270 +- packages/weex-js-runtime/index.min.js | 6 +- packages/weex-js-runtime/index.min.js.gz| Bin 13215 -> 0 bytes start | 5 +- 36 files changed, 22756 insertions(+), 22379 deletions(-) --
[10/14] incubator-weex git commit: * [android] prevent NPE
* [android] prevent NPE
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/007dd161
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/007dd161
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/007dd161
Branch: refs/heads/master
Commit: 007dd161ddee82d6ce4b681b33e43646d8b6568b
Parents: 2c75a84
Author: misakuo
Authored: Wed Sep 27 17:12:33 2017 +0800
Committer: misakuo
Committed: Wed Sep 27 17:12:33 2017 +0800
--
.../java/com/taobao/weex/ui/component/WXComponent.java| 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/007dd161/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
--
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index b389d67..e9d7296 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -44,6 +44,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.MarginLayoutParams;
import android.widget.FrameLayout;
+
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.taobao.weex.ComponentObserver;
@@ -67,8 +68,6 @@ import com.taobao.weex.tracing.Stopwatch;
import com.taobao.weex.tracing.WXTracing;
import com.taobao.weex.ui.IFComponentHolder;
import com.taobao.weex.ui.animation.WXAnimationModule;
-import com.taobao.weex.ui.component.binding.Statements;
-import com.taobao.weex.ui.component.list.WXCell;
import com.taobao.weex.ui.component.pesudo.OnActivePseudoListner;
import com.taobao.weex.ui.component.pesudo.PesudoStatus;
import com.taobao.weex.ui.component.pesudo.TouchActivePseudoListener;
@@ -88,6 +87,7 @@ import com.taobao.weex.utils.WXReflectionUtils;
import com.taobao.weex.utils.WXResourceUtils;
import com.taobao.weex.utils.WXUtils;
import com.taobao.weex.utils.WXViewUtils;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -854,7 +854,11 @@ public abstract class WXComponent
implements IWXObject, IWXActi
case Constants.Name.BOTTOM:
return true;
case Constants.Name.BOX_SHADOW:
-updateBoxShadow();
+try {
+ updateBoxShadow();
+} catch (Throwable t) {
+ t.printStackTrace();
+}
return true;
default:
return false;
[14/14] incubator-weex git commit: Merge branch '0.16-dev'
Merge branch '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/71791337 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/71791337 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/71791337 Branch: refs/heads/master Commit: 7179133716331a991c875d4bf149c1cc9025d164 Parents: 9f96cae c643cea Author: gurisxie <279483...@qq.com> Authored: Wed Sep 27 22:09:22 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Sep 27 22:09:22 2017 +0800 -- .../taobao/weex/ui/component/WXComponent.java | 10 ++- .../weex/ui/view/WXBaseCircleIndicator.java | 40 ++-- .../com/taobao/weex/utils/BoxShadowUtil.java| 65 +++- 3 files changed, 60 insertions(+), 55 deletions(-) --
[09/14] incubator-weex git commit: * [android] prevent NPE
* [android] prevent NPE
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2c75a841
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2c75a841
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2c75a841
Branch: refs/heads/master
Commit: 2c75a84128a262f770e026acf6236ab8d152ee54
Parents: 0839ee1
Author: misakuo
Authored: Wed Sep 27 17:10:24 2017 +0800
Committer: misakuo
Committed: Wed Sep 27 17:10:24 2017 +0800
--
.../java/com/taobao/weex/utils/BoxShadowUtil.java | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c75a841/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
index c1cc693..892e80c 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
@@ -40,6 +40,7 @@ import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
+import android.view.ViewParent;
import com.taobao.weex.WXEnvironment;
@@ -147,7 +148,9 @@ public class BoxShadowUtil {
shadowPaint.setColor(shadowColor);
shadowPaint.setStyle(Paint.Style.FILL);
-shadowPaint.setMaskFilter(new BlurMaskFilter(shadowRadius,
BlurMaskFilter.Blur.NORMAL));
+if (shadowRadius > 0) {
+ shadowPaint.setMaskFilter(new BlurMaskFilter(shadowRadius,
BlurMaskFilter.Blur.NORMAL));
+}
Path shadowPath = new Path();
float[] shadowRadii = new float[8];
@@ -186,8 +189,13 @@ public class BoxShadowUtil {
target.getOverlay().clear();
target.getOverlay().add(shadowDrawable);
//Relayout to ensure the shadows are fully drawn
- target.getParent().requestLayout();
- ((ViewGroup) target.getParent()).invalidate(shadowDrawable.getBounds());
+ ViewParent parent = target.getParent();
+ if (parent != null) {
+parent.requestLayout();
+if (parent instanceof ViewGroup) {
+ ((ViewGroup) parent).invalidate(shadowDrawable.getBounds());
+}
+ }
} else {
// I have a dream that one day our minSdkVersion will equals or higher
than 21
Log.w("BoxShadowUtil", "Call setNormalBoxShadow() requires API level 18
or higher.");
[13/14] incubator-weex git commit: * [android] remove 3 methods
* [android] remove 3 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/c643ceaf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c643ceaf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c643ceaf
Branch: refs/heads/master
Commit: c643ceafeb284602acc2ea87a0a0cf1dfa5d7854
Parents: 4656959
Author: misakuo
Authored: Wed Sep 27 18:52:02 2017 +0800
Committer: misakuo
Committed: Wed Sep 27 18:52:02 2017 +0800
--
.../weex/ui/view/WXBaseCircleIndicator.java | 40 +---
1 file changed, 18 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c643ceaf/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
--
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
index 5983f2d..ea4a817 100644
---
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
+++
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
@@ -24,6 +24,7 @@ import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Paint.Style;
+import android.support.v4.view.ViewPager;
import android.support.v4.view.ViewPager.OnPageChangeListener;
import android.util.AttributeSet;
import android.view.MotionEvent;
@@ -34,7 +35,7 @@ import com.taobao.weex.ui.view.gesture.WXGestureObservable;
import com.taobao.weex.utils.WXViewUtils;
-public class WXBaseCircleIndicator extends FrameLayout implements
OnPageChangeListener, WXGestureObservable {
+public class WXBaseCircleIndicator extends FrameLayout implements
WXGestureObservable {
private final Paint mPaintPage = new Paint();
private final Paint mPaintFill = new Paint();
@@ -59,6 +60,8 @@ public class WXBaseCircleIndicator extends FrameLayout
implements OnPageChangeLi
private int fillColor = Color.DKGRAY;
private int realCurrentItem;
+ private OnPageChangeListener mListener;
+
public WXBaseCircleIndicator(Context context) {
super(context);
@@ -91,12 +94,21 @@ public class WXBaseCircleIndicator extends FrameLayout
implements OnPageChangeLi
}
/**
- * @param mCircleViewPager the mCircleViewPager to set
+ * @param viewPager the mCircleViewPager to set
*/
- public void setCircleViewPager(WXCircleViewPager mCircleViewPager) {
-this.mCircleViewPager = mCircleViewPager;
-if (this.mCircleViewPager != null) {
- this.mCircleViewPager.addOnPageChangeListener(this);
+ public void setCircleViewPager(WXCircleViewPager viewPager) {
+mCircleViewPager = viewPager;
+if (mCircleViewPager != null) {
+ if (mListener == null) {
+mListener = new ViewPager.SimpleOnPageChangeListener() {
+ @Override
+ public void onPageSelected(int position) {
+realCurrentItem = mCircleViewPager.getRealCurrentItem();
+invalidate();
+ }
+};
+ }
+ this.mCircleViewPager.addOnPageChangeListener(mListener);
this.realCurrentItem = mCircleViewPager.getRealCurrentItem();
if (realCurrentItem < 0) {
realCurrentItem = 0;
@@ -105,22 +117,6 @@ public class WXBaseCircleIndicator extends FrameLayout
implements OnPageChangeLi
requestLayout();
}
- @Override
- public void onPageScrolled(int position, float positionOffset, int
positionOffsetPixels) {
-
- }
-
- @Override
- public void onPageSelected(int position) {
-realCurrentItem = mCircleViewPager.getRealCurrentItem();
-invalidate();
- }
-
- @Override
- public void onPageScrollStateChanged(int state) {
-
- }
-
/**
* @param radius the radius to set
*/
[07/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fc7bcca3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fc7bcca3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fc7bcca3 Branch: refs/heads/master Commit: fc7bcca34fb90be76fb1fbffad9c2873746e5cb6 Parents: 2077164 fa4726a Author: misakuo Authored: Wed Sep 27 14:25:15 2017 +0800 Committer: misakuo Committed: Wed Sep 27 14:25:15 2017 +0800 -- .../main/java/com/taobao/weex/dom/WXAttr.java | 9 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 3 + .../com/taobao/weex/dom/binding/ELUtils.java| 12 --- .../taobao/weex/dom/binding/WXStatement.java| 93 ++-- .../com/taobao/weex/el/parse/ArrayStack.java| 3 - .../java/com/taobao/weex/el/parse/Block.java| 7 +- .../java/com/taobao/weex/el/parse/Operator.java | 3 +- .../com/taobao/weex/el/parse/Operators.java | 3 - .../java/com/taobao/weex/el/parse/Symbol.java | 3 +- .../java/com/taobao/weex/el/parse/Token.java| 5 +- .../ui/component/list/BasicListComponent.java | 52 +-- .../list/template/WXRecyclerTemplateList.java | 13 +-- .../java/com/taobao/weex/el/ParserTest.java | 4 +- html5/render/browser/extend/api/stream.js | 2 +- .../RecycleList/WXComponent+DataBinding.h | 2 +- .../RecycleList/WXComponent+DataBinding.mm | 2 + .../RecycleList/WXRecycleListComponent.m| 7 ++ .../Component/Recycler/WXRecyclerComponent.m| 7 ++ .../WeexSDK/Sources/Component/WXListComponent.m | 7 ++ .../Sources/Component/WXScrollerComponent.m | 7 ++ .../WeexSDK/Sources/Manager/WXTracingManager.m | 6 +- .../WeexSDK/Sources/Module/WXNavigatorModule.h | 3 +- ios/sdk/WeexSDKTests/WXStreamModuleTests.m | 2 +- 23 files changed, 71 insertions(+), 184 deletions(-) --
[03/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5e342b4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5e342b4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5e342b4b Branch: refs/heads/master Commit: 5e342b4b0546a36be2b7b2ee65d8c093b7544525 Parents: 9314f30 0e9760a Author: misakuo Authored: Mon Sep 25 11:13:42 2017 +0800 Committer: misakuo Committed: Mon Sep 25 11:13:42 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(-) --
[05/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5e342b4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5e342b4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5e342b4b Branch: refs/heads/release Commit: 5e342b4b0546a36be2b7b2ee65d8c093b7544525 Parents: 9314f30 0e9760a Author: misakuo Authored: Mon Sep 25 11:13:42 2017 +0800 Committer: misakuo Committed: Mon Sep 25 11:13:42 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(-) --
[06/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/20771648 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/20771648 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/20771648 Branch: refs/heads/master Commit: 20771648e257894b8ba870b895c9db8148088e7e Parents: 8eb26bb 915935b Author: misakuo Authored: Tue Sep 26 15:53:51 2017 +0800 Committer: misakuo Committed: Tue Sep 26 15:53:51 2017 +0800 -- build/build.js | 17 +- build/config.js | 12 +- build/karma.vue.conf.js | 2 + examples/vue/showcase/a-node-click.vue | 6 +- html5/render/vue/README.md | 42 + 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/loading-indicator.js | 13 +- .../components/scrollable/mixins/scrollable.js | 59 +++ .../vue/components/scrollable/scroller.js | 2 +- .../render/vue/components/scrollable/style.css | 22 ++- .../vue/components/scrollable/waterfall.js | 2 +- html5/render/vue/components/slider/index.js | 2 + 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/core/node.js | 148 +--- html5/render/vue/env/event-manager.js | 168 +++ html5/render/vue/env/viewport.js| 8 + html5/render/vue/env/weex.js| 21 +++ html5/render/vue/index.js | 15 ++ html5/render/vue/lib/envd/index.js | 6 +- html5/render/vue/lib/gesture.js | 2 +- html5/render/vue/mixins/base.js | 4 +- html5/render/vue/mixins/input-common.js | 38 - html5/render/vue/mixins/style.js| 18 +- html5/render/vue/modules/animation.js | 44 +++-- html5/render/vue/modules/index.js | 4 +- html5/render/vue/modules/meta.js| 36 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/component.js | 166 +++--- html5/render/vue/utils/event.js | 16 ++ html5/render/vue/utils/func.js | 5 +- html5/render/vue/utils/style.js | 13 +- 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 - ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +- package.json| 6 +- .../weex-vue-slider/package.json| 2 +- packages/weex-vue-render/README.md | 42 + packages/weex-vue-render/package.json | 8 +- packages/weex-vue-render/src/index.core.js | 20 ++- packages/weex-vue-render/src/index.js | 17 +- scripts/release_files.rules | 1 + vue.html| 15 +- 56 files changed, 810 insertions(+), 339 deletions(-) --
[16/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4656959c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4656959c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4656959c Branch: refs/heads/release Commit: 4656959c140dc3f8f540e4ad2e62a030cf9303b8 Parents: fc7bcca 27f69b7 Author: misakuo Authored: Wed Sep 27 18:42:30 2017 +0800 Committer: misakuo Committed: Wed Sep 27 18:42:30 2017 +0800 -- .../taobao/weex/ui/component/WXComponent.java | 10 ++- .../com/taobao/weex/utils/BoxShadowUtil.java| 65 +++- 2 files changed, 42 insertions(+), 33 deletions(-) --
[03/18] incubator-weex git commit: Update web-demo.we
Update web-demo.we
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5b59d18f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5b59d18f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5b59d18f
Branch: refs/heads/release
Commit: 5b59d18f38ba5a16cb2070c860b45fec3f30308b
Parents: 75101d5
Author: iamqk
Authored: Thu Sep 21 16:06:28 2017 +0800
Committer: GitHub
Committed: Thu Sep 21 16:06:28 2017 +0800
--
examples/component/web-demo.we | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5b59d18f/examples/component/web-demo.we
--
diff --git a/examples/component/web-demo.we b/examples/component/web-demo.we
index 2be930c..0b7e953 100644
--- a/examples/component/web-demo.we
+++ b/examples/component/web-demo.we
@@ -46,6 +46,7 @@
module.exports = {
methods: {
goback: function() {
+var $webview = require('@weex-module/webview');
var webElement = this.$el('webview');
$webview.goBack(webElement.ref);
},
@@ -70,4 +71,4 @@
}
}
}
-
\ No newline at end of file
+
[14/18] incubator-weex git commit: * [android] prevent NPE
* [android] prevent NPE
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/007dd161
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/007dd161
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/007dd161
Branch: refs/heads/release
Commit: 007dd161ddee82d6ce4b681b33e43646d8b6568b
Parents: 2c75a84
Author: misakuo
Authored: Wed Sep 27 17:12:33 2017 +0800
Committer: misakuo
Committed: Wed Sep 27 17:12:33 2017 +0800
--
.../java/com/taobao/weex/ui/component/WXComponent.java| 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/007dd161/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
--
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index b389d67..e9d7296 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -44,6 +44,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.MarginLayoutParams;
import android.widget.FrameLayout;
+
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.taobao.weex.ComponentObserver;
@@ -67,8 +68,6 @@ import com.taobao.weex.tracing.Stopwatch;
import com.taobao.weex.tracing.WXTracing;
import com.taobao.weex.ui.IFComponentHolder;
import com.taobao.weex.ui.animation.WXAnimationModule;
-import com.taobao.weex.ui.component.binding.Statements;
-import com.taobao.weex.ui.component.list.WXCell;
import com.taobao.weex.ui.component.pesudo.OnActivePseudoListner;
import com.taobao.weex.ui.component.pesudo.PesudoStatus;
import com.taobao.weex.ui.component.pesudo.TouchActivePseudoListener;
@@ -88,6 +87,7 @@ import com.taobao.weex.utils.WXReflectionUtils;
import com.taobao.weex.utils.WXResourceUtils;
import com.taobao.weex.utils.WXUtils;
import com.taobao.weex.utils.WXViewUtils;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -854,7 +854,11 @@ public abstract class WXComponent
implements IWXObject, IWXActi
case Constants.Name.BOTTOM:
return true;
case Constants.Name.BOX_SHADOW:
-updateBoxShadow();
+try {
+ updateBoxShadow();
+} catch (Throwable t) {
+ t.printStackTrace();
+}
return true;
default:
return false;
[01/18] incubator-weex git commit: Fix typo on homepage
Repository: incubator-weex Updated Branches: refs/heads/release 403563d8f -> 717913371 Fix typo on homepage Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/54c7cd0a Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/54c7cd0a Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/54c7cd0a Branch: refs/heads/release Commit: 54c7cd0aa467433dd1264b8aa0548a920bc56ccd Parents: 75101d5 Author: Ruben Oost Authored: Thu Sep 14 14:31:50 2017 +0200 Committer: GitHub Committed: Thu Sep 14 14:31:50 2017 +0200 -- doc/themes/weex/languages/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/54c7cd0a/doc/themes/weex/languages/en.yml -- diff --git a/doc/themes/weex/languages/en.yml b/doc/themes/weex/languages/en.yml index 12cec69..f0e5270 100644 --- a/doc/themes/weex/languages/en.yml +++ b/doc/themes/weex/languages/en.yml @@ -90,7 +90,7 @@ menu: download: Download resources: Resources tools: Tools - invovled: Get Invovled + invovled: Get Involved advanced: Advanced github: GitHub legacy: Old Syntax Doc
[08/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/20771648 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/20771648 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/20771648 Branch: refs/heads/release Commit: 20771648e257894b8ba870b895c9db8148088e7e Parents: 8eb26bb 915935b Author: misakuo Authored: Tue Sep 26 15:53:51 2017 +0800 Committer: misakuo Committed: Tue Sep 26 15:53:51 2017 +0800 -- build/build.js | 17 +- build/config.js | 12 +- build/karma.vue.conf.js | 2 + examples/vue/showcase/a-node-click.vue | 6 +- html5/render/vue/README.md | 42 + 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/loading-indicator.js | 13 +- .../components/scrollable/mixins/scrollable.js | 59 +++ .../vue/components/scrollable/scroller.js | 2 +- .../render/vue/components/scrollable/style.css | 22 ++- .../vue/components/scrollable/waterfall.js | 2 +- html5/render/vue/components/slider/index.js | 2 + 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/core/node.js | 148 +--- html5/render/vue/env/event-manager.js | 168 +++ html5/render/vue/env/viewport.js| 8 + html5/render/vue/env/weex.js| 21 +++ html5/render/vue/index.js | 15 ++ html5/render/vue/lib/envd/index.js | 6 +- html5/render/vue/lib/gesture.js | 2 +- html5/render/vue/mixins/base.js | 4 +- html5/render/vue/mixins/input-common.js | 38 - html5/render/vue/mixins/style.js| 18 +- html5/render/vue/modules/animation.js | 44 +++-- html5/render/vue/modules/index.js | 4 +- html5/render/vue/modules/meta.js| 36 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/component.js | 166 +++--- html5/render/vue/utils/event.js | 16 ++ html5/render/vue/utils/func.js | 5 +- html5/render/vue/utils/style.js | 13 +- 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 - ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +- package.json| 6 +- .../weex-vue-slider/package.json| 2 +- packages/weex-vue-render/README.md | 42 + packages/weex-vue-render/package.json | 8 +- packages/weex-vue-render/src/index.core.js | 20 ++- packages/weex-vue-render/src/index.js | 17 +- scripts/release_files.rules | 1 + vue.html| 15 +- 56 files changed, 810 insertions(+), 339 deletions(-) --
[04/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9314f309 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9314f309 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9314f309 Branch: refs/heads/release Commit: 9314f30904dd47ce496968dc54a6a4f18652e9b1 Parents: 901be69 cfc4393 Author: misakuo Authored: Mon Sep 25 11:00:50 2017 +0800 Committer: misakuo Committed: Mon Sep 25 11:00:50 2017 +0800 -- .travis.yml | 13 +- WeexSDK.podspec |2 - .../main/java/com/taobao/weex/WXSDKEngine.java |5 + .../java/com/taobao/weex/WXSDKInstance.java | 12 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 31 +- .../java/com/taobao/weex/common/Constants.java | 30 +- .../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 +- .../com/taobao/weex/dom/WXTextDomObject.java| 13 +- .../com/taobao/weex/dom/action/Actions.java |4 +- .../taobao/weex/dom/action/AddEventAction.java | 11 +- .../weex/dom/action/CreateBodyAction.java | 12 +- .../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 | 93 +- .../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 +- .../weex/ui/component/binding/Layouts.java | 92 + .../weex/ui/component/binding/Statements.java | 413 .../ui/component/list/RecyclerTransform.java| 90 + .../taobao/weex/ui/component/list/WXCell.java |2 +- .../list/template/CellLifecycleManager.java | 211 ++ .../list/template/TemplateStickyHelper.java | 252 +++ .../list/template/TemplateViewHolder.java | 79 + .../list/template/WXRecyclerTemplateList.java | 1460 ++ .../weex/ui/view/WXBaseCircleIndicator.java |4 +- .../listview/ExtendedLinearLayoutManager.java | 20 + .../weex/ui/view/listview/WXRecyclerView.java | 50 + .../java/com/taobao/weex/utils/WXUtils.java | 21 + .../com/taobao/weex/el/IfStatementTest.java | 155 ++ .../java/com/taobao/weex/el/ParserTest.java | 244 +++ .../ui/component/binding/BindingValueTest.java | 65 + .../ui/component/binding/StatementTest.java | 184 ++ .../ui/component/list/WXListComponentTest.java |3 +- dangerfile-android.js |2 +- dangerfile-ios.js |2 +- dangerfile-jsfm.js |2 +- dangerfile.js |2 +- 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/cn/references/weex-variable.md | 48 + 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 +- doc/source/references/weex-variable.md | 52 +- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 151 +- .../Sources/Bridge/WXDebugLoggerBridge.h| 26 - .../Sources/Bridge/WXDebugLoggerBridge.m| 213 --- ios/sdk/WeexSDK/Sources/Bridge/WXJSCo
[10/18] incubator-weex git commit: Merge branch 'doc-bugfix-typo' of https://github.com/rubenoost/incubator-weex
Merge branch 'doc-bugfix-typo' of https://github.com/rubenoost/incubator-weex Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9f96caef Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9f96caef Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9f96caef Branch: refs/heads/release Commit: 9f96caefca27cba0b12539929cee89778f366f34 Parents: 72a41b8 54c7cd0 Author: gurisxie <279483...@qq.com> Authored: Wed Sep 27 11:20:38 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Sep 27 11:20:38 2017 +0800 -- --
[13/18] incubator-weex git commit: * [android] prevent NPE
* [android] prevent NPE
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2c75a841
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2c75a841
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2c75a841
Branch: refs/heads/release
Commit: 2c75a84128a262f770e026acf6236ab8d152ee54
Parents: 0839ee1
Author: misakuo
Authored: Wed Sep 27 17:10:24 2017 +0800
Committer: misakuo
Committed: Wed Sep 27 17:10:24 2017 +0800
--
.../java/com/taobao/weex/utils/BoxShadowUtil.java | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c75a841/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
index c1cc693..892e80c 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
@@ -40,6 +40,7 @@ import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
+import android.view.ViewParent;
import com.taobao.weex.WXEnvironment;
@@ -147,7 +148,9 @@ public class BoxShadowUtil {
shadowPaint.setColor(shadowColor);
shadowPaint.setStyle(Paint.Style.FILL);
-shadowPaint.setMaskFilter(new BlurMaskFilter(shadowRadius,
BlurMaskFilter.Blur.NORMAL));
+if (shadowRadius > 0) {
+ shadowPaint.setMaskFilter(new BlurMaskFilter(shadowRadius,
BlurMaskFilter.Blur.NORMAL));
+}
Path shadowPath = new Path();
float[] shadowRadii = new float[8];
@@ -186,8 +189,13 @@ public class BoxShadowUtil {
target.getOverlay().clear();
target.getOverlay().add(shadowDrawable);
//Relayout to ensure the shadows are fully drawn
- target.getParent().requestLayout();
- ((ViewGroup) target.getParent()).invalidate(shadowDrawable.getBounds());
+ ViewParent parent = target.getParent();
+ if (parent != null) {
+parent.requestLayout();
+if (parent instanceof ViewGroup) {
+ ((ViewGroup) parent).invalidate(shadowDrawable.getBounds());
+}
+ }
} else {
// I have a dream that one day our minSdkVersion will equals or higher
than 21
Log.w("BoxShadowUtil", "Call setNormalBoxShadow() requires API level 18
or higher.");
[11/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fc7bcca3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fc7bcca3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fc7bcca3 Branch: refs/heads/release Commit: fc7bcca34fb90be76fb1fbffad9c2873746e5cb6 Parents: 2077164 fa4726a Author: misakuo Authored: Wed Sep 27 14:25:15 2017 +0800 Committer: misakuo Committed: Wed Sep 27 14:25:15 2017 +0800 -- .../main/java/com/taobao/weex/dom/WXAttr.java | 9 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 3 + .../com/taobao/weex/dom/binding/ELUtils.java| 12 --- .../taobao/weex/dom/binding/WXStatement.java| 93 ++-- .../com/taobao/weex/el/parse/ArrayStack.java| 3 - .../java/com/taobao/weex/el/parse/Block.java| 7 +- .../java/com/taobao/weex/el/parse/Operator.java | 3 +- .../com/taobao/weex/el/parse/Operators.java | 3 - .../java/com/taobao/weex/el/parse/Symbol.java | 3 +- .../java/com/taobao/weex/el/parse/Token.java| 5 +- .../ui/component/list/BasicListComponent.java | 52 +-- .../list/template/WXRecyclerTemplateList.java | 13 +-- .../java/com/taobao/weex/el/ParserTest.java | 4 +- html5/render/browser/extend/api/stream.js | 2 +- .../RecycleList/WXComponent+DataBinding.h | 2 +- .../RecycleList/WXComponent+DataBinding.mm | 2 + .../RecycleList/WXRecycleListComponent.m| 7 ++ .../Component/Recycler/WXRecyclerComponent.m| 7 ++ .../WeexSDK/Sources/Component/WXListComponent.m | 7 ++ .../Sources/Component/WXScrollerComponent.m | 7 ++ .../WeexSDK/Sources/Manager/WXTracingManager.m | 6 +- .../WeexSDK/Sources/Module/WXNavigatorModule.h | 3 +- ios/sdk/WeexSDKTests/WXStreamModuleTests.m | 2 +- 23 files changed, 71 insertions(+), 184 deletions(-) --
[02/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/901be692 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/901be692 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/901be692 Branch: refs/heads/release Commit: 901be692f9b2469b88460f13881b78a094c80a0c Parents: 5123304 20b1157 Author: misakuo Authored: Thu Sep 21 14:18:37 2017 +0800 Committer: misakuo Committed: Thu Sep 21 14:18:37 2017 +0800 -- .travis.yml | 47 +--- POSSIBLE-NOTICES-FOR-BIN-DIST | 5 +- .../com/taobao/weex/dom/WXTextDomObject.java| 11 +- .../java/com/taobao/weex/utils/LogLevel.java| 4 +- .../java/com/taobao/weex/utils/WXLogUtils.java | 14 +++ dangerfile-android.js | 108 +++ dangerfile-ios.js | 107 ++ dangerfile-jsfm.js | 105 ++ package.json| 5 +- scripts/generate_apache_release.sh | 2 +- test/pages/components/iconfont.vue | 6 +- test/scripts/components/scroll-event.test.js| 2 +- 12 files changed, 360 insertions(+), 56 deletions(-) --
[15/18] incubator-weex git commit: * [android] fix negative offset
* [android] fix negative offset
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/27f69b75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/27f69b75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/27f69b75
Branch: refs/heads/release
Commit: 27f69b75a2881afcc229a78e00b43ae2a2d0abd6
Parents: 007dd16
Author: misakuo
Authored: Wed Sep 27 18:05:08 2017 +0800
Committer: misakuo
Committed: Wed Sep 27 18:05:08 2017 +0800
--
.../main/java/com/taobao/weex/utils/BoxShadowUtil.java| 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/27f69b75/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
index 892e80c..3f522dd 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
@@ -139,8 +139,14 @@ public class BoxShadowUtil {
viewWidth + 2f * shadowSpread, viewHeight + 2f * shadowSpread
);
-float shadowDx = 2f * dx + shadowRadius;
-float shadowDy = 2f * dy + shadowRadius;
+float shadowDx = shadowRadius;
+float shadowDy = shadowRadius;
+if (dx > 0) {
+ shadowDx = shadowDx + 2f * dx;
+}
+if (dy > 0) {
+ shadowDy = shadowDy + 2f * dy;
+}
shadowRect.offset(shadowDx, shadowDy);
Paint shadowPaint = new Paint();
[17/18] incubator-weex git commit: * [android] remove 3 methods
* [android] remove 3 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/c643ceaf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c643ceaf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c643ceaf
Branch: refs/heads/release
Commit: c643ceafeb284602acc2ea87a0a0cf1dfa5d7854
Parents: 4656959
Author: misakuo
Authored: Wed Sep 27 18:52:02 2017 +0800
Committer: misakuo
Committed: Wed Sep 27 18:52:02 2017 +0800
--
.../weex/ui/view/WXBaseCircleIndicator.java | 40 +---
1 file changed, 18 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c643ceaf/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
--
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
index 5983f2d..ea4a817 100644
---
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
+++
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
@@ -24,6 +24,7 @@ import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Paint.Style;
+import android.support.v4.view.ViewPager;
import android.support.v4.view.ViewPager.OnPageChangeListener;
import android.util.AttributeSet;
import android.view.MotionEvent;
@@ -34,7 +35,7 @@ import com.taobao.weex.ui.view.gesture.WXGestureObservable;
import com.taobao.weex.utils.WXViewUtils;
-public class WXBaseCircleIndicator extends FrameLayout implements
OnPageChangeListener, WXGestureObservable {
+public class WXBaseCircleIndicator extends FrameLayout implements
WXGestureObservable {
private final Paint mPaintPage = new Paint();
private final Paint mPaintFill = new Paint();
@@ -59,6 +60,8 @@ public class WXBaseCircleIndicator extends FrameLayout
implements OnPageChangeLi
private int fillColor = Color.DKGRAY;
private int realCurrentItem;
+ private OnPageChangeListener mListener;
+
public WXBaseCircleIndicator(Context context) {
super(context);
@@ -91,12 +94,21 @@ public class WXBaseCircleIndicator extends FrameLayout
implements OnPageChangeLi
}
/**
- * @param mCircleViewPager the mCircleViewPager to set
+ * @param viewPager the mCircleViewPager to set
*/
- public void setCircleViewPager(WXCircleViewPager mCircleViewPager) {
-this.mCircleViewPager = mCircleViewPager;
-if (this.mCircleViewPager != null) {
- this.mCircleViewPager.addOnPageChangeListener(this);
+ public void setCircleViewPager(WXCircleViewPager viewPager) {
+mCircleViewPager = viewPager;
+if (mCircleViewPager != null) {
+ if (mListener == null) {
+mListener = new ViewPager.SimpleOnPageChangeListener() {
+ @Override
+ public void onPageSelected(int position) {
+realCurrentItem = mCircleViewPager.getRealCurrentItem();
+invalidate();
+ }
+};
+ }
+ this.mCircleViewPager.addOnPageChangeListener(mListener);
this.realCurrentItem = mCircleViewPager.getRealCurrentItem();
if (realCurrentItem < 0) {
realCurrentItem = 0;
@@ -105,22 +117,6 @@ public class WXBaseCircleIndicator extends FrameLayout
implements OnPageChangeLi
requestLayout();
}
- @Override
- public void onPageScrolled(int position, float positionOffset, int
positionOffsetPixels) {
-
- }
-
- @Override
- public void onPageSelected(int position) {
-realCurrentItem = mCircleViewPager.getRealCurrentItem();
-invalidate();
- }
-
- @Override
- public void onPageScrollStateChanged(int state) {
-
- }
-
/**
* @param radius the radius to set
*/
[06/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/08e1c3e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/08e1c3e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/08e1c3e4 Branch: refs/heads/release Commit: 08e1c3e4e81c57e8fc50852d0452b8d32d78fe47 Parents: 5e342b4 0faa131 Author: misakuo Authored: Mon Sep 25 17:11:28 2017 +0800 Committer: misakuo Committed: Mon Sep 25 17:11:28 2017 +0800 -- pre-build/native-bundle-main.js | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) --
[12/18] incubator-weex git commit: * [android] better solution for draw box-shadow
* [android] better solution for draw box-shadow
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0839ee18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0839ee18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0839ee18
Branch: refs/heads/release
Commit: 0839ee18c27c52a9030e06c3e2cd5142ee6db616
Parents: fa4726a
Author: misakuo
Authored: Wed Sep 27 15:22:02 2017 +0800
Committer: misakuo
Committed: Wed Sep 27 15:22:02 2017 +0800
--
.../com/taobao/weex/utils/BoxShadowUtil.java| 47
1 file changed, 19 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0839ee18/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
index b1ebb63..c1cc693 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
@@ -20,6 +20,7 @@ package com.taobao.weex.utils;
import android.content.res.Resources;
import android.graphics.Bitmap;
+import android.graphics.BlurMaskFilter;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.ColorFilter;
@@ -40,6 +41,8 @@ import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
+import com.taobao.weex.WXEnvironment;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -103,18 +106,21 @@ public class BoxShadowUtil {
float[] radii, float shadowRadius,
float shadowSpread,
float dx, float dy, int
shadowColor) {
-
-if (shadowRadius == 0) {
- // 0 can not draw shadow layer
- shadowRadius = 0.01f;
-}
-
int canvasWidth = viewWidth + 2 * (int) (shadowRadius + shadowSpread +
Math.abs(dx));
int canvasHeight = viewHeight + 2 * (int) (shadowRadius + shadowSpread +
Math.abs(dy));
Bitmap output = Bitmap.createBitmap(canvasWidth, canvasHeight,
Bitmap.Config.ARGB_);
Canvas canvas = new Canvas(output);
+if (false && WXEnvironment.isApkDebugable()) {
+ // Using for debug
+ Paint strokePaint = new Paint();
+ strokePaint.setColor(Color.BLACK);
+ strokePaint.setStrokeWidth(2);
+ strokePaint.setStyle(Paint.Style.STROKE);
+ canvas.drawRect(canvas.getClipBounds(), strokePaint);
+}
+
float offsetX = shadowRadius + shadowSpread + Math.abs(dx);
float offsetY = shadowRadius + shadowSpread + Math.abs(dy);
RectF selfRect = new RectF(
@@ -127,36 +133,21 @@ public class BoxShadowUtil {
// can not antialias
canvas.clipPath(contentPath, Region.Op.DIFFERENCE);
-float shadowLeft, shadowTop;
-if (shadowSpread == 0f) {
- shadowLeft = shadowRadius;
- shadowTop = shadowRadius;
-} else {
- shadowLeft = shadowRadius + dx - shadowSpread;
- shadowTop = shadowRadius + dy - shadowSpread;
-}
RectF shadowRect = new RectF(
-shadowLeft,
-shadowTop,
-canvasWidth - shadowRadius + shadowSpread,
-canvasHeight - shadowRadius + shadowSpread);
+0f, 0f,
+viewWidth + 2f * shadowSpread, viewHeight + 2f * shadowSpread
+);
-shadowRect.top += Math.abs(dy);
-shadowRect.bottom -= Math.abs(dy);
-shadowRect.left += Math.abs(dx);
-shadowRect.right -= Math.abs(dx);
+float shadowDx = 2f * dx + shadowRadius;
+float shadowDy = 2f * dy + shadowRadius;
+shadowRect.offset(shadowDx, shadowDy);
Paint shadowPaint = new Paint();
shadowPaint.setAntiAlias(true);
shadowPaint.setColor(shadowColor);
shadowPaint.setStyle(Paint.Style.FILL);
-float shadowDx = 0f, shadowDy = 0f;
-if (shadowSpread == 0f) {
- shadowDx = dx;
- shadowDy = dy;
-}
-shadowPaint.setShadowLayer(shadowRadius, shadowDx, shadowDy, shadowColor);
+shadowPaint.setMaskFilter(new BlurMaskFilter(shadowRadius,
BlurMaskFilter.Blur.NORMAL));
Path shadowPath = new Path();
float[] shadowRadii = new float[8];
[07/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8eb26bb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8eb26bb7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8eb26bb7 Branch: refs/heads/release Commit: 8eb26bb76572ad4d3c31302da3d5793380fbddd7 Parents: 08e1c3e 2513b0f Author: misakuo Authored: Tue Sep 26 11:24:07 2017 +0800 Committer: misakuo Committed: Tue Sep 26 11:24:07 2017 +0800 -- .../dom/action/AbstractAddElementAction.java|12 +- .../weex/ui/component/binding/Statements.java | 7 + .../list/template/WXRecyclerTemplateList.java | 3 + build/config.js | 3 +- 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 +- html5/runtime/index.js | 4 +- html5/runtime/vdom/Document.js |15 +- html5/runtime/vdom/Element.js |45 +- html5/test/unit/default/vm/events.js| 4 +- html5/test/unit/default/vm/vm.js| 2 +- html5/test/unit/runtime/vdom/index.js | 2 +- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +- .../RecycleList/WXComponent+DataBinding.mm | 9 +- .../RecycleList/WXRecycleListUpdateManager.h| 1 + .../Sources/Component/WXImageComponent.m| 1 + .../WeexSDK/Sources/Component/WXTextComponent.m | 8 +- .../Sources/Display/WXComponent+Display.m |14 +- .../WeexSDK/Sources/Manager/WXBridgeManager.h | 4 +- .../Sources/Manager/WXComponentManager.m| 4 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m |61 +- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 8 + ios/sdk/WeexSDK/Sources/Module/WXTransition.h |16 + ios/sdk/WeexSDK/Sources/Module/WXTransition.m |24 + ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 + package.json| 6 +- packages/weex-js-framework/index.js | 44451 + packages/weex-js-framework/index.min.js | 9 +- packages/weex-js-framework/package.json | 2 +- packages/weex-js-runtime/index.js | 270 +- packages/weex-js-runtime/index.min.js | 6 +- packages/weex-js-runtime/index.min.js.gz| Bin 13215 -> 0 bytes start | 5 +- 36 files changed, 22756 insertions(+), 22379 deletions(-) --
[09/18] incubator-weex git commit: Merge branch 'patch-1' of https://github.com/iamqk/incubator-weex
Merge branch 'patch-1' of https://github.com/iamqk/incubator-weex Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/72a41b80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/72a41b80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/72a41b80 Branch: refs/heads/release Commit: 72a41b804938fde1f239e6ad8ddf5dea3eff328f Parents: 403563d 5b59d18 Author: gurisxie <279483...@qq.com> Authored: Wed Sep 27 11:02:07 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Sep 27 11:02:07 2017 +0800 -- examples/component/web-demo.we | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
