weex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acton...@apache.org
Subject [16/39] incubator-weex git commit: Merge branch '0.16-dev' into jsfm-feature-0.21
Date Tue, 08 Aug 2017 08:55:28 GMT
Merge branch '0.16-dev' into jsfm-feature-0.21

Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ae475e8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ae475e8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ae475e8a

Branch: refs/heads/0.16-dev
Commit: ae475e8aaf562fcad2fd6f8753815032aa09fa90
Parents: f40f596 5951404
Author: Hanks <zhanghan.me@gmail.com>
Authored: Mon Jul 31 16:54:02 2017 +0800
Committer: GitHub <noreply@github.com>
Committed: Mon Jul 31 16:54:02 2017 +0800

----------------------------------------------------------------------
 .gitignore                                      |   3 +
 WeexSDK.podspec                                 |   2 +-
 .../java/com/taobao/weex/WXSDKInstance.java     |  11 +-
 .../ui/component/list/BasicListComponent.java   |  15 +-
 build/build.js                                  | 105 +++-
 build/config.js                                 |  37 +-
 dangerfile.js                                   |  79 ++-
 entry.js                                        |  11 +
 examples/vue/index.vue                          |   1 +
 examples/vue/modules/picker.vue                 |  97 ++++
 html5/render/vue/README.md                      |  77 +++
 html5/render/vue/components/a.js                |  90 +--
 html5/render/vue/components/div.js              |  43 +-
 html5/render/vue/components/image.js            |  18 +-
 html5/render/vue/components/index.js            |  37 +-
 html5/render/vue/components/input.js            | 130 +++--
 html5/render/vue/components/scrollable/cell.js  |  39 ++
 .../render/vue/components/scrollable/header.js  | 102 ++--
 html5/render/vue/components/scrollable/index.js |  48 ++
 html5/render/vue/components/scrollable/list.js  |  82 +++
 .../vue/components/scrollable/list/cell.js      |  36 --
 .../vue/components/scrollable/list/index.js     |  77 ---
 .../vue/components/scrollable/list/listMixin.js |  47 --
 .../vue/components/scrollable/list/style.js     |  34 --
 .../components/scrollable/loading-indicator.js  |  17 +-
 .../render/vue/components/scrollable/loading.js | 141 ++---
 .../vue/components/scrollable/mixins/index.js   |  26 +
 .../vue/components/scrollable/mixins/list.js    |  46 ++
 .../components/scrollable/mixins/scrollable.js  | 267 +++++++++
 .../render/vue/components/scrollable/refresh.js | 157 ++---
 .../vue/components/scrollable/scroller.js       | 135 +++--
 .../render/vue/components/scrollable/style.css  |  85 +++
 .../vue/components/scrollable/waterfall.js      | 573 ++++++++++---------
 html5/render/vue/components/slider/index.js     |  52 +-
 html5/render/vue/components/slider/indicator.js |  18 +-
 .../render/vue/components/slider/slideMixin.js  |  46 +-
 .../vue/components/slider/slider-neighbor.js    |  12 +-
 html5/render/vue/components/slider/slider.css   |  19 +
 html5/render/vue/components/slider/slider.js    |  75 +++
 html5/render/vue/components/switch.js           | 114 ++--
 html5/render/vue/components/text.js             |  52 +-
 html5/render/vue/components/textarea.js         | 104 ++--
 html5/render/vue/components/video.js            | 107 ++--
 html5/render/vue/components/web.js              |  98 ++--
 html5/render/vue/core/style.js                  |  35 --
 html5/render/vue/env/global.js                  |   6 +
 html5/render/vue/env/index.js                   |   5 -
 html5/render/vue/index.js                       |  25 -
 html5/render/vue/mixins/base.js                 |  71 ---
 html5/render/vue/mixins/index.js                |   2 -
 html5/render/vue/mixins/scrollable.js           | 233 --------
 html5/render/vue/mixins/style.js                |   4 +-
 html5/render/vue/modules/animation.js           |  36 +-
 html5/render/vue/modules/dom.js                 |  21 +-
 html5/render/vue/modules/globalEvent.js         |   8 +-
 html5/render/vue/modules/index.js               |  36 +-
 html5/render/vue/modules/navigator.js           |  10 +-
 html5/render/vue/modules/webview.js             |  18 +-
 html5/render/vue/styles/base.css                |  86 +--
 html5/render/vue/styles/reset.css               |  19 +
 html5/render/vue/utils/lazyload.js              |  24 +-
 html5/render/vue/utils/perf.js                  | 283 +--------
 html5/test/render/vue/components/list.js        |   2 +-
 html5/test/render/vue/components/switch.js      |   5 +-
 html5/test/render/vue/examples/list-cell.js     |   2 +-
 html5/test/render/vue/helper/index.js           |   2 +-
 html5/test/render/vue/helper/main.js            |   3 +-
 html5/test/render/vue/helper/utils.js           |   4 +
 html5/test/render/vue/modules/animation.js      |  12 +-
 html5/test/render/vue/modules/dom.js            |  10 +-
 html5/test/render/vue/modules/globalEvent.js    |   8 +-
 html5/test/render/vue/modules/navigator.js      |   8 +-
 html5/test/render/vue/modules/webview.js        |  10 +-
 html5/test/render/vue/utils/lazyload.js         |  59 +-
 html5/test/render/vue/utils/perf.js             |  94 +--
 html5/test/render/vue/utils/style.js            |  50 +-
 ios/playground/Podfile                          |   2 +-
 ios/playground/WeexDemo/Info.plist              |   4 +
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj       |   4 +
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m    |   5 +-
 ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.h |   2 +
 ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m |  11 +-
 .../Sources/Component/WXImageComponent.m        |  89 ++-
 .../Sources/Manager/WXComponentManager.m        |  13 +-
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m   |   2 +
 .../WeexSDK/Sources/Module/WXWebSocketModule.h  |   1 -
 .../WeexSDK/Sources/Module/WXWebSocketModule.m  |   1 +
 .../Sources/Protocol/WXValidateProtocol.h       |   4 +-
 ios/sdk/WeexSDK/Sources/Utility/WXDefine.h      |   2 +-
 package.json                                    |  17 +-
 packages/weex-vue-plugins/weex-vue-a/README.md  |   3 +
 .../weex-vue-plugins/weex-vue-a/package.json    |  26 +
 .../weex-vue-plugins/weex-vue-a/src/index.js    |   2 +
 .../weex-vue-animation/README.md                |   3 +
 .../weex-vue-animation/package.json             |  27 +
 .../weex-vue-animation/src/index.js             |   2 +
 .../weex-vue-clipboard/README.md                |   3 +
 .../weex-vue-clipboard/package.json             |  27 +
 .../weex-vue-clipboard/src/index.js             |   2 +
 .../weex-vue-plugins/weex-vue-dom/README.md     |   3 +
 .../weex-vue-plugins/weex-vue-dom/package.json  |  27 +
 .../weex-vue-plugins/weex-vue-dom/src/index.js  |   2 +
 .../weex-vue-plugins/weex-vue-event/README.md   |   3 +
 .../weex-vue-event/package.json                 |  27 +
 .../weex-vue-event/src/index.js                 |   2 +
 .../weex-vue-geolocation/README.md              |   3 +
 .../weex-vue-geolocation/package.json           |  27 +
 .../weex-vue-geolocation/src/index.js           |   2 +
 .../weex-vue-global-event/README.md             |   3 +
 .../weex-vue-global-event/package.json          |  27 +
 .../weex-vue-global-event/src/index.js          |   2 +
 .../weex-vue-plugins/weex-vue-input/README.md   |   3 +
 .../weex-vue-input/package.json                 |  26 +
 .../weex-vue-input/src/index.js                 |   2 +
 .../weex-vue-plugins/weex-vue-modal/README.md   |   3 +
 .../weex-vue-modal/package.json                 |  27 +
 .../weex-vue-modal/src/index.js                 |   2 +
 .../weex-vue-navigator/README.md                |   3 +
 .../weex-vue-navigator/package.json             |  27 +
 .../weex-vue-navigator/src/index.js             |   2 +
 .../weex-vue-plugins/weex-vue-slider/README.md  |   3 +
 .../weex-vue-slider/package.json                |  27 +
 .../weex-vue-slider/src/index.js                |   2 +
 .../weex-vue-plugins/weex-vue-storage/README.md |   3 +
 .../weex-vue-storage/package.json               |  27 +
 .../weex-vue-storage/src/index.js               |   2 +
 .../weex-vue-plugins/weex-vue-stream/README.md  |   3 +
 .../weex-vue-stream/package.json                |  27 +
 .../weex-vue-stream/src/index.js                |   2 +
 .../weex-vue-plugins/weex-vue-switch/README.md  |   3 +
 .../weex-vue-switch/package.json                |  26 +
 .../weex-vue-switch/src/index.js                |   2 +
 .../weex-vue-textarea/.DS_Store                 | Bin 0 -> 6148 bytes
 .../weex-vue-textarea/README.md                 |   3 +
 .../weex-vue-textarea/package.json              |  26 +
 .../weex-vue-textarea/src/index.js              |   2 +
 .../weex-vue-plugins/weex-vue-video/README.md   |   3 +
 .../weex-vue-video/package.json                 |  26 +
 .../weex-vue-video/src/index.js                 |   2 +
 .../weex-vue-plugins/weex-vue-web/README.md     |   3 +
 .../weex-vue-plugins/weex-vue-web/package.json  |  26 +
 .../weex-vue-plugins/weex-vue-web/src/index.js  |   2 +
 .../weex-vue-websocket/README.md                |   3 +
 .../weex-vue-websocket/package.json             |  27 +
 .../weex-vue-websocket/src/index.js             |   2 +
 .../weex-vue-plugins/weex-vue-webview/README.md |   3 +
 .../weex-vue-webview/package.json               |  27 +
 .../weex-vue-webview/src/index.js               |   2 +
 packages/weex-vue-render/README.md              |  77 +++
 packages/weex-vue-render/package.json           |   9 +-
 packages/weex-vue-render/src/index.core.js      |  13 +
 packages/weex-vue-render/src/index.js           |  12 +
 scripts/dist-vue.sh                             |   2 +-
 test/pages/image-onload.vue                     |  14 +-
 test/scripts/components/image-onload.test.js    |  10 +
 vue.html                                        |   8 +-
 156 files changed, 3240 insertions(+), 2220 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ae475e8a/package.json
----------------------------------------------------------------------
diff --cc package.json
index f1d9704,e76c35b..eb3d059
--- a/package.json
+++ b/package.json
@@@ -1,10 -1,10 +1,10 @@@
  {
    "name": "weex",
-   "version": "0.12.0",
+   "version": "0.12.2",
    "subversion": {
      "browser": "0.5.0",
 -    "framework": "0.20.6",
 +    "framework": "0.21.6",
-     "vue-render": "0.11.56",
+     "vue-render": "0.12.1",
      "transformer": ">=0.1.5 <0.5"
    },
    "description": "A framework for building Mobile cross-platform UI",


Mime
View raw message