Skip to content
This repository was archived by the owner on Oct 8, 2021. It is now read-only.

Commit fa76784

Browse files
committed
Merge branch 'master' of github.com:jquery/jquery-mobile into issue-4882
Conflicts: js/jquery.mobile.navigation.js
2 parents 0c44912 + 1b18d13 commit fa76784

File tree

590 files changed

+66009
-22137
lines changed

Some content is hidden

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

590 files changed

+66009
-22137
lines changed

.gitignore

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,15 @@ cache/
77
combined/
88
combine/
99
compiled/
10-
gitstatus.log
11-
refreshCDN
10+
tmp/
11+
*.swp
12+
.gitignore
13+
14+
# branch preview
15+
branches
16+
17+
# node build dependencies
18+
node_modules
19+
20+
# phantom junit output
21+
build/test-results/

.htaccess

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

AUTHORS.txt

Lines changed: 197 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,197 @@
1+
Authors ordered by first contribution
2+
A list of current team members is available at http://jquery.org/team
3+
4+
Scott Jehl <scott@scottjehl.com>
5+
John Resig <jeresig@gmail.com>
6+
Scott González <scott.gonzalez@gmail.com>
7+
Jörn Zaefferer <joern.zaefferer@gmail.com>
8+
Kin Blas <jblas@adobe.com>
9+
Douglas Neiner <doug@pixelgraphics.us>
10+
Todd Parker <todd@filamentgroup.com>
11+
Patty Toland <patty@filamentgroup.com>
12+
Jordan Dobson <jordan.dobson@madebysquad.com>
13+
Burin Asavesna <burinasavesna@gmail.com>
14+
Josh Dean <jdean47@gmail.com>
15+
Brandon Aaron <brandon.aaron@gmail.com>
16+
Wu Yuntao <wyt.brandon@gmail.com>
17+
Gabriel Hollombe <gabe@avantbard.com>
18+
Marek Majkowski <majek04@gmail.com>
19+
Matt Curry <mcurry@tremormedia.com>
20+
Jeffrey Way <jeffrey@envato.com>
21+
Christoph Hochgatterer <christoph.hochgatterer@gmail.com>
22+
Beau Smith <beau@beausmith.com>
23+
Karan Bhangui <karan.bhangui@gmail.com>
24+
Alexander Dimitrov <alex_or@abv.bg>
25+
Jonatan Littke <jonatan.littke@gmail.com>
26+
Matt Lins <mattlins@gmail.com>
27+
Dave Penfold <davepenfold@gmail.com>
28+
Jonathan Sharp <jonathan@jdsharp.com>
29+
D. Elmo Peele <Elmo.Peele@gmail.com>
30+
Schalk Neethling <schalk@ossreleasefeed.com>
31+
Ben Alman <cowboy@rj3.net>
32+
Alexandre Capt <acapt@adobe.com>
33+
Richard Stutfield <rich@stutfield.net>
34+
Yuki Kodama <yuki.kodama@gmail.com>
35+
Leon Brocard <acme@astray.com>
36+
John Bender <john.m.bender@gmail.com>
37+
Eric Hynds <eric@hynds.net>
38+
Jesse Streb <jstreb@brightcove.com>
39+
Michael J Rubinsky <mrubinsk@horde.org>
40+
Mitchell Foley <mitch@thefoley.net>
41+
Louy Alakkad <louy08@gmail.com>
42+
Maggie Wachs <maggie@filamentgroup.com>
43+
Jonathan Hinkle <jonathan@vermonster.com>
44+
Ben Clinkinbeard <ben.clinkinbeard@gmail.com>
45+
Pavel Karoukin <pavel@yepcorp.com>
46+
Dan Croak <dan@thoughtbot.com>
47+
Adam Messinger <adam@adammessinger.com>
48+
Alex Kovar <ajkovar@gmail.com>
49+
Chris Hubbard <chris@thehubbards.org>
50+
Mark Schuette <mark.schuette@xing.com>
51+
Davide Bertola <dade@dadeb.it>
52+
Ryan Westphal <ryanw@trippingthebits.com>
53+
Michael O'Hearn <mohearn@gmail.com>
54+
Ernesto Jiménez <me@ernesto-jimenez.com>
55+
Tim Schaub <tim.schaub@gmail.com>
56+
Ashley Streb <astreb@brightcove.com>
57+
Martin Kou <bitanarch@gmail.com>
58+
Jim Hoskins <jim@jimhoskins.com>
59+
Steffen Baumgart <webmaster@artage.de>
60+
Mark Bennett <mark@burmis.ca>
61+
Eddie Monge Jr. <eddie@eddiemonge.com>
62+
Dave Hulbert <dave1010@gmail.com>
63+
Andrew Haller <andrew.haller@aeonblu.com>
64+
Ray Carter <ray58750034@gmail.com>
65+
Phil Barnes <phil.barnes@theice.com>
66+
Kevin Hakanson <kevin@thehakansons.com>
67+
Alexander Wunschik <alex@wunschik.net>
68+
Ivan Rubanov <ivan.rubanov@digia.com>
69+
Curtis Mathews <cmathews@orcc.com>
70+
Felipe Brahm <felipebrahm@gmail.com>
71+
Brad Broulik <bradbroulik@gmail.com>
72+
Martin Kou <martinkou@tixxme.com>
73+
Ray Ling <ray58750034@gmail.com>
74+
Mario Zaizar <mariozaizar@gmail.com>
75+
Nabil Saleh <nabil-saleh@gmx.de>
76+
Christopher Thomas <cwt137@gmail.com>
77+
Bernhard Gschwantner <bernhard+github.com@unserwein.at>
78+
Olivier Poitrey <rs@dailymotion.com>
79+
Markandey Singh <mark.dawn@gmail.com>
80+
Steven Black <steveb@stevenblack.com>
81+
Eric DeLabar <edelabar@gmail.com>
82+
Paul Nicholls <paul.nicholls@canterbury.ac.nz>
83+
Marek Stepien <marcoos@marcoos.org>
84+
Ghislain Seguin <ghislain@gmail.com>
85+
Abhishek Joshi <abhishek2185@gmail.com>
86+
Platon Dickey <platon.dickey@gmail.com>
87+
Mike Woods <vtwoods@gmail.com>
88+
Shana Golden <shana@vermonster.com>
89+
Mat Marquis <mat@matmarquis.com>
90+
Matthias Derer <webmaster@tonstube.de>
91+
Oliver Frietsch <oliver.frietsch@web.de>
92+
Álvaro Lázaro Gallego <alvaro.lazaro.g@gmail.com>
93+
Wolfram Twelker <mail@wolfram-twelker.de>
94+
Luke Young <me@innoying.com>
95+
Adam Vaughan <adamjvaughan@gmail.com>
96+
Christoph Burgdorf <christoph.burgdorf@bvsn.org>
97+
Tobias Bosch <tobias.bosch@opitz-consulting.com>
98+
Martin Sutherland <martin@sunpig.com>
99+
Jacob Gable <jacob.gable@gmail.com>
100+
Konstantin Pozin <kpozin@gmail.com>
101+
Rick Waldron <waldron.rick@gmail.com>
102+
Wietse Venema <wietsevenema@gmail.com>
103+
Eugen Bolz <info@eugen-bolz.de>
104+
Théophile Helleboid <chtitux@gmail.com>
105+
Matthew Litwin <mlitwin@kcptech.com>
106+
Sam Blowes <sam@blowsie.com>
107+
Ryan Neufeld <ryan@neufeldmail.com>
108+
Tak Tran <contact@tutaktran.com>
109+
Matt Freeman <matt@mattfreeman.co.uk>
110+
Mayank Varia <variamayank@gmail.com>
111+
Andy Matthews <andy@commadelimited.com>
112+
James Brady <james@trigger.io>
113+
Samuel Padou <samuel.padou@gmail.com>
114+
Faolan Cheslack-Postava <fcheslack@gmail.com>
115+
Omar Vargas <ovargas27@gmail.com>
116+
Casey Justus <caseyjustus@gmail.com>
117+
Eddie Cianci <defeated2k4@gmail.com>
118+
Andri Möll <andri@dot.ee>
119+
Max Rabin <rabin.max@gmail.com>
120+
Michel Hartmann <michel.hartmann@mayflower.de>
121+
Richard D. Worth <rdworth@gmail.com>
122+
Michael Platov <michael.platov@gmail.com>
123+
Zach Leatherman <zachleatherman@gmail.com>
124+
Hernán Schmidt <lagartoflojo@gmail.com>
125+
Matt Doyle <mattdoyle@elated.com>
126+
Daniel Tao <daniel.tao@gmail.com>
127+
Maurice Gottlieb <magoo@maugo.de>
128+
Hans-Peter Buniat <hpbuniat@gmail.com>
129+
Brandon Johnson <bjohn465+jq@gmail.com>
130+
Robert Gregor <bob@bobscomputers.com>
131+
Gabriel Schulhof <gabriel.schulhof@intel.com>
132+
Masataka Yakura <masataka.yakura@gmail.com>
133+
Gabriele Rabbiosi <gabriele.rabbiosi@gmail.com>
134+
Matthew Leon Grinshpun <vertespain@gmail.com>
135+
Jake Boone <jakeboone02@gmail.com>
136+
Riaz Missaghi <easymovet@gmail.com>
137+
Michael D. H. Griffiths <mdhgriffiths@gmail.com>
138+
Samat K Jain <samat@samat.org>
139+
Alex Roberts <alex@eventbrite.com>
140+
Jean-Pierre Fiset <jp@fiset.ca>
141+
Charlie Collins <charlie.collins@gmail.com>
142+
Petko Bossakov <petko@bossakov.eu>
143+
Dan Heberden <danheberden@gmail.com>
144+
Garann Means <garann@gmail.com>
145+
Anne-Gaelle Colom <coloma@wmin.ac.uk>
146+
Tyler Benziger <tabenziger@ucdavis.edu>
147+
Jason Crane <jasonlcrane@gmail.com>
148+
Thomas Lallement <thomas.lallement@9online.fr>
149+
Ethan Romba <ethanromba@gmail.com>
150+
Jonathan Rowny <jrowny@gmail.com>
151+
Stéphane Reynaud <forresst@voila.fr>
152+
Peter Körner <github@mazdermind.de>
153+
Luke Brookhart <luke@onjax.com>
154+
Alexey Astafiev <alexey.astafiev@gmail.com>
155+
Marcus Lunzenauer <mlunzena@uos.de>
156+
Pavel Zubkou <pavel.zubkou@gmail.com>
157+
Nicolas Bartoli <nicolas.bartoli@gmail.com>
158+
Sergei Grebnov <sergey.grebnov@akvelon.com>
159+
Chetan K Jain <chetankjain@gmail.com>
160+
Frederik Lassen <frederiklassen@gmail.com>
161+
James Burke <jrburke@gmail.com>
162+
Josh Dean <joshua.lee.dean@gmail.com>
163+
Jason Scott <me@jasondscott.com>
164+
Jasper de Groot <mail@ugomobi.com>
165+
Deric Crago <deric.crago@gmail.com>
166+
Dmitry Apresian <dmitry91@hotmail.com>
167+
Teddy Caddy <info@teddycaddy.com>
168+
Brian Antonelli <brian.antonelli@gmail.com>
169+
Eugene Pavliy <sleepwalkergt@gmail.com>
170+
Robby Dermody <robbyd@paramise.com>
171+
Dave Methvin <dave.methvin@gmail.com>
172+
Richard Trott <rtrott@gmail.com>
173+
Ron Waldon <jokeyrhyme@gmail.com>
174+
Simon Ratner <simon+github@probablyprime.net>
175+
Toru Yoshikawa <pikotea@gmail.com>
176+
Laurentiu Macovei <laurentiu.macovei@dotnetwise.com>
177+
Elliot Smith <elliot.smith@intel.com>
178+
Arne Hormann <a.hormann@gmx.net>
179+
Jim Holby <JamesDHolby@gmail.com>
180+
Matthew Hensrud <matthewhensrud@gmail.com>
181+
Dan Jacka <danjacka@gmail.com>
182+
Jeff Gabhart <lazydesert@gmail.com>
183+
Eugene Baranov <ebaranov.dev@gmail.com>
184+
Takashi Okamoto <toraneko@gmail.com>
185+
Adria Jimenez <ajimix@gmail.com>
186+
Pavel Savara <pavel.savara@gmail.com>
187+
Alexander Casassovici <alex@ksso.net>
188+
Nicholas Hall <ngharo@gmail.com>
189+
Gabriel Schulhof <gabriel.schulhof@intel.com>
190+
Adrian Pike <adrian@pikeapps.com>
191+
Dirk Heider <dirk.00heider@gmail.com>
192+
Darío Javier Cravero <dario@q-innova.com.ar>
193+
David L. Carrithers <dcarrith@gmail.com>
194+
Corey Frang <gnarf@gnarf.net>
195+
Michael Ridland <rid00z@gmail.com>
196+
Brian Edgerton <bedgerton@appendto.com>
197+
Marcin Szczepanski <marcins@gmail.com>

