Skip to content

Commit 6c2e4b3

Browse files
committed
Merge branch 'master' into grid
Conflicts: tests/visual/menu/menu.html
2 parents 7608f44 + f4e4727 commit 6c2e4b3

File tree

441 files changed

+27442
-22699
lines changed

Some content is hidden

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

441 files changed

+27442
-22699
lines changed

.editorconfig

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
; This file is for unifying the coding style for different editors and IDEs.
2+
; More information at http://EditorConfig.org
3+
4+
root = true
5+
6+
[grunt.js]
7+
indent_style = tab
8+
9+
[ui/**.js]
10+
indent_style = tab
11+
12+
[tests/unit/**.js]
13+
indent_style = tab

.gitignore

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
build/dist
2-
build/size
3-
build/build/.sizecache.json
1+
dist
2+
node_modules
43
docs
54
.project
65
*~

.jshintrc

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"curly": true,
3+
"eqnull": true,
4+
"eqeqeq": true,
5+
"expr": true,
6+
"latedef": true,
7+
"noarg": true,
8+
"onevar": true,
9+
"smarttabs": true,
10+
"trailing": true,
11+
"undef": true
12+
}

AUTHORS.txt

+201-30
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,202 @@
1-
jQuery UI Authors (http://jqueryui.com/about)
1+
Authors ordered by first contribution
2+
A list of current team members is available at http://jqueryui.com/about
23

3-
This software consists of voluntary contributions made by many
4-
individuals. For exact contribution history, see the revision history
5-
and logs, available at http://github.com/jquery/jquery-ui
6-
7-
Brandon Aaron
8-
Paul Bakaus (paulbakaus.com)
9-
David Bolter
10-
Rich Caloggero
11-
Chi Cheng (cloudream@gmail.com)
12-
Colin Clark (http://colin.atrc.utoronto.ca/)
13-
Michelle D'Souza
14-
Aaron Eisenberger (aaronchi@gmail.com)
15-
Ariel Flesler
16-
Bohdan Ganicky
17-
Scott González
18-
Marc Grabanski (m@marcgrabanski.com)
19-
Klaus Hartl (stilbuero.de)
20-
Hans Hillen (TPG, funded through AEGIS: http://www.aegis-project.eu/)
21-
Scott Jehl
22-
Cody Lindley
23-
Eduardo Lundgren (eduardolundgren@gmail.com)
24-
Todd Parker
25-
John Resig
26-
Patty Toland
27-
Ca-Phun Ung (yelotofu.com)
28-
Keith Wood (kbwood@virginbroadband.com.au)
29-
Maggie Costello Wachs
30-
Richard D. Worth (rdworth.org)
31-
Jörn Zaefferer (bassistance.de)
4+
Paul Bakaus <paul.bakaus@googlemail.com>
5+
Richard Worth <rdworth@gmail.com>
6+
Yehuda Katz <wycats@gmail.com>
7+
Sean Catchpole <littlecooldude@gmail.com>
8+
John Resig <jeresig@gmail.com>
9+
Tane Piper <tane@tanepiper.com>
10+
Dmitri Gaskin <dmitrig01@gmail.com>
11+
Klaus Hartl <klaus.hartl@googlemail.com>
12+
Stefan Petre <stefan.petre@gmail.com>
13+
Gilles van den Hoven <gilles@webunity.nl>
14+
Micheil Smith <micheil@brandedcode.com>
15+
Jörn Zaefferer <joern.zaefferer@gmail.com>
16+
Marc Grabanski <m@marcgrabanski.com>
17+
Keith Wood <kbwood.au@gmail.com>
18+
Brandon Aaron <brandon.aaron@gmail.com>
19+
Scott González <scott.gonzalez@gmail.com>
20+
Eduardo Lundgren <eduardolundgren@gmail.com>
21+
Aaron Eisenberger <aaronchi@gmail.com>
22+
Joan Piedra <theneojp@gmail.com>
23+
Bruno Basto <b.basto@gmail.com>
24+
Remy Sharp <remy@leftlogic.com>
25+
Bohdan Ganicky <bohdan.ganicky@gmail.com>
26+
David Bolter <david.bolter@gmail.com>
27+
Chi Cheng <cloudream@gmail.com>
28+
Ca-Phun Ung <pazu2k@gmail.com>
29+
Ariel Flesler <aflesler@gmail.com>
30+
Maggie Costello Wachs <fg.maggie@gmail.com>
31+
Scott Jehl <scott@scottjehl.com>
32+
Todd Parker <fg.todd@gmail.com>
33+
Andrew Powell <powella@gmail.com>
34+
Brant Burnett <btburnett3@gmail.com>
35+
Douglas Neiner <doug@pixelgraphics.us>
36+
Paul Irish <paul.irish@gmail.com>
37+
Ralph Whitbeck <ralph.whitbeck@gmail.com>
38+
Thibault Duplessis <thibault.duplessis@gmail.com>
39+
Dominique Vincent <dominique.vincent@toitl.com>
40+
Jack Hsu <jack.hsu@gmail.com>
41+
Adam Sontag <ajpiano@ajpiano.com>
42+
Carl Fürstenberg <carl@excito.com>
43+
Kevin Dalman <development@allpro.net>
44+
Alberto Fernández Capel <afcapel@gmail.com>
45+
Jacek Jędrzejewski (http://jacek.jedrzejewski.name)
46+
Ting Kuei <ting@kuei.com>
47+
Samuel Cormier-Iijima <sam@chide.it>
48+
Jon Palmer <jonspalmer@gmail.com>
49+
Ben Hollis <bhollis@amazon.com>
50+
Justin MacCarthy <Justin@Rubystars.biz>
51+
Eyal Kobrigo <kobrigo@hotmail.com>
52+
Tiago Freire <tiago.freire@gmail.com>
53+
Diego Tres <diegotres@gmail.com>
54+
Holger Rüprich <holger@rueprich.de>
55+
Ziling Zhao <zizhao@cisco.com>
56+
Mike Alsup <malsup@gmail.com>
57+
Robson Braga Araujo <robsonbraga@gmail.com>
58+
Pierre-Henri Ausseil <ph.ausseil@gmail.com>
59+
Christopher McCulloh <cmcculloh@gmail.com>
60+
Andrew Newcomb <ext.github@preceptsoftware.co.uk>
61+
Lim Chee Aun <cheeaun@gmail.com>
62+
Jorge Barreiro <yortx.barry@gmail.com>
63+
Daniel Steigerwald <daniel@steigerwald.cz>
64+
John Firebaugh <john_firebaugh@bigfix.com>
65+
John Enters <github@darkdark.net>
66+
Andrey Kapitcyn <ru.m157y@gmail.com>
67+
Dmitry Petrov <dpetroff@gmail.com>
68+
Eric Hynds <eric@hynds.net>
69+
Chairat Sunthornwiphat <pipo@sixhead.com>
70+
Josh Varner <josh.varner@gmail.com>
71+
Stéphane Raimbault <stephane.raimbault@gmail.com>
72+
Jay Merrifield <fracmak@gmail.com>
73+
J. Ryan Stinnett <jryans@gmail.com>
74+
Peter Heiberg <peter@heiberg.se>
75+
Alex Dovenmuehle <adovenmuehle@gmail.com>
76+
Jamie Gegerson <git@jamiegegerson.com>
77+
Raymond Schwartz <skeetergraphics@gmail.com>
78+
Phillip Barnes <philbar@gmail.com>
79+
Kyle Wilkinson <kai@wikyd.org>
80+
Khaled AlHourani <me@khaledalhourani.com>
81+
Marian Rudzynski <mr@impaled.org>
82+
Jean-Francois Remy <jfremy@virtuoz.com>
83+
Doug Blood <dougblood@gmail.com>
84+
Filippo Cavallarin <poplix@papuasia.org>
85+
Heiko Henning <h.henning@educa.ch>
86+
Aliaxandr Rahalevich <saksmlz@gmail.com>
87+
Mario Visic <mario@mariovisic.com>
88+
Xavi Ramirez <xavi.rmz@gmail.com>
89+
Max Schnur <max.schnur@gmail.com>
90+
Saji Nediyanchath <saji89@gmail.com>
91+
Corey Frang <gnarf@gnarf.net>
92+
Aaron Peterson <aaronp123@yahoo.com>
93+
Ivan Peters <ivan@ivanpeters.com>
94+
Mohamed Cherif Bouchelaghem <cherifbouchelaghem@yahoo.fr>
95+
Marcos Sousa <marcos.sousa@corp.globo.com>
96+
Michael DellaNoce <mdellanoce@mailtrust.com>
97+
George Marshall <echosx@gmail.com>
98+
Tobias Brunner <tobias@strongswan.org>
99+
Martin Solli <msolli@gmail.com>
100+
David Petersen <public@petersendidit.com>
101+
Dan Heberden <danheberden@gmail.com>
102+
William Kevin Manire <williamkmanire@gmail.com>
103+
Gilmore Davidson <gilmoreorless@gmail.com>
104+
Michael Wu <michaelmwu@gmail.com>
105+
Adam Parod <mystic414@gmail.com>
106+
Guillaume Gautreau <guillaume+github@ghusse.com>
107+
Marcel Toele <EleotleCram@gmail.com>
108+
Dan Streetman <ddstreet@ieee.org>
109+
Matt Hoskins <furlined@cat-basket.org>
110+
Giovanni Giacobbi <giovanni@giacobbi.net>
111+
Kyle Florence <kyle.florence@gmail.com>
112+
Pavol Hluchý <lopo@losys.sk>
113+
Hans Hillen <hans.hillen@gmail.com>
114+
Mark Johnson <virgofx@live.com>
115+
Trey Hunner <treyhunner@gmail.com>
116+
Shane Whittet <whittet@gmail.com>
117+
Edward Faulkner <ef@alum.mit.edu>
118+
Adam Baratz <adam.baratz@gmail.com>
119+
Kato Kazuyoshi <kato.kazuyoshi@gmail.com>
120+
Eike Send <eike.send@gmail.com>
121+
Kris Borchers <kris.borchers@gmail.com>
122+
Eddie Monge <eddie@eddiemonge.com>
123+
Israel Tsadok <itsadok@gmail.com>
124+
Carson McDonald <carson@ioncannon.net>
125+
Jason Davies <jason@jasondavies.com>
126+
Garrison Locke <gplocke@gmail.com>
127+
David Murdoch <musicisair@yahoo.com>
128+
Ben Boyle <benjamins.boyle@gmail.com>
129+
Jesse Baird <jebaird@gmail.com>
130+
Jonathan Vingiano <jvingiano@gmail.com>
131+
Dylan Just <dev@ephox.com>
132+
Tomy Kaira <tomykaira@gmail.com>
133+
Glenn Goodrich <glenn.goodrich@gmail.com>
134+
Ashek Elahi <mail.ashek@gmail.com>
135+
Ryan Neufeld <ryan@neufeldmail.com>
136+
Marc Neuwirth <marc.neuwirth@gmail.com>
137+
Philip Graham <philip.robert.graham@gmail.com>
138+
Benjamin Sterling <benjamin.sterling@kenzomedia.com>
139+
Wesley Walser <wwalser@atlassian.com>
140+
Kouhei Sutou <kou@clear-code.com>
141+
Karl Kirch <karl.ctr.kirch@faa.gov>
142+
Chris Kelly <ckdake@ckdake.com>
143+
Jay Oster <jay@loyalize.com>
144+
Alex Polomoshnov <alex.polomoshnov@gmail.com>
145+
David Leal <dgleal@gmail.com>
146+
igor milla <igor.fsp.milla@gmail.com>
147+
Dave Methvin <dave.methvin@gmail.com>
148+
Florian Gutmann <blackfeet@gmx.at>
149+
Marwan Al Jubeh <marwan.aljubeh@gmail.com>
150+
Milan Broum <midlis@googlemail.com>
151+
Sebastian Sauer <info@dynpages.de>
152+
Gaëtan Muller <m.gaetan89@gmail.com>
153+
Michel Weimerskirch <michel@weimerskirch.net>
154+
William Griffiths <william@ycymro.com>
155+
Stojce Slavkovski <stojce@gmail.com>
156+
David Soms <david.soms@gmail.com>
157+
David De Sloovere <david.desloovere@hotmail.com>
158+
Michael P. Jung <michael.jung@terreon.de>
159+
Shannon Pekary <spekary@gmail.com>
160+
Matthew Hutton <meh@corefiling.co.uk>
161+
James Khoury <james@jameskhoury.com>
162+
Rob Loach <robloach@gmail.com>
163+
Alberto Monteiro <betimbrasil@gmail.com>
164+
Alex Rhea <alex.rhea@gmail.com>
165+
Krzysztof Rosiński <rozwell69@gmail.com>
166+
Ryan Olton <oltonr@gmail.com>
167+
Genie <386@mail.com>
168+
Rick Waldron <waldron.rick@gmail.com>
169+
Ian Simpson <spoonlikesham@gmail.com>
170+
Lev Kitsis <spam4lev@gmail.com>
171+
TJ VanToll <tj.vantoll@gmail.com>
172+
Justin Domnitz <jdomnitz@gmail.com>
173+
Douglas Cerna <douglascerna@yahoo.com>
174+
Bert ter Heide <bertjh@hotmail.com>
175+
Jasvir Nagra <jasvir@gmail.com>
176+
Petr Hromadko <yuriy@tokyoscale.com>
177+
Harri Kilpiö <harri.kilpio@gmail.com>
178+
Lado Lomidze <lado.lomidze@gmail.com>
179+
Amir E. Aharoni <amir.aharoni@mail.huji.ac.il>
180+
Simon Sattes <simon.sattes@gmail.com>
181+
Jo Liss <joliss42@gmail.com>
182+
Guntupalli Karunakar <karunakarg@yahoo.com>
183+
Shahyar Ghobadpour <shahyar@gmail.com>
184+
Lukasz Lipinski <uzza17@gmail.com>
185+
Timo Tijhof <krinklemail@gmail.com>
186+
Jason Moon <jmoon@socialcast.com>
187+
Martin Frost <martinf55@hotmail.com>
188+
Eneko Illarramendi <eneko@illarra.com>
189+
EungJun Yi <semtlenori@gmail.com>
190+
Courtland Allen <courtlandallen@gmail.com>
191+
Viktar Varvanovich <non4eg@gmail.com>
192+
Danny Trunk <dtrunk90@googlemail.com>
193+
Pavel Stetina <pavel.stetina@nangu.tv>
194+
Mike Stay <metaweta@gmail.com>
195+
Steven Roussey <sroussey@gmail.com>
196+
Mike Hollis <hollis21@gmail.com>
197+
Lee Rowlands <lee.rowlands@previousnext.com.au>
198+
Timmy Willison <timmywillisn@gmail.com>
199+
Karl Swedberg <kswedberg@gmail.com>
200+
Baoju Yuan <the_guy_1987@hotmail.com>
201+
Maciej Mroziński <mrozik87@gmail.com>
202+
Luis Dalmolin <luis.nh@gmail.com>

MIT-LICENSE.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
Copyright (c) 2012 Paul Bakaus, http://jqueryui.com/
1+
Copyright 2012 jQuery Foundation and other contributors,
2+
http://jqueryui.com/
23

34
This software consists of voluntary contributions made by many
45
individuals (AUTHORS.txt, http://jqueryui.com/about) For exact

README.md

+69-8
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,95 @@ jQuery UI provides interactions like Drag and Drop and widgets like Autocomplete
55

66
If you want to use jQuery UI, go to [jqueryui.com](http://jqueryui.com) to get started. Or visit the [Using jQuery UI Forum](http://forum.jquery.com/using-jquery-ui) for discussions and questions.
77

8-
If you are interested in helping developing jQuery UI, you are in the right place.
9-
To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui).
8+
If you are interested in helping develop jQuery UI, you are in the right place.
9+
To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui) or in #jquery on irc.freednode.net.
10+
1011

1112
For contributors
1213
---
14+
1315
If you want to help and provide a patch for a bugfix or new feature, please take
14-
a few minutes and look at [our Getting Involved guide](http://wiki.jqueryui.com/w/page/35263114/Getting-Involved),
15-
in particular check out the [Coding standards](http://wiki.jqueryui.com/w/page/12137737/Coding-standards)
16+
a few minutes and look at [our Getting Involved guide](http://wiki.jqueryui.com/w/page/35263114/Getting-Involved).
17+
In particular check out the [Coding standards](http://wiki.jqueryui.com/w/page/12137737/Coding-standards)
1618
and [Commit Message Style Guide](http://wiki.jqueryui.com/w/page/25941597/Commit-Message-Style-Guide).
1719

1820
In general, fork the project, create a branch for a specific change and send a
1921
pull request for that branch. Don't mix unrelated changes. You can use the commit
2022
message as the description for the pull request.
2123

2224

25+
Running the Unit Tests
26+
---
27+
28+
Run the unit tests with a local server that supports PHP. No database is required. Pre-configured php local servers are available for Windows and Mac. Here are some options:
29+
30+
- Windows: [WAMP download](http://www.wampserver.com/en/)
31+
- Mac: [MAMP download](http://www.mamp.info/en/index.html)
32+
- Linux: [Setting up LAMP](https://www.linux.com/learn/tutorials/288158-easy-lamp-server-installation)
33+
- [Mongoose (most platforms)](http://code.google.com/p/mongoose/)
34+
35+
36+
Building jQuery UI
37+
---
38+
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.
40+
41+
Install grunt.
42+
43+
`npm install grunt -g`
44+
45+
Clone the jQuery UI git repo.
46+
47+
`git clone git://github.com/jquery/jquery-ui.git`
48+
49+
`cd jquery-ui`
50+
51+
Install node modules.
52+
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`
62+
63+
2364
For committers
2465
---
66+
2567
When looking at pull requests, first check for [proper commit messages](http://wiki.jqueryui.com/w/page/12137724/Bug-Fixing-Guide).
2668

27-
Unless everything is fine and you can merge directly via GitHub's interface, fetch the remote first:
69+
Do not merge pull requests directly through GitHub's interface.
70+
Most pull requests are a single commit; cherry-picking will avoid creating a merge commit.
71+
It's also common for contributors to make minor fixes in an additional one or two commits.
72+
These should be squashed before landing in master.
2873

29-
git remote add [username] [his-fork.git] -f
74+
**Make sure the author has a valid name and email address associated with the commit.**
3075

31-
If you want just one commit and edit the commit message:
76+
Fetch the remote first:
77+
78+
git fetch [their-fork.git] [their-branch]
79+
80+
Then cherry-pick the commit(s):
81+
82+
git cherry-pick [sha-of-commit]
83+
84+
If you need to edit the commit message:
3285

3386
git cherry-pick -e [sha-of-commit]
3487

88+
If you need to edit the changes:
89+
90+
git cherry-pick -n [sha-of-commit]
91+
# make changes
92+
git commit --author="[author-name-and-email]"
93+
3594
If it should go to the stable brach, cherry-pick it to stable:
3695

3796
git checkout 1-8-stable
38-
git cherry-pick -x [sha-of-commit]
97+
git cherry-pick -x [sha-of-commit-from-master]
98+
99+
*NOTE: Do not cherry-pick into 1-8-stable until you have pushed the commit from master upstream.*

0 commit comments

Comments
 (0)