Skip to content

Commit cf6dbd8

Browse files
committed
Merge branch 'master' into selectmenu
2 parents d668c94 + eae2c4b commit cf6dbd8

17 files changed

Lines changed: 76 additions & 31 deletions

File tree

README.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,29 @@ Run the unit tests with a local server that supports PHP. No database is require
3636
Building jQuery UI
3737
---
3838

39-
jQuery UI uses the [grunt](http://github.com/cowboy/grunt) build system. Building jQuery UI requires node.js and a command line zip program.
39+
jQuery UI uses the [Grunt](http://github.com/gruntjs/grunt) build system.
4040

41-
Install grunt.
41+
To build jQuery UI, you must have [node.js](http://nodejs.org/) installed and then run the following commands:
4242

43-
`npm install grunt -g`
43+
```sh
4444

45-
Clone the jQuery UI git repo.
45+
# Install the Grunt CLI
46+
npm install -g grunt-cli
4647

47-
`git clone git://github.com/jquery/jquery-ui.git`
48+
# Clone the jQuery UI git repo
49+
git clone git://github.com/jquery/jquery-ui.git
50+
cd jquery-ui
4851

49-
`cd jquery-ui`
52+
# Install the node module dependencies
53+
npm install
5054

51-
Install node modules.
55+
# Run the build task
56+
grunt build
5257

53-
`npm install`
54-
55-
Run grunt.
56-
57-
`grunt build`
58-
59-
There are many other tasks that can be run through grunt. For a list of all tasks:
60-
61-
`grunt --help`
58+
# There are many other tasks that can be run through Grunt.
59+
# For a list of all tasks:
60+
grunt --help
61+
```
6262

6363

6464
For committers
-4 Bytes
Loading
-2 Bytes
Loading
-14 Bytes
Loading
-11 Bytes
Loading

demos/images/calendar.gif

-11 Bytes
Loading

demos/images/pbar-ani.gif

-4.46 KB
Loading

demos/position/cycler.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
function next( event ) {
6464
event.preventDefault();
6565
$( "img:eq(2)" ).center( animate );
66-
$( "img:eq(1)" ).left( animate )
66+
$( "img:eq(1)" ).left( animate );
6767
$( "img:eq(0)" ).right().appendTo( "#container" );
6868
}
6969
function previous( event ) {
-4.46 KB
Loading

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"dependencies": {},
5858
"devDependencies": {
5959
"grunt": "0.4.1",
60-
"grunt-contrib-jshint": "0.6.0",
60+
"grunt-contrib-jshint": "0.6.3",
6161
"grunt-contrib-uglify": "0.1.1",
6262
"grunt-contrib-concat": "0.1.3",
6363
"grunt-contrib-qunit": "0.2.0",

0 commit comments

Comments
 (0)