Skip to content

Commit 2253df8

Browse files
committed
Merge branch 'master' into menubar
2 parents 86417ef + dc5254a commit 2253df8

File tree

460 files changed

+52537
-20102
lines changed

Some content is hidden

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

460 files changed

+52537
-20102
lines changed

.csslintrc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"adjoining-classes": false,
3+
"box-model": false,
4+
"compatible-vendor-prefixes": false,
5+
"duplicate-background-images": false,
6+
"import": false,
7+
"important": false,
8+
"outline-none": false,
9+
"overqualified-elements": false,
10+
"text-indent": false
11+
}

.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,8 @@ end_of_line = lf
99
charset = utf-8
1010
trim_trailing_whitespace = true
1111
insert_final_newline = true
12+
13+
[external/**]
14+
trim_trailing_whitespace = false
15+
insert_final_newline = varies
16+
end_of_line = varies

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto

.jshintrc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"eqnull": true,
44
"eqeqeq": true,
55
"expr": true,
6-
"latedef": true,
76
"noarg": true,
7+
"node": true,
88
"onevar": true,
9-
"smarttabs": true,
109
"trailing": true,
11-
"undef": true
10+
"undef": true,
11+
"unused": true
1212
}

.mailmap

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
Aaron Peterson <aaronp123@yahoo.com>
2+
Adam Baratz <adam@adambaratz.com> <adam.baratz@gmail.com>
3+
Adam Sontag <ajpiano@ajpiano.com>
4+
Alexander Polomoshnov <alex.polomoshnov@gmail.com>
5+
Aliaksandr Rahalevich <saksmlz@gmail.com>
6+
Andrew Couch <andy@couchand.com> <acouch@bluewolf.com>
7+
Andrew Newcomb <ext.github@preceptsoftware.co.uk>
8+
Andrew Powell <powella@gmail.com> <andrew@shellscape.org>
9+
Andrey Kapitcyn <ru.m157y@gmail.com>
10+
Ben Hollis <bhollis@amazon.com> <ben@benhollis.net>
11+
Benjamin Scott Boyle <benjamins.boyle@gmail.com>
12+
Bert ter Heide <bertjh@hotmail.com>
13+
Chairat Sunthornwiphat <pipo@sixhead.com>
14+
Corey Frang <gnarf@gnarf.net>
15+
Courtland Allen <courtlandallen@gmail.com>
16+
Dan Streetman <ddstreet@ieee.org>
17+
Diego Tres <diegotres@gmail.com>
18+
Dominique Vincent <dominique.vincent@toitl.com>
19+
Doug Blood <dougblood@gmail.com>
20+
Douglas Cerna <douglascerna@yahoo.com> <replaceafill@system76.(none)>
21+
Douglas Neiner <doug@pixelgraphics.us>
22+
Douglas Neiner <doug@pixelgraphics.us> <doug@Doug-Neiners-MacBook-Pro.local>
23+
Dylan Just <dev@ephox.com>
24+
Eddie Monge <eddie@eddiemonge.com>
25+
Edward A Faulkner <ef@alum.mit.edu>
26+
Eric Hynds <eric@hynds.net>
27+
Ethan Romba <ethanromba@gmail.com> <ethan.romba@parivedasolutions.com>
28+
EungJun Yi <semtlenori@gmail.com>
29+
Eyal Kobrigo <kobrigo@hotmail.com>
30+
Filippo Cavallarin <filippo.cavallarin@codseq.it> <poplix@papuasia.org>
31+
Florian Gutmann <f.gutmann@chronimo.com> <blackfeet@gmx.at>
32+
Genie <386@mail.com>
33+
Guntupalli Karunakar <karunakarg@yahoo.com>
34+
Hiroshi Tomita <tomykaira@gmail.com>
35+
Ian Simpson <spoonlikesham@gmail.com>
36+
Igor Milla <igor.fsp.milla@gmail.com>
37+
Israel Tsadok <itsadok@gmail.com>
38+
Jacek Jędrzejewski <jacek.jedrzejewski@gmail.com>
39+
Jamie Gegerson <git@jamiegegerson.com>
40+
Jay Merrifield <fracmak@gmail.com> <merrifieldj@pixia.com>
41+
John Enters <github@darkdark.net>
42+
Jonathan Vingiano <jvingiano@gmail.com>
43+
Josh Varner <josh.varner@gmail.com>
44+
Justin Domnitz <jdomnitz@gmail.com>
45+
Justin MacCarthy <Justin@Rubystars.biz>
46+
Jörn Zaefferer <joern.zaefferer@gmail.com>
47+
Karl Kirch <karlkrch@gmail.com> <karl.ctr.kirch@faa.gov>
48+
Kevin Dalman <development@allpro.net>
49+
Klaus Hartl <klaus.hartl@googlemail.com> carhartl <klaus.hartl@stilbuero.de>
50+
Kris Borchers <kris.borchers@gmail.com>
51+
Kris Borchers <kris.borchers@gmail.com> <k_borchers@yahoo.com>
52+
Krzysztof Rosiński <rozwell69@gmail.com>
53+
Lev Kitsis <spam4lev@gmail.com>
54+
Maggie Costello Wachs <fg.maggie@gmail.com> maggiewachs <maggie@filamentgroup.com>
55+
Marc Neuwirth <marc.neuwirth@gmail.com>
56+
Marcos Sousa <falecomigo@marcossousa.com> <marcos.sousa@corp.globo.com>
57+
Martin Frost <martinf55@hotmail.com>
58+
Mathias Stenbom <mathias@stenbom.com>
59+
Matthew Edward Hutton <meh@corefiling.co.uk>
60+
Max Schnur <max.schnur@gmail.com>
61+
Michael Hollis <hollis21@gmail.com>
62+
Michael Stay <metaweta@gmail.com>
63+
Michael Wu <michaelmwu@gmail.com>
64+
Mike Alsup <malsup@gmail.com>
65+
Milan Broum <midlis@googlemail.com>
66+
Mohamed Cherif Bouchelaghem <cherifbouchelaghem@yahoo.fr> <cherif@cherif.(none)>
67+
Paul Irish <paul.irish@gmail.com>
68+
Pavol Hluchý <lopo@losys.sk>
69+
Peter Heiberg <peter@heiberg.se>
70+
Petr Hromadko <yuriy@tokyoscale.com>
71+
Phillip Barnes <philbar@gmail.com> <phillipbarnes@Phillip-Barnes-Computer.local>
72+
Pierre-Henri Ausseil <ph.ausseil@gmail.com>
73+
Raymond Schwartz <skeetergraphics@gmail.com>
74+
Richard Worth <rdworth@gmail.com>
75+
Rick Waldron <waldron.rick@gmail.com>
76+
Ryan Neufeld <ryan@neufeldmail.com>
77+
Ryan Olton <oltonr@gmail.com>
78+
Saji Nediyanchath <saji89@gmail.com> Saji <saji@saji-laptop.(none)>
79+
Sebastian Sauer <info@dynpages.de>
80+
Sergey Kartashov <ebishkek@yandex.ru>
81+
Shahyar Ghobadpour <shahyar@gmail.com>
82+
Shane Whittet <whittet@gmail.com>
83+
Shannon Pekary <spekary@gmail.com>
84+
Simon Sattes <simon.sattes@gmail.com>
85+
Stojce Slavkovski <stojce@gmail.com>
86+
Tarafder Ashek-E-Elahi <mail.ashek@gmail.com>
87+
Thibault Duplessis <thibault.duplessis@gmail.com>
88+
Ting Kuei <ting@kuei.com>
89+
Wesley Walser <waw325@gmail.com> <wwalser@atlassian.com>
90+
Xavi Ramirez <xavi.rmz@gmail.com>

AUTHORS.txt

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Authors ordered by first contribution
1+
Authors ordered by first contribution
22
A list of current team members is available at http://jqueryui.com/about
33

44
Paul Bakaus <paul.bakaus@googlemail.com>
@@ -168,7 +168,7 @@ Genie <386@mail.com>
168168
Rick Waldron <waldron.rick@gmail.com>
169169
Ian Simpson <spoonlikesham@gmail.com>
170170
Lev Kitsis <spam4lev@gmail.com>
171-
Ted VanToll <tj.vantoll@gmail.com>
171+
TJ VanToll <tj.vantoll@gmail.com>
172172
Justin Domnitz <jdomnitz@gmail.com>
173173
Douglas Cerna <douglascerna@yahoo.com>
174174
Bert ter Heide <bertjh@hotmail.com>
@@ -208,3 +208,35 @@ Sindre Sorhus <sindresorhus@gmail.com>
208208
Bernhard Sirlinger <bernhard.sirlinger@tele2.de>
209209
Jared A. Scheel <jared@jaredscheel.com>
210210
Rafael Xavier de Souza <rxaviers@gmail.com>
211+
John Chen <zhang.z.chen@intel.com>
212+
Dale Kocian <dale.kocian@gmail.com>
213+
Mike Sherov <mike.sherov@gmail.com>
214+
Andrew Couch <andy@couchand.com>
215+
Marc-Andre Lafortune <github@marc-andre.ca>
216+
Nate Eagle <nate.eagle@teamaol.com>
217+
David Souther <davidsouther@gmail.com>
218+
Mathias Stenbom <mathias@stenbom.com>
219+
Sergey Kartashov <ebishkek@yandex.ru>
220+
Avinash R <nashpapa@gmail.com>
221+
Ethan Romba <ethanromba@gmail.com>
222+
Cory Gackenheimer <cory.gack@gmail.com>
223+
Juan Pablo Kaniefsky <jpkaniefsky@gmail.com>
224+
Roman Salnikov <bardt.dz@gmail.com>
225+
Anika Henke <anika@selfthinker.org>
226+
Samuel Bovée <samycookie2000@yahoo.fr>
227+
Fabrício Matté <ult_combo@hotmail.com>
228+
Viktor Kojouharov <vkojouharov@gmail.com>
229+
Pawel Maruszczyk <lord_t@o2.pl>
230+
Pavel Selitskas <p.selitskas@gmail.com>
231+
Bjørn Johansen <bjorn.johansen@metronet.no>
232+
Matthieu Penant <thieum22@hotmail.com>
233+
Dominic Barnes <dominic@dbarnes.info>
234+
David Sullivan <david.sullivan@gmail.com>
235+
Thomas Jaggi <thomas.jaggi@gmail.com>
236+
Vahid Sohrabloo <vahid4134@gmail.com>
237+
Travis Carden <travis.carden@gmail.com>
238+
Bruno M. Custódio <bruno@brunomcustodio.com>
239+
Nathanael Silverman <nathanael.silverman@gmail.com>
240+
Christian Wenz <christian@wenz.org>
241+
Steve Urmston <steve@urm.st>
242+
Zaven Muradyan <megalivoithos@gmail.com>

CONTRIBUTING.md

Lines changed: 205 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,205 @@
1+
# Contributing to jQuery UI
2+
3+
1. [Getting Involved](#getting-involved)
4+
2. [Discussion](#discussion)
5+
3. [How To Report Bugs](#how-to-report-bugs)
6+
4. [jQuery UI Coding Standards](#jquery-ui-coding-standards)
7+
5. [Tips For Bug Patching](#tips-for-bug-patching)
8+
9+
10+
11+
## Getting Involved
12+
13+
There are a number of ways to get involved with the development of jQuery UI. Even if you've never contributed code to an Open Source project before, we're always looking for help identifying bugs, writing and reducing test cases and documentation.
14+
15+
This is the best way to contribute to jQuery UI. Please read through the full guide detailing [How to Report Bugs](#how-to-report-bugs).
16+
17+
## Discussion
18+
19+
### Forum and IRC
20+
21+
The jQuery UI development team frequently tracks posts on the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui). If you have longer posts or questions please feel free to post them there. If you think you've found a bug please [file it in the bug tracker](#how-to-report-bugs).
22+
23+
Additionally most of the jQuery UI development team can be found in the [#jqueryui-dev](http://webchat.freenode.net/?channels=jqueryui-dev) IRC channel on irc.freenode.net.
24+
25+
### Weekly Status Meetings
26+
27+
Every week (unless otherwise noted) the jQuery UI dev team has a meeting to discuss the progress of current work and to bring forward possible new blocker bugs for discussion.
28+
29+
The meeting is held in the [#jquery-meeting](http://webchat.freenode.net/?channels=jquery-meeting) IRC channel on irc.freenode.net at [Noon EST](http://www.timeanddate.com/worldclock/fixedtime.html?month=1&day=17&year=2011&hour=12&min=0&sec=0&p1=43) on Wednesdays.
30+
31+
Past Meeting Notes:
32+
[2008 - 2011](https://docs.google.com/spreadsheet/ccc?key=0AusvKVL7jmFUcHVBQk9tMUxkRGl0emVwZGdLd0QtUlE),
33+
[2012 - current](https://docs.google.com/spreadsheet/ccc?key=0ArIM4UVbwE-3dFg1T0k4VlE1bF82Nm9tbW90cVNxN0E)
34+
35+
36+
## How to Report Bugs
37+
38+
### Make sure it is a jQuery UI bug
39+
40+
Many bugs reported to our bug tracker are actually bugs in user code, not in jQuery UI code. Keep in mind that just because your code throws an error and the console points to a line number inside of jQuery or jQuery UI, this does *not* mean the bug is a jQuery UI bug.
41+
42+
If you are new to jQuery and/or jQuery UI, it is usually a much better idea to ask for help first in the [Using jQuery Forum](http://forum.jquery.com/using-jquery), the [Using jQuery UI Forum](http://forum.jquery.com/using-jquery-ui) or the [jQuery IRC channel](http://webchat.freenode.net/?channels=%23jquery). You will get much quicker support, and you will help avoid tying up the jQuery UI team with invalid bug reports. These same resources can also be useful if you want to confirm that your bug is indeed a bug in jQuery UI before filing any tickets.
43+
44+
45+
### Disable any browser extensions
46+
47+
Make sure you have reproduced the bug with all browser extensions and add-ons disabled, as these can sometimes cause things to break in interesting and unpredictable ways. Try using incognito, stealth or anonymous browsing modes.
48+
49+
50+
### Try the latest version of jQuery UI
51+
52+
Bugs in old versions of jQuery UI may have already been fixed. In order to avoid reporting known issues, make sure you are always testing against the latest stable release.
53+
54+
### Try an older version of jQuery UI
55+
56+
Sometimes, bugs are introduced in newer versions of jQuery UI that do not exist in previous versions. When possible, it can be useful to try testing with an older release.
57+
58+
### Reduce, reduce, reduce!
59+
60+
When you are experiencing a problem, the most useful thing you can possibly do is to [reduce your code](http://webkit.org/quality/reduction.html) to the bare minimum required to reproduce the issue. This makes it *much* easier to isolate and fix the offending code. Bugs that are reported without reduced test cases generally take much longer to fix than bugs that are submitted with them, so you really should try to do this if at all possible.
61+
62+
## jQuery UI Coding Standards
63+
64+
See: [jQuery UI Coding Standards](http://wiki.jqueryui.com/w/page/12137737/Coding%20standards)
65+
66+
## Tips For Bug Patching
67+
68+
69+
### Environment: localhost w/ PHP, Node & Grunt
70+
71+
jQuery UI uses node & gruntjs to automate the building and validation of source code.
72+
73+
Some tests depend on PHP running locally, so make sure you have the following installed:
74+
75+
* Some kind of localhost server program that supports PHP (any will do)
76+
* Node.js
77+
* NPM (comes with the latest version of Node.js)
78+
* Grunt (install with: `npm install grunt -g`
79+
80+
81+
Maintaining a list of platform specific instructions is outside of the scope of this document and there is plenty of existing documentation for the above technologies.
82+
83+
84+
### Build a Local Copy of jQuery UI
85+
86+
Create a fork of the jQuery UI repo on github at http://github.com/jquery/jquery-ui
87+
88+
Change directory to your web root directory, whatever that might be:
89+
90+
```bash
91+
$ cd /path/to/your/www/root/
92+
```
93+
94+
Clone your jQuery UI fork to work locally
95+
96+
```bash
97+
$ git clone git@github.com:username/jquery-ui.git
98+
```
99+
100+
Change directory to the newly created dir jquery-ui/
101+
102+
```bash
103+
$ cd jquery-ui
104+
```
105+
106+
Add the jQuery master as a remote. I label mine "upstream"
107+
108+
```bash
109+
$ git remote add upstream git://github.com/jquery/jquery-ui.git
110+
```
111+
112+
Get in the habit of pulling in the "upstream" master to stay up to date as jQuery UI receives new commits
113+
114+
```bash
115+
$ git pull upstream master
116+
```
117+
118+
To lint the JavaScript, HTML, and CSS, as well as run a smoke test in PhantomJS, run grunt:
119+
120+
```bash
121+
$ grunt
122+
```
123+
124+
To run the tests for a specific plugin in your browser, open the approriate file from the /tests/unit/ directory, for example: http://localhost/tests/unit/accordion/accordion.html. The domain will be dependent on your local server configuation; if there is a port, be sure to include it.
125+
126+
Success! You just tested jQuery UI!
127+
128+
129+
### Fix a bug from a ticket filed at bugs.jqueryui.com:
130+
131+
**NEVER write your patches to the master branch** - it gets messy (I say this from experience!)
132+
133+
**ALWAYS USE A "TOPIC" BRANCH!** Like so (#### = the ticket #)...
134+
135+
Make sure you start with your up-to-date master:
136+
137+
```bash
138+
$ git checkout master
139+
```
140+
141+
Create and checkout a new branch that includes the ticket #
142+
143+
```bash
144+
$ git checkout -b bug_####
145+
146+
# ( Explanation: this useful command will:
147+
# "checkout" a "-b" (branch) by the name of "bug_####"
148+
# or create it if it doesn't exist )
149+
```
150+
151+
Now you're on branch: bug_####
152+
153+
Determine the file you'll be working in...
154+
155+
Open up the corresponding /tests/unit/?????.js and add the initial failing unit tests. This may seem awkward at first, but in the long run it will make sense. To truly and efficiently patch a bug, you need to be working against that bug.
156+
157+
Next, open the source files and make your changes
158+
159+
Run http://localhost/tests/unit/???? --> **ALL TESTS MUST PASS**
160+
161+
Once you're satisfied with your patch...
162+
163+
Stage the files to be tracked:
164+
165+
```bash
166+
$ git add filename
167+
# (you can use "git status" to list the files you've changed)
168+
```
169+
170+
171+
( I recommend NEVER, EVER using "git add . " )
172+
173+
Once you've staged all of your changed files, go ahead and commit them
174+
175+
```bash
176+
$ git commit -m "Component: Brief description of fix. Fixes #0000 - Ticket description."
177+
```
178+
179+
See the [commit message style guide](http://wiki.jqueryui.com/w/page/25941597/Commit%20Message%20Style%20Guide) for more details on how to format your commit message.
180+
181+
For a multiple line commit message, leave off the `-m "description"`.
182+
183+
You will then be led into vi (or the text editor that you have set up) to complete your commit message.
184+
185+
Then, push your branch with the bug fix commits to your github fork
186+
187+
```bash
188+
$ git push origin -u bug_####
189+
```
190+
191+
Before you tackle your next bug patch, return to the master:
192+
193+
```bash
194+
$ git checkout master
195+
```
196+
197+
198+
199+
### jQuery UI supports the following browsers:
200+
201+
* Chrome Current-1
202+
* Safari Current-1
203+
* Firefox Current-1
204+
* Opera Current-1
205+
* IE 7+

0 commit comments

Comments
 (0)