You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/09/27 02:07:30 UTC
[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 <34...@qq.com>
Authored: Wed Sep 20 16:16:13 2017 +0800
Committer: Yujingyi <34...@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) {
[06/18] incubator-weex git commit: Merge branch '0.16-dev' of
https://github.com/orifake/incubator-weex into 0.16-dev
Posted by gu...@apache.org.
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 <27...@qq.com>
Authored: Tue Sep 26 17:13:28 2017 +0800
Committer: gurisxie <27...@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(-)
----------------------------------------------------------------------
[12/18] incubator-weex git commit: Merge branch '0.16-dev' into
0.16-dev-gitlab
Posted by gu...@apache.org.
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 <zh...@gmail.com>
Authored: Tue Sep 26 18:10:28 2017 +0800
Committer: zshshr <zh...@gmail.com>
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
Posted by gu...@apache.org.
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 <ji...@alibaba-inc.com>
Authored: Mon Sep 25 23:47:09 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
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;
}
}
}
[10/18] incubator-weex git commit: handle null
Posted by gu...@apache.org.
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 <ji...@alibaba-inc.com>
Authored: Tue Sep 26 17:57:08 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
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<String> implements Serializable, Cloneabl
String eventName = bindings.getString(WXEvent.EVENT_KEY_TYPE);
return eventName;
}
+ if(event == null){
+ return null;
+ }
return event.toString();
}
[17/18] incubator-weex git commit: string key, object value
Posted by gu...@apache.org.
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 <ji...@alibaba-inc.com>
Authored: Tue Sep 26 19:11:03 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
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<String, Object> implements Cloneable {
/**
* v-for statement, like
[13/18] incubator-weex git commit: common method
Posted by gu...@apache.org.
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 <ji...@alibaba-inc.com>
Authored: Tue Sep 26 18:20:48 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
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<T extends ViewGroup & ListComponentView
return params;
}
- /**
- * These transform functions are supported:
- * - `scale(x,y)`: scale item, x and y should be a positive float number.
- * - `translate(x,y)`: translate item, `x` and `y` shoule be integer numbers.
- * - `opacity(n)`: change the transparency of item, `n` must in `[0,1.0]`.
- * - `rotate(n)`: rotate item, n is integer number.
- *
- * @param raw
- * @return
- */
- private RecyclerView.ItemDecoration parseTransforms(String raw) {
- if (raw == null) {
- return null;
- }
- float scaleX = 0f, scaleY = 0f;
- int translateX = 0, translateY = 0;
- float opacity = 0f;
- int rotate = 0;
- //public TransformItemDecoration(boolean isVertical,float alpha,int translateX,int translateY,int rotation,float scale)
- Matcher matcher = transformPattern.matcher(raw);
- while (matcher.find()) {
- String match = matcher.group();
- String name = matcher.group(1);
- try {
- switch (name) {
- case "scale":
- scaleX = Float.parseFloat(matcher.group(2));
- scaleY = Float.parseFloat(matcher.group(3));
- break;
- case "translate":
- translateX = Integer.parseInt(matcher.group(2));
- translateY = Integer.parseInt(matcher.group(3));
- break;
- case "opacity":
- opacity = Float.parseFloat(matcher.group(2));
- break;
- case "rotate":
- rotate = Integer.parseInt(matcher.group(2));
- break;
- default:
- WXLogUtils.e(TAG, "Invaild transform expression:" + match);
- break;
- }
- } catch (NumberFormatException e) {
- WXLogUtils.e("", e);
- WXLogUtils.e(TAG, "Invaild transform expression:" + match);
- }
- }
- return new TransformItemDecoration(getOrientation() == Constants.Orientation.VERTICAL, opacity, translateX, translateY, rotate, scaleX, scaleY);
- }
abstract T generateListView(Context context, int orientation);
@@ -284,7 +234,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
String transforms = (String) getDomObject().getAttrs().get(TRANSFORM);
if (transforms != null) {
- bounceRecyclerView.getInnerView().addItemDecoration(parseTransforms(transforms));
+ bounceRecyclerView.getInnerView().addItemDecoration(RecyclerTransform.parseTransforms(getOrientation(), transforms));
}
mItemAnimator=bounceRecyclerView.getInnerView().getItemAnimator();
[04/18] incubator-weex git commit: notify update data
Posted by gu...@apache.org.
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 <ji...@alibaba-inc.com>
Authored: Tue Sep 26 10:16:30 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
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<BounceRecyclerView> 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<listData.size(); i++){
cellLifecycleManager.onCreate(i);
@@ -1338,8 +1336,12 @@ public class WXRecyclerTemplateList extends WXVContainer<BounceRecyclerView> 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();
+ }
}
}
[09/18] incubator-weex git commit: Merge branch '0.16-github-dev'
into 0.16-dev
Posted by gu...@apache.org.
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 <to...@qq.com>
Authored: Tue Sep 26 17:48:42 2017 +0800
Committer: atomtong <to...@qq.com>
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.js | 5 -
.../RecycleList/WXComponent+DataBinding.h | 2 +-
.../RecycleList/WXComponent+DataBinding.mm | 2 +
.../RecycleList/WXRecycleListComponent.m | 3 +
.../Component/Recycler/WXRecyclerComponent.m | 3 +
.../WeexSDK/Sources/Component/WXListComponent.m | 3 +
.../Sources/Component/WXScrollerComponent.m | 3 +
.../WeexSDK/Sources/Manager/WXTracingManager.m | 6 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +-
.../WeexSDK/Sources/Module/WXNavigatorModule.h | 3 +-
ios/sdk/WeexSDKTests/WXStreamModuleTests.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 +
start | 5 +-
vue.html | 15 +-
79 files changed, 925 insertions(+), 434 deletions(-)
----------------------------------------------------------------------
[14/18] incubator-weex git commit: Merge branch
'0.16-dev-template-list' of https://github.com/gubaojian/incubator-weex into
0.16-dev
Posted by gu...@apache.org.
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 <sh...@gmail.com>
Authored: Tue Sep 26 18:24:05 2017 +0800
Committer: YorkShen <sh...@gmail.com>
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(-)
----------------------------------------------------------------------
[16/18] incubator-weex git commit: Merge remote-tracking branch
'origin/0.16-dev-template-list' into 0.16-dev
Posted by gu...@apache.org.
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 <ji...@alibaba-inc.com>
Authored: Tue Sep 26 19:09:11 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
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
Posted by gu...@apache.org.
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 <ji...@alibaba-inc.com>
Authored: Tue Sep 26 13:32:03 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
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<BounceRecyclerView> 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<listData.size(); i++){
cellLifecycleManager.onCreate(i);
[18/18] incubator-weex git commit: Merge branch '0.16-dev'
Posted by gu...@apache.org.
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 <27...@qq.com>
Authored: Wed Sep 27 10:07:14 2017 +0800
Committer: gurisxie <27...@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(-)
----------------------------------------------------------------------
[11/18] incubator-weex git commit: * [ios] add available API
Posted by gu...@apache.org.
* [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 <zh...@gmail.com>
Authored: Tue Sep 26 17:58:31 2017 +0800
Committer: acton393 <zh...@gmail.com>
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 = UIScrollViewContentInsetAdjustmentNever;
+ } else {
+ // Fallback on earlier versions
+ }
#endif
if (self.ancestorScroller) {
[15/18] incubator-weex git commit: reduce method
Posted by gu...@apache.org.
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 <ji...@alibaba-inc.com>
Authored: Tue Sep 26 19:08:32 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
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<String, Object>,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<String, Object>,Cloneable {
+public class WXStatement extends ArrayMap implements Cloneable {
/**
* v-for statement, like
@@ -67,94 +63,15 @@ public class WXStatement implements Map<String, Object>,Cloneable {
* */
public static final String WX_IF = "[[match]]";
-
- private final ArrayMap<String, Object> map;
-
public WXStatement() {
- this.map = new ArrayMap<>();
- }
-
- public WXStatement(ArrayMap<String, Object> map) {
- this.map = map;
- }
-
- @Override
- public boolean equals(Object o) {
- return map.equals(o);
- }
-
- @Override
- public int hashCode() {
- return map.hashCode();
- }
-
-
- @Override
- public int size() {
- return map.size();
- }
-
- @Override
- public boolean isEmpty() {
- return map.isEmpty();
}
- @Override
- public boolean containsKey(Object key) {
- return map.containsKey(key);
- }
-
- @Override
- public boolean containsValue(Object value) {
- return map.containsValue(value);
+ public WXStatement(SimpleArrayMap map) {
+ super(map);
}
@Override
- public Object get(Object key) {
- return map.get(key);
- }
-
- @Override
- public Object put(String key, Object value) {
- return map.put(key, value);
- }
-
- @Override
- public Object remove(Object key) {
- return map.remove(key);
- }
-
- @Override
- public void putAll(@NonNull Map<? extends String, ?> m) {
- map.putAll(m);
- }
-
- @Override
- public void clear() {
- map.clear();
- }
-
- @NonNull
- @Override
- public Set<String> keySet() {
- return map.keySet();
- }
-
- @NonNull
- @Override
- public Collection<Object> values() {
- return map.values();
- }
-
- @NonNull
- @Override
- public Set<Entry<String, Object>> entrySet() {
- return map.entrySet();
- }
-
-
- @Override
protected WXStatement clone(){
- return new WXStatement(map);
+ return new WXStatement(this);
}
}
[08/18] incubator-weex git commit: Merge remote-tracking branch
'origin/0.16-dev-template-list' into 0.16-dev
Posted by gu...@apache.org.
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 <ji...@alibaba-inc.com>
Authored: Tue Sep 26 17:26:34 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
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
Posted by gu...@apache.org.
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 <ji...@alibaba-inc.com>
Authored: Tue Sep 26 00:00:49 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
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(-)
----------------------------------------------------------------------
[07/18] incubator-weex git commit: reduce method
Posted by gu...@apache.org.
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 <ji...@alibaba-inc.com>
Authored: Tue Sep 26 17:24:40 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
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<T> {
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<Token> 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<String,Object> 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/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
@@ -30,8 +30,9 @@ public class Symbol {
this.pos = pos;
}
+ /**
@Override
public String toString() {
return op;
- }
+ }*/
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/921c9715/android/sdk/src/main/java/com/taobao/weex/el/parse/Token.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/el/parse/Token.java b/android/sdk/src/main/java/com/taobao/weex/el/parse/Token.java
index 03e496a..88a6ff8 100644
--- a/android/sdk/src/main/java/com/taobao/weex/el/parse/Token.java
+++ b/android/sdk/src/main/java/com/taobao/weex/el/parse/Token.java
@@ -69,15 +69,16 @@ public class Token {
return 0;
}
}else if(type == TYPE_KEYWORD){
- return Operators.keywordValue(token);
+ return Operators.KEYWORDS.get(token);
}
throw new IllegalArgumentException("unhandled token type " + type);
}
+ /***
@Override
public String toString() {
return "{" + token + "," + type + '}';
- }
+ }*/
public String getToken() {
return token;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/921c9715/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 519c97d..1ca589b 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
@@ -1461,8 +1461,4 @@ public class WXRecyclerTemplateList extends WXVContainer<BounceRecyclerView> imp
}
return componentList;
}
-
- public Map<String, WXCell> getTemplates() {
- return mTemplates;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/921c9715/android/sdk/src/test/java/com/taobao/weex/el/ParserTest.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/test/java/com/taobao/weex/el/ParserTest.java b/android/sdk/src/test/java/com/taobao/weex/el/ParserTest.java
index 32f8c2e..b95e85a 100644
--- a/android/sdk/src/test/java/com/taobao/weex/el/ParserTest.java
+++ b/android/sdk/src/test/java/com/taobao/weex/el/ParserTest.java
@@ -108,8 +108,8 @@ public class ParserTest extends TestCase {
public void testBracket(){
- Assert.assertEquals(Parser.parse("(item.name)").toString(), Parser.parse("(((item.name)))").toString());
- Assert.assertEquals(Parser.parse("((item.name))").toString(), Parser.parse("(((item.name)))").toString());
+ // Assert.assertEquals(Parser.parse("(item.name)").toString(), Parser.parse("(((item.name)))").toString());
+ // Assert.assertEquals(Parser.parse("((item.name))").toString(), Parser.parse("(((item.name)))").toString());
Assert.assertEquals("hello world", Parser.parse("(((item.name)))").execute(createContext()));
Assert.assertEquals("hello world", Parser.parse("((item.name))").execute(createContext()));
}