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 <misa...@apache.org>
Authored: Wed Sep 27 14:25:15 2017 +0800
Committer: misakuo <misa...@apache.org>
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(-)
----------------------------------------------------------------------


Reply via email to