Merge remote-tracking branch 'upstream/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/05edd81f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/05edd81f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/05edd81f

Branch: refs/heads/master
Commit: 05edd81f5c8cde90959f028cc31198e6ed22c6e2
Parents: 5cc1ffa 8897646
Author: sunsky6 <suenyin...@163.com>
Authored: Wed Feb 7 14:21:34 2018 +0800
Committer: sunsky6 <suenyin...@163.com>
Committed: Wed Feb 7 14:21:34 2018 +0800

----------------------------------------------------------------------
 build/build.js                                  |  6 ++--
 build/config.js                                 | 37 +++++++++++++-------
 .../Recycler/WXRecyclerUpdateController.m       |  4 ++-
 .../WeexSDK/Sources/Component/WXTextComponent.m |  3 ++
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m   |  9 +++--
 package.json                                    |  8 +++--
 runtime/api/WeexInstance.js                     | 26 +++++++-------
 runtime/api/init.js                             | 11 ++++++
 runtime/bridge/CallbackManager.js               |  8 ++---
 runtime/bridge/receiver.js                      |  4 +--
 runtime/entries/env.js                          | 27 ++++++++++++++
 runtime/entries/index.js                        |  2 ++
 runtime/entries/legacy.js                       | 23 ++++++++++++
 runtime/entries/setup.js                        |  3 --
 runtime/frameworks/legacy/app/ctrl/init.js      |  5 +--
 runtime/frameworks/legacy/app/ctrl/misc.js      |  6 ++--
 runtime/shared/index.js                         | 20 ++++++-----
 17 files changed, 139 insertions(+), 63 deletions(-)
----------------------------------------------------------------------


Reply via email to