CONTRIBUTING.md

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
## Issues
2+
3+
If you encounter a bug in the framework you can report it on the issue tracker here on Github. Questions about how to use the framework or problems with your custom code can be posted on the [forum](https://forum.jquery.com/jquery-mobile).
4+
The jQuery Mobile [ThemeRoller](https://github.com/jquery/web-jquery-mobile-theme-roller) and [Download Builder](https://github.com/jquery/jquery-mobile-builder) have their own repo where you can report issues.
5+
6+
Before opening a new issue please check if the same or a similar issue already has been reported. Tip: Besides the search tool of the issue tracker you can filter issues by label.
7+
8+
When [submitting an issue](https://github.com/jquery/jquery-mobile/issues/new) include the following:
9+
10+
1. Issue description
11+
2. Test page (see below)
12+
3. Steps to reproduce
13+
4. Expected outcome
14+
5. Actual outcome
15+
6. Platforms/browsers (including version) and devices tested
16+
7. jQuery Mobile and jQuery core version used
17+
8. Other relevant information, e.g. using PhoneGap
18+
19+
In the interest of creating more readable issues please include code snippets inside a triple backtick box appropriate for the JavaScript/HTML/CSS snippet you wish to discuss. More information is available at the [introduction page](http://github.github.com/github-flavored-markdown/) for github flavored markdown (see Syntax Highlighting).
20+
21+
### Test page
22+
23+
It is IMPORTANT that you always provide a test page when submitting an issue!
24+
25+
* Why? - This ensures that we are looking at exactly the same thing when testing on our devices and that we know about all markup and code that is in play.
26+
27+
* What? - Keep the test page as simple as possible. Only include markup/code that is required to reproduce the issue.
28+
29+
* How? - Use our [JS Bin template](http://jsbin.com/uzaret/edit) which uses latest code on branch "master". Copy the updated url when you are done editing.
30+
* You will notice if the issue has been fixed already
31+
* It enables us to edit your code if necessary
32+
* The test page won't disappear or change while we are looking into the issue
33+
* We can test again after committing a fix for the issue
34+
35+
## Feature Requests
36+
37+
If you have an idea for a new feature or a suggestion how to improve an existing feature, let us know!
38+
39+
1. Open a [new issue](https://github.com/jquery/jquery-mobile/issues/new) to describe your request
40+
2. Add a link to the issue on the Feature Requests [wiki page](https://github.com/jquery/jquery-mobile/wiki/Feature-Requests)
41+
42+
Please note that we will flag the issue as feature request and then close it. We check requests on regular base and when we decide to implement a feature we set a milestone and re-open the ticket.
43+
44+
## Pull Requests
45+
46+
When submitting a pull request for review there are a few important steps you can take to ensure that it gets reviewed quickly and increase the chances that it will be merged (in order of descending importance):
47+
48+
1. Include tests (see [Testing](https://github.com/jquery/jquery-mobile/blob/master/README.md#testing))
49+
2. Follow the [jQuery Core style guide](http://docs.jquery.com/JQuery_Core_Style_Guidelines)
50+
3. Limit the scope to one Issue/Feature
51+
4. Small focused commits, ideally less than 10 to 20 lines
52+
5. Avoid merge commits (see Pro Git's [chapter on rebasing](http://git-scm.com/book/ch3-6.html), section [Rebasing](#rebasing) below)
53+
6. Add the appropriate commit message (see below)
54+
55+
Taken together, the above reduces the effort that's required of the contributor reviewing your pull request.
56+
57+
### Commit messages
58+
59+
Commit messages should include four components:
60+
61+
* The WHERE - a single word that categorizes and provides context for the commit and its message, followed by a colon (:). This is typically the name of the plugin being worked on, but sometimes might be something like Build: or Docs:
62+
* The WHAT - a sufficient summary of the fix or change made (example: modified the foo to no longer bar), followed by a period (.)
63+
* The WHY #Num - the ticket number with a #sign so Trac creates a hyperlink (example: #1234), followed by a hyphen/dash (-)
64+
* The WHY Name - the name of the ticket. Notice this is different than summary of the fix. This is a short description of the issue (example: dialog: IE6 crashed when foo is set to bar)
65+
66+
Combined into one, here's a full example:
67+
68+
"Dialog: modified the foo to no longer bar. Fixed #1234 - dialog: IE6 crashed when foo is set to bar"
69+
\WHERE/:\------------- WHAT -------------/.\ WHY #Num /-\---------------- WHY Name ----------------/
70+
71+
72+
------------------------------------------------------------
73+
74+
*Thank you for contributing to the jQuery Mobile project!*

LICENSE-INFO.min.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/*! jQuery Mobile v@VERSION jquerymobile.com | jquery.org/license */

LICENSE-INFO.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/*
2+
* jQuery Mobile Framework v@VERSION
3+
* http://jquerymobile.com
4+
*
5+
* Copyright 2012 jQuery Foundation and other contributors
6+
* Released under the MIT license.
7+
* http://jquery.org/license
8+
*
9+
*/

MIT-LICENSE.txt

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

0 commit comments

Comments
 (0)