Repository: incubator-weex
Updated Branches:
  refs/heads/master b6b2c24c2 -> 6019278ea


Merge pull request #1 from apache/master

update source

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

Branch: refs/heads/master
Commit: e7bbcd6ad577c1be25ee8fb99a016af81fd62a43
Parents: e32b52f 1c5f158
Author: Suen <suenyin...@163.com>
Authored: Wed Jan 17 21:01:46 2018 +0800
Committer: GitHub <nore...@github.com>
Committed: Wed Jan 17 21:01:46 2018 +0800

----------------------------------------------------------------------
 .../weex/commons/AbstractWeexActivity.java      |   11 +-
 .../app/src/main/assets/about.weex.js           |    4 +
 .../app/src/main/assets/examples.weex.js        |    4 +
 .../app/src/main/assets/guide.weex.js           |    4 +
 .../app/src/main/assets/landing.weex.js         |    4 +
 .../playground/app/src/main/assets/news.weex.js |    4 +
 .../src/main/assets/vue-web/vue/animation.js    | 1110 -----
 .../src/main/assets/vue-web/vue/components/a.js |  874 ----
 .../assets/vue-web/vue/components/countdown.js  | 1142 -----
 .../main/assets/vue-web/vue/components/image.js | 1144 -----
 .../main/assets/vue-web/vue/components/input.js | 1283 ------
 .../main/assets/vue-web/vue/components/list.js  |  705 ---
 .../assets/vue-web/vue/components/marquee.js    | 1034 -----
 .../assets/vue-web/vue/components/navigator.js  | 1537 -------
 .../assets/vue-web/vue/components/scroller.js   |  787 ----
 .../assets/vue-web/vue/components/slider.js     | 1496 -------
 .../vue-web/vue/components/sliderinfinite.js    |  644 ---
 .../assets/vue-web/vue/components/tabbar.js     | 1105 -----
 .../main/assets/vue-web/vue/components/text.js  | 1016 -----
 .../assets/vue-web/vue/components/textarea.js   |  827 ----
 .../main/assets/vue-web/vue/components/video.js |  816 ----
 .../assets/vue-web/vue/components/waterfall.js  | 1216 -----
 .../main/assets/vue-web/vue/components/web.js   |  861 ----
 .../app/src/main/assets/vue-web/vue/hello.js    |  217 -
 .../app/src/main/assets/vue-web/vue/iconfont.js |  799 ----
 .../app/src/main/assets/vue-web/vue/index.js    | 1056 -----
 .../main/assets/vue-web/vue/market/gcanvas.js   | 3641 ---------------
 .../assets/vue-web/vue/modules/clipboard.js     | 1102 -----
 .../assets/vue-web/vue/modules/instance-api.js  |  736 ---
 .../main/assets/vue-web/vue/modules/modal.js    |  977 ----
 .../main/assets/vue-web/vue/modules/picker.js   |  706 ---
 .../main/assets/vue-web/vue/modules/storage.js  |  823 ----
 .../main/assets/vue-web/vue/modules/stream.js   |  923 ----
 .../assets/vue-web/vue/modules/websocket.js     |  895 ----
 .../assets/vue-web/vue/showcase/a-node-click.js |  685 ---
 .../assets/vue-web/vue/showcase/boxshadow.js    |  710 ---
 .../assets/vue-web/vue/showcase/calculator.js   |  820 ----
 .../assets/vue-web/vue/showcase/compositing.js  |  740 ---
 .../main/assets/vue-web/vue/showcase/gesture.js |  649 ---
 .../assets/vue-web/vue/showcase/itemlist.js     | 1533 -------
 .../assets/vue-web/vue/showcase/new-fashion.js  | 4220 ------------------
 .../assets/vue-web/vue/showcase/progress.js     |  770 ----
 .../vue-web/vue/showcase/tap-penetrate.js       |  959 ----
 .../src/main/assets/vue-web/vue/style/index.js  | 2276 ----------
 .../main/assets/vue-web/vue/style/style-box.js  | 1304 ------
 .../main/assets/vue-web/vue/style/style-flex.js | 1499 -------
 .../main/assets/vue-web/vue/style/style-item.js |  607 ---
 .../assets/vue-web/vue/syntax/hello-world-1.js  |  212 -
 .../assets/vue-web/vue/syntax/hello-world-2.js  |  232 -
 .../assets/vue-web/vue/syntax/hello-world-3.js  |  586 ---
 .../assets/vue-web/vue/syntax/hello-world-4.js  |  625 ---
 .../assets/vue-web/vue/syntax/hello-world-5.js  |  631 ---
 .../assets/vue-web/vue/syntax/hello-world.js    |  641 ---
 .../vue-web/vue/syntax/script-component.js      |  701 ---
 .../assets/vue-web/vue/syntax/script-data.js    |  684 ---
 .../assets/vue-web/vue/syntax/script-events.js  |  624 ---
 .../vue-web/vue/syntax/script-instance.js       |  656 ---
 .../vue-web/vue/syntax/script-lifecycle.js      |  618 ---
 .../assets/vue-web/vue/syntax/script-module.js  |  613 ---
 .../assets/vue-web/vue/syntax/script-options.js |  642 ---
 .../assets/vue-web/vue/syntax/template-class.js |  626 ---
 .../vue-web/vue/syntax/template-content.js      |  659 ---
 .../assets/vue-web/vue/syntax/template-event.js |  656 ---
 .../assets/vue-web/vue/syntax/template-if.js    |  623 ---
 .../vue/syntax/template-repeat-update.js        |  652 ---
 .../vue-web/vue/syntax/template-repeat.js       |  642 ---
 .../assets/vue-web/vue/syntax/template-style.js |  264 --
 .../app/src/main/assets/vue-web/vue/template.js | 1232 -----
 .../src/main/assets/vue-web/vue/transition.js   |  695 ---
 .../app/src/main/assets/vue/animation.js        |  714 ---
 .../app/src/main/assets/vue/components/a.js     |  450 --
 .../src/main/assets/vue/components/countdown.js |  658 ---
 .../app/src/main/assets/vue/components/image.js |  662 ---
 .../app/src/main/assets/vue/components/input.js |  796 ----
 .../app/src/main/assets/vue/components/list.js  |  266 --
 .../src/main/assets/vue/components/marquee.js   |  553 ---
 .../src/main/assets/vue/components/navigator.js | 1113 -----
 .../src/main/assets/vue/components/scroller.js  |  359 --
 .../src/main/assets/vue/components/slider.js    |  929 ----
 .../assets/vue/components/sliderinfinite.js     |  197 -
 .../src/main/assets/vue/components/tabbar.js    |  632 ---
 .../app/src/main/assets/vue/components/text.js  |  527 ---
 .../src/main/assets/vue/components/textarea.js  |  380 --
 .../app/src/main/assets/vue/components/video.js |  404 --
 .../src/main/assets/vue/components/waterfall.js |  863 ----
 .../app/src/main/assets/vue/components/web.js   |  467 --
 .../playground/app/src/main/assets/vue/hello.js |  102 -
 .../app/src/main/assets/vue/iconfont.js         |  342 --
 .../playground/app/src/main/assets/vue/index.js |  546 ---
 .../app/src/main/assets/vue/market/gcanvas.js   | 3525 ---------------
 .../src/main/assets/vue/modules/clipboard.js    |  712 ---
 .../src/main/assets/vue/modules/instance-api.js |  317 --
 .../app/src/main/assets/vue/modules/modal.js    |  598 ---
 .../app/src/main/assets/vue/modules/picker.js   |  242 -
 .../app/src/main/assets/vue/modules/storage.js  |  394 --
 .../app/src/main/assets/vue/modules/stream.js   |  490 --
 .../src/main/assets/vue/modules/websocket.js    |  437 --
 .../main/assets/vue/showcase/a-node-click.js    |  244 -
 .../src/main/assets/vue/showcase/boxshadow.js   |  244 -
 .../src/main/assets/vue/showcase/calculator.js  |  356 --
 .../src/main/assets/vue/showcase/compositing.js |  306 --
 .../app/src/main/assets/vue/showcase/gesture.js |  195 -
 .../src/main/assets/vue/showcase/itemlist.js    | 1085 -----
 .../src/main/assets/vue/showcase/new-fashion.js | 3462 --------------
 .../src/main/assets/vue/showcase/progress.js    |  349 --
 .../main/assets/vue/showcase/tap-penetrate.js   |  573 ---
 .../app/src/main/assets/vue/style/index.js      | 1600 -------
 .../app/src/main/assets/vue/style/style-box.js  |  802 ----
 .../app/src/main/assets/vue/style/style-flex.js |  937 ----
 .../app/src/main/assets/vue/style/style-item.js |  159 -
 .../src/main/assets/vue/syntax/hello-world-1.js |   98 -
 .../src/main/assets/vue/syntax/hello-world-2.js |  115 -
 .../src/main/assets/vue/syntax/hello-world-3.js |  131 -
 .../src/main/assets/vue/syntax/hello-world-4.js |  171 -
 .../src/main/assets/vue/syntax/hello-world-5.js |  177 -
 .../src/main/assets/vue/syntax/hello-world.js   |  187 -
 .../main/assets/vue/syntax/script-component.js  |  237 -
 .../src/main/assets/vue/syntax/script-data.js   |  218 -
 .../src/main/assets/vue/syntax/script-events.js |  166 -
 .../main/assets/vue/syntax/script-instance.js   |  200 -
 .../main/assets/vue/syntax/script-lifecycle.js  |  160 -
 .../src/main/assets/vue/syntax/script-module.js |  163 -
 .../main/assets/vue/syntax/script-options.js    |  186 -
 .../main/assets/vue/syntax/template-class.js    |  165 -
 .../main/assets/vue/syntax/template-content.js  |  199 -
 .../main/assets/vue/syntax/template-event.js    |  204 -
 .../src/main/assets/vue/syntax/template-if.js   |  172 -
 .../assets/vue/syntax/template-repeat-update.js |  202 -
 .../main/assets/vue/syntax/template-repeat.js   |  177 -
 .../main/assets/vue/syntax/template-style.js    |  147 -
 .../app/src/main/assets/vue/template.js         |  821 ----
 .../app/src/main/assets/vue/transition.js       |  265 --
 .../java/com/alibaba/weex/IndexActivity.java    |    8 +-
 .../java/com/alibaba/weex/WXApplication.java    |    4 +-
 .../java/com/alibaba/weex/WXPageActivity.java   |   10 +-
 .../alibaba/weex/extend/component/WXMask.java   |  223 +-
 .../extend/component/dom/WXMaskDomObject.java   |  251 +-
 .../weex/extend/module/WXEventModule.java       |   31 +
 .../alibaba/weex/extend/module/WXTitleBar.java  |  109 +
 .../app/src/main/res/values-v21/styles.xml      |    4 +
 .../app/src/main/res/values/colors.xml          |    4 +-
 .../app/src/main/res/values/styles.xml          |    4 +-
 android/sdk/build.gradle                        |    2 +-
 .../main/java/com/taobao/weex/WXSDKEngine.java  |    4 +-
 .../weex/adapter/DefaultWXHttpAdapter.java      |    6 +-
 .../taobao/weex/ui/module/WXLocalModule.java    |   93 -
 .../taobao/weex/ui/module/WXLocaleModule.java   |  106 +
 ios/playground/Podfile                          |    2 +-
 .../WeexDemo.xcodeproj/project.pbxproj          |   36 +
 ios/playground/WeexDemo/AppDelegate.m           |   13 +-
 ios/playground/WeexDemo/DemoDefine.h            |    2 +-
 ios/playground/WeexDemo/Info.plist              |   18 +-
 ios/playground/WeexDemo/Scanner/WXScannerVC.m   |    8 +-
 .../WeexDemo/UIViewController+WXDemoNaviBar.m   |    8 +-
 ios/playground/WeexDemo/WXDemoViewController.h  |    2 +-
 ios/playground/WeexDemo/WXDemoViewController.m  |   26 +-
 .../WeexDemo/WXNavigationHandlerImpl.h          |   25 +
 .../WeexDemo/WXNavigationHandlerImpl.m          |   74 +
 .../WeexDemo/extend/module/WXEventModule.m      |    7 +-
 .../WeexDemo/extend/module/WXTitleBarModule.h   |   14 +
 .../WeexDemo/extend/module/WXTitleBarModule.m   |   48 +
 ios/playground/bundlejs/about.weex.js           |    4 +
 ios/playground/bundlejs/examples.weex.js        |    4 +
 ios/playground/bundlejs/guide.weex.js           |    4 +
 ios/playground/bundlejs/landing.weex.js         |    4 +
 ios/playground/bundlejs/lesson.weex.js          |    4 +
 ios/playground/bundlejs/news.weex.js            |    4 +
 ios/playground/bundlejs/vue/animation.js        |  714 ---
 ios/playground/bundlejs/vue/components/a.js     |  450 --
 .../bundlejs/vue/components/countdown.js        |  658 ---
 ios/playground/bundlejs/vue/components/image.js |  662 ---
 ios/playground/bundlejs/vue/components/input.js |  796 ----
 ios/playground/bundlejs/vue/components/list.js  |  266 --
 .../bundlejs/vue/components/marquee.js          |  553 ---
 .../bundlejs/vue/components/navigator.js        | 1113 -----
 .../bundlejs/vue/components/scroller.js         |  359 --
 .../bundlejs/vue/components/slider.js           |  929 ----
 .../bundlejs/vue/components/sliderinfinite.js   |  197 -
 .../bundlejs/vue/components/tabbar.js           |  632 ---
 ios/playground/bundlejs/vue/components/text.js  |  527 ---
 .../bundlejs/vue/components/textarea.js         |  380 --
 ios/playground/bundlejs/vue/components/video.js |  404 --
 .../bundlejs/vue/components/waterfall.js        |  863 ----
 ios/playground/bundlejs/vue/components/web.js   |  467 --
 ios/playground/bundlejs/vue/hello.js            |  102 -
 ios/playground/bundlejs/vue/iconfont.js         |  342 --
 ios/playground/bundlejs/vue/index.js            |  546 ---
 ios/playground/bundlejs/vue/market/gcanvas.js   | 3525 ---------------
 .../bundlejs/vue/modules/clipboard.js           |  712 ---
 .../bundlejs/vue/modules/instance-api.js        |  317 --
 ios/playground/bundlejs/vue/modules/modal.js    |  598 ---
 ios/playground/bundlejs/vue/modules/picker.js   |  242 -
 ios/playground/bundlejs/vue/modules/storage.js  |  394 --
 ios/playground/bundlejs/vue/modules/stream.js   |  490 --
 .../bundlejs/vue/modules/websocket.js           |  437 --
 .../bundlejs/vue/showcase/a-node-click.js       |  244 -
 .../bundlejs/vue/showcase/boxshadow.js          |  244 -
 .../bundlejs/vue/showcase/calculator.js         |  356 --
 .../bundlejs/vue/showcase/compositing.js        |  306 --
 ios/playground/bundlejs/vue/showcase/gesture.js |  195 -
 .../bundlejs/vue/showcase/itemlist.js           | 1085 -----
 .../bundlejs/vue/showcase/new-fashion.js        | 3462 --------------
 .../bundlejs/vue/showcase/progress.js           |  349 --
 .../bundlejs/vue/showcase/tap-penetrate.js      |  573 ---
 ios/playground/bundlejs/vue/style/index.js      | 1600 -------
 ios/playground/bundlejs/vue/style/style-box.js  |  802 ----
 ios/playground/bundlejs/vue/style/style-flex.js |  937 ----
 ios/playground/bundlejs/vue/style/style-item.js |  159 -
 .../bundlejs/vue/syntax/hello-world-1.js        |   98 -
 .../bundlejs/vue/syntax/hello-world-2.js        |  115 -
 .../bundlejs/vue/syntax/hello-world-3.js        |  131 -
 .../bundlejs/vue/syntax/hello-world-4.js        |  171 -
 .../bundlejs/vue/syntax/hello-world-5.js        |  177 -
 .../bundlejs/vue/syntax/hello-world.js          |  187 -
 .../bundlejs/vue/syntax/script-component.js     |  237 -
 .../bundlejs/vue/syntax/script-data.js          |  218 -
 .../bundlejs/vue/syntax/script-events.js        |  166 -
 .../bundlejs/vue/syntax/script-instance.js      |  200 -
 .../bundlejs/vue/syntax/script-lifecycle.js     |  160 -
 .../bundlejs/vue/syntax/script-module.js        |  163 -
 .../bundlejs/vue/syntax/script-options.js       |  186 -
 .../bundlejs/vue/syntax/template-class.js       |  165 -
 .../bundlejs/vue/syntax/template-content.js     |  199 -
 .../bundlejs/vue/syntax/template-event.js       |  204 -
 .../bundlejs/vue/syntax/template-if.js          |  172 -
 .../vue/syntax/template-repeat-update.js        |  202 -
 .../bundlejs/vue/syntax/template-repeat.js      |  177 -
 .../bundlejs/vue/syntax/template-style.js       |  147 -
 ios/playground/bundlejs/vue/template.js         |  821 ----
 ios/playground/bundlejs/vue/transition.js       |  265 --
 .../WeexSDK/Sources/Component/WXTextComponent.m |   26 +-
 .../WeexSDK/Sources/Manager/WXServiceFactory.m  |    2 +-
 ios/sdk/WeexSDK/Sources/Module/WXLocaleModule.m |    7 +-
 ios/sdk/WeexSDK/Sources/Module/WXTransition.m   |    7 +-
 234 files changed, 1045 insertions(+), 125048 deletions(-)
----------------------------------------------------------------------


Reply via email to