Skip to content

Commit bc35bad

Browse files
committedMay 10, 2016
Merge branch 'dev' into android
* dev: (57 commits) + [example] add text-overflow doc & example + [example] add text-overflow doc & example + [all] scripts.md && update the help * [doc] update weex command + [all] update README + [all] update script + [all] script for create a component corret some spelling mistakes + [all] update assets in playground + [doc] add inline event * [doc] fix typo * [doc] typo * [doc] add faq entry in project readme + [doc] add FAQ + [doc] add trackby for repeat syntax * [doc] update font-family support. * [jsfm] update test * [jsfm] fix when the key of trackby is zero * [all] change play download url, fix start script * [all] fix playground apk url ... # Conflicts: # README.md # android/playground/app/src/main/assets/animation.js # android/playground/app/src/main/assets/calculator.js # android/playground/app/src/main/assets/common.js # android/playground/app/src/main/assets/example-list-item.js # android/playground/app/src/main/assets/example-list.js # android/playground/app/src/main/assets/form.js # android/playground/app/src/main/assets/gesture.js # android/playground/app/src/main/assets/hello.js # android/playground/app/src/main/assets/image-demo.js # android/playground/app/src/main/assets/index.js # android/playground/app/src/main/assets/list-basic.js # android/playground/app/src/main/assets/list-demo.js # android/playground/app/src/main/assets/modal.js # android/playground/app/src/main/assets/slider-demo.js # android/playground/app/src/main/assets/slider-item.js # android/playground/app/src/main/assets/slider-page.js # android/playground/app/src/main/assets/style-box.js # android/playground/app/src/main/assets/style-flex.js # android/playground/app/src/main/assets/style-item.js # android/playground/app/src/main/assets/template.js # android/playground/app/src/main/assets/text-demo.js # android/playground/app/src/main/assets/ui-button.js # android/playground/app/src/main/assets/ui-list-item.js # android/playground/app/src/main/assets/ui-panel.js # android/playground/app/src/main/assets/ui.js # android/playground/app/src/main/assets/video-demo.js # android/sdk/assets/main.js # bin/install-hooks.sh # bin/pre-push.sh # doc/advanced/extend-to-html5.md # doc/modules/README.md # doc/modules/animation.md # doc/modules/modal.md # doc/modules/stream.md # doc/tutorial.md # examples/README.md # examples/animation.we # examples/calculator.we # examples/common.we # examples/example-list.we # examples/imageDemo.we # examples/index.we # examples/listBasic.we # examples/modal.we # examples/sliderDemo.we # examples/slideritem.we # examples/style-box.we # examples/style-flex.we # examples/style-item.we # examples/template.we # examples/textDemo.we # examples/ui-button.we # examples/ui-hn.we # examples/ui-list-item.we # examples/ui-panel.we # examples/ui-tip.we # examples/ui.we # examples/videoDemo.we # examples/weex-ui/ui-button.we # examples/weex-ui/ui-hn.we # examples/weex-ui/ui-list-item.we # examples/weex-ui/ui-panel.we # examples/weex-ui/ui-tip.we # package.json # src/components/src/wxc-button.we # src/components/src/wxc-hn.we # src/components/src/wxc-list-item.we # src/components/src/wxc-panel.we # src/components/src/wxc-tip.we # src/js-framework/lib/vm/compiler.js # src/js-framework/package.json # test/indexItem.we # webpack.config.js
2 parents d5b5374 + b16d726 commit bc35bad

File tree

122 files changed

+28757
-4412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+28757
-4412
lines changed
 

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ FORMAT
1818
* `*` update or bugfix
1919
* `-` remove
2020
* `{module}`
21-
* Including: android, ios, jsfm, html5, doc, website, example, test, all
21+
* Including: android, ios, jsfm, html5, component, doc, website, example, test, all
2222

2323
for example:
2424

‎README.md

100755100644
+24-59
Original file line numberDiff line numberDiff line change
@@ -4,83 +4,48 @@
44

55
Weex is currently in Pre-release Stage.
66

