Skip to content

Commit b07d790

Browse files
committed
merge from angular-ui/angular-ui master
2 parents 5bd6a1a + 414de51 commit b07d790

Some content is hidden

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

73 files changed

+4551
-1579
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
node_modules
1+
node_modules
2+
*.coffee.js
3+
.idea

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# [Cha Cha Cha Changes](http://www.youtube.com/watch?v=pl3vxEudif8&t=0m53s)
2+
3+
## master
4+
* **Prettifier** renamed to **inflector**
5+
* Unit tests
6+
7+
## v0.1.0
8+
* New folder structure
9+
* Too many to list

Jakefile.coffee

Lines changed: 0 additions & 61 deletions
This file was deleted.

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License
2+
3+
Copyright (c) 2012 the AngularUI Team, http://angular-ui.github.com
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

Makefile

Lines changed: 0 additions & 27 deletions
This file was deleted.

README.md

Lines changed: 27 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# AngularUI
1+
# AngularUI - The companion suite for AngularJS
22

33
***
44

@@ -9,85 +9,63 @@
99
* **AngularJS v1.0.0+** is currently required.
1010
* **jQuery / Plugins** _(depends on directive)._ Check specific directive dependencies for more information
1111

12-
### Installation
12+
## Installation
1313

14-
The repository comes with the modules pre-built and compressed into the build directory.
15-
16-
0. _Coming Soon_ Generate a custom build of angular-ui containing only the components you want and nothing more
17-
1. Include the javascript files - angular-ui.js or angular-ui.min.js
18-
2. Add a dependency to the ui module in your angular application module:
14+
The repository comes with the modules pre-built and compressed into the `build/` directory.
1915

2016
```javascript
2117
angular.module('myApp', ['ui']);
2218
```
2319

2420
The modules can be found in the [Directives](http://github.com/angular-ui/angular-ui/modules/directives) and [Filters](http://github.com/angular-ui/angular-ui/modules/filters) folders. Check out the readme file associated with each module for specific module usage information.
2521

26-
## Building
22+
## Development
2723

28-
You do not need to build the project to use it - see above - but if you are hacking on it then this is what you need to know.
24+
You do not need to build the project to use it - see above - but if you are working on it then this is what you need to know.
2925

3026
### Requirements
3127

32-
Install UglifyJS & LESS:
28+
0. Install [Node.js](http://nodejs.org/) and NPM (should come with)
29+
30+
1. Install local dependencies:
3331

3432
```bash
35-
$ [sudo] npm install uglify-js -g
36-
$ [sudo] npm install less -g
37-
$ [sudo] npm install coffee-script -g
33+
$ npm install
3834
```
3935

40-
### Build/Compress
36+
2. Install global dependencies `grunt`, `coffee-script`, and `testacular`:
4137

4238
```bash
43-
$ make build
39+
$ npm install -g testacular coffee-script grunt
4440
```
4541

46-
## Testing
47-
48-
The modules come with unit tests that should be run on any changes and certainly before commiting changes to the project. The unit tests should also provide further insight into the usage of the modules.
42+
### Build Files & Run Tests
4943

50-
### Requirements
51-
The project is configured to use the marvellous [Testacular](http://vojtajina.github.com/testacular/) test runner from AngularJS developer Vojta. It is a nodeJS app. You simply install it from NPM:
44+
Before you commit, always run `grunt` to build and test everything once.
5245

5346
```bash
54-
$ [sudo] npm install testacular -g
47+
$ grunt
5548
```
5649

57-
The test configuration is in test/test-config.js. You pass this in when you run the test server:
58-
59-
```bash
60-
$ testacular test/test-config.js
61-
```
50+
### Test & Develop
6251

63-
Capture your testing browsers by browsing to http://localhost:8080 (in this case) on all the different flavours of browser you wish to test.
52+
The modules come with unit tests that should be run on any changes and certainly before commiting changes to the project. The unit tests should also provide further insight into the usage of the modules.
6453

65-
Then whenever you make a change either run
54+
First, start the testacular server:
6655
```bash
67-
$ make build
68-
$ testacular-run
56+
$ grunt server
6957
```
70-
71-
Or even quicker
72-
58+
Then, open your browser to http://localhost:8080 and run the watch command to re-run tests on every save:
7359
```bash
74-
$ make test
60+
$ grunt watch
7561
```
7662

77-
# Template
63+
### Publishing
7864

79-
The `ui.config` dependency is optional, however it is **highly** recommended that you leverage this so that developers may set app-wide defaults instead of passing the same parameters to every directive.
65+
For core team: if you wish to publish a new version follow these steps:
8066

81-
```javascript
82-
83-
/**
84-
* Directive Description
85-
* @param expression {type} description
86-
* @example code demo (if possible)
87-
*/
88-
angular.module('ui.directives').directive('uiMYDIRECTIVE', ['ui.config', function(uiConfig) {
89-
return function(scope, elm, attrs) {
90-
};
91-
}]);
92-
93-
```
67+
1. Bump the version number inside `package.json`
68+
2. Build and test
69+
3. Commit the updated `package.json` and `build/` folder on their own commit
70+
4. Tag the commit: `git tag v[maj].[min].[patch]`
71+
5. Push the tag: `git push [angular-ui] master --tags`

build/angular-ui-ieshiv.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
/**
2+
* AngularUI - The companion suite for AngularJS
3+
* @version v0.1.0 - 2012-07-20
4+
* @link http://angular-ui.github.com
5+
* @license MIT License, http://www.opensource.org/licenses/MIT
6+
*/
7+
18
// READ: http://docs-next.angularjs.org/guide/ie
29
(function(exports){
310

build/angular-ui-ieshiv.min.js

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/angular-ui.css

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,46 @@
1+
2+
13
/**
24
* import components to builds angular-ui.css
35
*/
6+
47
/* ui-reset */
8+
59
.ui-resetwrap {
6-
display: inline-block;
710
position: relative;
11+
display: inline-block;
812
}
13+
914
.ui-reset {
10-
display: none;
1115
position: absolute;
12-
cursor: pointer;
1316
top: 0;
1417
right: 0;
1518
z-index: 2;
19+
display: none;
1620
height: 100%;
21+
cursor: pointer;
1722
}
23+
1824
.ui-resetwrap:hover .ui-reset {
1925
display: block;
2026
}
27+
2128
/* ui-currency */
29+
2230
.ui-currency-pos {
2331
color: green;
2432
}
33+
2534
.ui-currency-neg {
2635
color: red;
2736
}
37+
2838
.ui-currency-zero {
2939
color: blue;
3040
}
41+
3142
/* highlight */
43+
3244
.ui-match {
3345
background: yellow;
34-
}
46+
}

0 commit comments

Comments
 (0)