7-
We agrees that you may discuss technical information about Weex, except that you may not fork Weex to public repository , write public reviews or post screen shots using information from current repository(https://github.com/alibaba/weex) , redistribute weex within any form.
7+
We agree that you may discuss technical information about Weex, except that you may not fork Weex to public repository , write public reviews or post screen shots using information from current repository(https://github.com/alibaba/weex) , redistribute weex within any form.
88

99

1010
> A framework for building Mobile cross-platform UI.
1111
1212
Support Android 4.1 (API 16) and iOS soon. See [Weex website](http://alibaba.github.io/weex/) for more information.
1313

14-
## Meet
14+
## Meet Weex
1515

16-
* Install [Android Playground](http://g.tbcdn.cn/ali-wireless-h5/res/0.0.9/playground.apk).
16+
* [Install Playground](http://alibaba.github.io/weex/download.html).
1717

18-
<img src="http://gtms03.alicdn.com/tps/i3/TB1uH3EMpXXXXcmXFXXdtp1PXXX-476-476.png" width="160" height="160" >
18+
## Use Weex
1919

20-
## Use
21-
22-
* See [Tutorial](http://alibaba.github.io/weex/doc/tutorial).
23-
* See [Weex Documentation](http://alibaba.github.io/weex/doc) for more information.
20+
* See [Tutorial](https://github.com/alibaba/weex/blob/dev/doc/tutorial.md).
21+
* See [Weex Documentation](https://github.com/alibaba/weex/blob/dev/doc/INSTALL.md) for more information.
2422

2523
### Android
2624

2725
0. Prerequisites
2826
0. Install [Node.js](http://nodejs.org/) 4.0+
29-
0. `npm install` to install project
27+
0. Under project root
28+
0. `npm install`, install project
29+
0. `./start`
3030
0. Install [Android Environment](http://developer.android.com/training/basics/firstapp/index.html)
31-
0. Run playground
32-
0. `npm run serve`
33-
0. In Android Studio
34-
0. Open `android/playground`
35-
0. In `app/java/com.alibaba.weex/WXMainActivity`, modify `CURRENT_IP` to your local IP
36-
0. Click <img src="http://gtms04.alicdn.com/tps/i4/TB1wCcqMpXXXXakXpXX3G7tGXXX-34-44.png" height="16" > (`Run` button)
37-
0. Add an example
38-
0. `npm run watch`
39-
0. In `examples`, add a file `newExample.we`
40-
0. In `examples/index.we`, add an item `{name: 'newExample', title: 'New Example'}` for array `data.cases`
31+
0. Run playground, In Android Studio
32+
0. Open `android/playground`
33+
0. In `app/java/com.alibaba.weex/WXMainActivity`, modify `CURRENT_IP` to your local IP
34+
0. Click <img src="http://gtms04.alicdn.com/tps/i4/TB1wCcqMpXXXXakXpXX3G7tGXXX-34-44.png" height="16" > (`Run` button)
35+
0. [Add an example](./examples/README.md#add-an-example)
4136

4237
## Scripts
4338

44-
**clean `*.js` in the folders of `examples/build` and `test/build`**
45-
```shell
46-
npm run clean
47-
```
48-
49-
**transform `*.we` in the folders of `examples` & `test`**
50-
```shell
51-
npm run transform
52-
```
53-
54-
**build js-framework and h5-render**
55-
```shell
56-
npm run build
57-
```
58-
59-
**copy the builded files to `playground`**
60-
```shell
61-
npm run copy
62-
```
63-
64-
**npm run clean && npm run build**
65-
```shell
66-
npm run dev
67-
```
68-
69-
**will run a file server at `12581` port**
70-
```shell
71-
npm run serve
72-
```
73-
74-
**will run a watcher for `*.we` changed**
75-
```shell
76-
npm run watch
77-
```
78-
79-
**will run test under js-framework and h5-render**
80-
```shell
81-
npm run ci
82-
```
39+
See [SCRIPTS.md](SCRIPTS.md) for more information.
40+
41+
## For Windows
42+
43+
Please install [Git for Windows](https://git-scm.com/download/win) or [Cygwin](https://www.cygwin.com/).
44+
45+
## FAQ
46+
47+
See [FAQ](./doc/faq.md) for more information.
8348

8449
## Contributing
8550

86-
See [Weex Contributing Guide](./CONTRIBUTING.md).
51+
See [Weex Contributing Guide](./CONTRIBUTING.md) for more information.

0 commit comments

Comments
 (0)
Please sign in to comment.