Permalink
Browse files

Merge branch 'master' into interactions

Conflicts:
	demos/draggable/constrain-movement.html
	demos/draggable/cursor-style.html
	demos/draggable/default.html
	demos/draggable/events.html
	demos/draggable/handle.html
	demos/draggable/revert.html
	demos/draggable/visual-feedback.html
	demos/droppable/default.html
	grunt.js
	tests/unit/draggable/draggable.html
	tests/unit/draggable/draggable_core.js
	tests/unit/draggable/draggable_options.js
	tests/unit/draggable/draggable_test_helpers.js
	tests/unit/droppable/droppable.html
	tests/unit/droppable/droppable_options.js
	ui/draggable.js
	ui/jquery.ui.droppable.js
	ui/sortable.js
  • Loading branch information...
2 parents 7a1fdb9 + 390e440 commit c15481eeb1806938ce2b3adfa1866e5a8a78fa31 @mikesherov mikesherov committed Feb 10, 2014
Showing 483 changed files with 139,969 additions and 13,190 deletions.
View
@@ -0,0 +1,11 @@
+{
+ "adjoining-classes": false,
+ "box-model": false,
+ "compatible-vendor-prefixes": false,
+ "duplicate-background-images": false,
+ "import": false,
+ "important": false,
+ "outline-none": false,
+ "overqualified-elements": false,
+ "text-indent": false
+}
View
@@ -1,9 +1,3 @@
dist
node_modules
-docs
-.project
-*~
-*.diff
-*.patch
-.DS_Store
-.settings
+.sizecache.json
View
@@ -0,0 +1,3 @@
+{
+ "preset": "jquery"
+}
View
@@ -1,12 +1,17 @@
{
+ "boss": true,
"curly": true,
- "eqnull": true,
"eqeqeq": true,
+ "eqnull": true,
"expr": true,
+ "immed": true,
"noarg": true,
- "node": true,
"onevar": true,
+ "quotmark": "double",
+ "smarttabs": true,
"trailing": true,
"undef": true,
- "unused": true
+ "unused": true,
+
+ "node": true
}
View
@@ -1,6 +1,114 @@
+Aaron Peterson <aaronp123@yahoo.com>
+Adam Baratz <adam@adambaratz.com> <adam.baratz@gmail.com>
+Adam Sontag <ajpiano@ajpiano.com>
+Alexander Polomoshnov <alex.polomoshnov@gmail.com>
+Aliaksandr Rahalevich <saksmlz@gmail.com>
+Andrew Couch <andy@couchand.com> <acouch@bluewolf.com>
+Andrew Newcomb <ext.github@preceptsoftware.co.uk>
+Andrew Powell <andrew@shellscape.org> <andrew@shellcape.org>
+Andrew Powell <andrew@shellscape.org> <powella@gmail.com>
+Andrey Kapitcyn <ru.m157y@gmail.com>
+Ben Hollis <bhollis@amazon.com> <ben@benhollis.net>
+Benjamin Scott Boyle <benjamins.boyle@gmail.com>
+Bert ter Heide <bertjh@hotmail.com>
+Bjørn Johansen <post@bjornjohansen.no> <bjorn.johansen@metronet.no>
+Chairat Sunthornwiphat <pipo@sixhead.com>
+Christoph Rönsch <christoph.roensch@arcor.de>
+Corey Frang <gnarf37@gmail.com> <gnarf@gnarf.net>
+Courtland Allen <courtlandallen@gmail.com>
+Dan Streetman <ddstreet@ieee.org>
+Danny Trunk <dtrunk90@gmail.com> <dtrunk90@googlemail.com>
+David De Sloovere <david.desloovere@outlook.com> <david.desloovere@hotmail.com>
+David Murdoch <david@davidmurdoch.com> <musicisair@yahoo.com>
+Diego Tres <diegotres@gmail.com>
+Dominique Vincent <dominique.vincent@toitl.com>
+Doug Blood <dougblood@gmail.com>
+Douglas Cerna <douglascerna@yahoo.com> <replaceafill@system76.(none)>
+Douglas Neiner <doug@dougneiner.com> <doug@pixelgraphics.us>
+Douglas Neiner <doug@dougneiner.com> <doug@Doug-Neiners-MacBook-Pro.local>
+Dylan Just <dev@ephox.com>
+Eddie Monge <eddie@eddiemonge.com>
+Edward A Faulkner <ef@alum.mit.edu>
+Eric Hynds <eric@hynds.net>
+Ethan Romba <ethanromba@gmail.com> <ethan.romba@parivedasolutions.com>
+EungJun Yi <semtlenori@gmail.com>
+Eyal Kobrigo <kobrigo@hotmail.com>
+Filippo Cavallarin <filippo.cavallarin@codseq.it> <poplix@papuasia.org>
+Florian Gutmann <f.gutmann@chronimo.com> <blackfeet@gmx.at>
+Genie <386@mail.com>
+Guntupalli Karunakar <karunakarg@yahoo.com>
+Heiko Henning <heiko@thehennings.ch> <h.henning@educa.ch>
+Hiroshi Tomita <tomykaira@gmail.com>
+Ian Simpson <spoonlikesham@gmail.com>
+Igor Milla <igor.fsp.milla@gmail.com>
+Israel Tsadok <itsadok@gmail.com>
+Jacek Jędrzejewski <jacek.jedrzejewski@gmail.com>
+Jamie Gegerson <git@jamiegegerson.com>
+Jason Oster <jay@kodewerx.org> <jay@loyalize.com>
+Jay Merrifield <fracmak@gmail.com> <merrifieldj@pixia.com>
+Jean-Francois Remy <jeff@melix.org> <jfremy@virtuoz.com>
+Jyoti Deka <dekajp@gmail.com> <dekajp@yahoo.com>
+John Enters <github@darkdark.net>
+Jonathan Vingiano <jvingiano@gmail.com>
+Josh Varner <josh.varner@gmail.com>
+Justin Domnitz <jdomnitz@gmail.com>
+Justin MacCarthy <Justin@Rubystars.biz>
+Jörn Zaefferer <joern.zaefferer@gmail.com>
+Karl Kirch <karlkrch@gmail.com> <karl.ctr.kirch@faa.gov>
+Keith Wood <kbwood@iinet.com.au> <kbwood.au@gmail.com>
+Kevin Dalman <development@allpro.net>
+Klaus Hartl <klaus.hartl@gmail.com> <klaus.hartl@googlemail.com>
+Klaus Hartl <klaus.hartl@gmail.com> <klaus.hartl@stilbuero.de>
Kris Borchers <kris.borchers@gmail.com>
Kris Borchers <kris.borchers@gmail.com> <k_borchers@yahoo.com>
-Corey Frang <gnarf@gnarf.net>
-Maggie Costello Wachs <fg.maggie@gmail.com> maggiewachs <maggie@filamentgroup.com>
+Krzysztof Rosiński <rozwell69@gmail.com>
+Lev Kitsis <spam4lev@gmail.com>
+Maciej Mroziński <maciej.k.mrozinski@gmail.com> <mrozik87@gmail.com>
+Maggie Wachs <maggie@filamentgroup.com>
+Maggie Wachs <maggie@filamentgroup.com> <fg.maggie@gmail.com>
+Marc Neuwirth <marc.neuwirth@gmail.com>
+Marcos Sousa <falecomigo@marcossousa.com> <marcos.sousa@corp.globo.com>
+Martin Frost <martinf55@hotmail.com>
+Mathias Stenbom <mathias@stenbom.com>
+Matt Hoskins <matt@nipltd.com> <furlined@cat-basket.org>
+Matthew Edward Hutton <meh@corefiling.co.uk>
+Max Schnur <max.schnur@gmail.com>
+Michael Hollis <hollis21@gmail.com>
+Michael Stay <metaweta@gmail.com>
+Michael Wu <michaelmwu@gmail.com>
+Mike Alsup <malsup@gmail.com>
+Milan Broum <midlis@googlemail.com>
+Mohamed Cherif Bouchelaghem <cherifbouchelaghem@yahoo.fr> <cherif@cherif.(none)>
+Monika Piotrowicz <monika.piotrowicz@gmail.com> <monika@shopify.com>
+Nick Pierpoint <nick.pierpoint@tidalsand.com>
+Ondrej Novy <novy@ondrej.org>
+Paul Bakaus <paul.bakaus@gmail.com> <paul.bakaus@googlemail.com>
+Paul Irish <paul.irish@gmail.com>
+Pavol Hluchý <lopo@losys.sk>
+Peter Heiberg <peter@heiberg.se>
+Petr Hromadko <yuriy@tokyoscale.com>
+Phillip Barnes <philbar@gmail.com> <phillipbarnes@Phillip-Barnes-Computer.local>
+Pierre-Henri Ausseil <ph.ausseil@gmail.com>
+Raymond Schwartz <skeetergraphics@gmail.com>
Richard Worth <rdworth@gmail.com>
-Jörn Zaefferer <joern.zaefferer@gmail.com>
+Rick Waldron <waldron.rick@gmail.com>
+Ryan Neufeld <ryan@neufeldmail.com>
+Ryan Olton <oltonr@gmail.com>
+Saji Nediyanchath <saji89@gmail.com> Saji <saji@saji-laptop.(none)>
+Scott Jehl <scottjehl@gmail.com> <scott@scottjehl.com>
+Sebastian Sauer <info@dynpages.de>
+Sergey Kartashov <ebishkek@yandex.ru>
+Shahyar Ghobadpour <shahyar@gmail.com>
+Shane Whittet <whittet@gmail.com>
+Shannon Pekary <spekary@gmail.com>
+Simon Sattes <simon.sattes@gmail.com>
+Stojce Slavkovski <stojce@gmail.com>
+Tarafder Ashek-E-Elahi <mail.ashek@gmail.com>
+Thibault Duplessis <thibault.duplessis@gmail.com>
+Thomas Jaggi <thomas@responsive.ch> <thomas.jaggi@gmail.com>
+Ting Kuei <ting@kuei.com>
+Todd Parker <todd@filamentgroup.com> <fg.todd@gmail.com>
+Wesley Walser <waw325@gmail.com> <wwalser@atlassian.com>
+Xavi Ramirez <xavi.rmz@gmail.com>
+Yuriy Khabarov <13real008@gmail.com> <yuriy@tokyoscale.com>
+Ziling Zhao <zilingzhao@gmail.com> <zizhao@cisco.com>
View
@@ -0,0 +1,5 @@
+language: node_js
+node_js:
+ - "0.8"
+before_script:
+ - npm install -g grunt-cli
View
@@ -1,20 +1,20 @@
Authors ordered by first contribution
A list of current team members is available at http://jqueryui.com/about
-Paul Bakaus <paul.bakaus@googlemail.com>
+Paul Bakaus <paul.bakaus@gmail.com>
Richard Worth <rdworth@gmail.com>
Yehuda Katz <wycats@gmail.com>
Sean Catchpole <sean@sunsean.com>
John Resig <jeresig@gmail.com>
Tane Piper <piper.tane@gmail.com>
Dmitri Gaskin <dmitrig01@gmail.com>
-Klaus Hartl <klaus.hartl@googlemail.com>
+Klaus Hartl <klaus.hartl@gmail.com>
Stefan Petre <stefan.petre@gmail.com>
Gilles van den Hoven <gilles@webunity.nl>
Micheil Bryan Smith <micheil@brandedcode.com>
Jörn Zaefferer <joern.zaefferer@gmail.com>
Marc Grabanski <m@marcgrabanski.com>
-Keith Wood <kbwood.au@gmail.com>
+Keith Wood <kbwood@iinet.com.au>
Brandon Aaron <brandon.aaron@gmail.com>
Scott González <scott.gonzalez@gmail.com>
Eduardo Lundgren <eduardolundgren@gmail.com>
@@ -27,12 +27,12 @@ David Bolter <david.bolter@gmail.com>
Chi Cheng <cloudream@gmail.com>
Ca-Phun Ung <pazu2k@gmail.com>
Ariel Flesler <aflesler@gmail.com>
-Maggie Costello Wachs <fg.maggie@gmail.com>
+Maggie Wachs <maggie@filamentgroup.com>
Scott Jehl <scott@scottjehl.com>
-Todd Parker <fg.todd@gmail.com>
-Andrew Powell <powella@gmail.com>
+Todd Parker <todd@filamentgroup.com>
+Andrew Powell <andrew@shellscape.org>
Brant Burnett <btburnett3@gmail.com>
-Douglas Neiner <doug@pixelgraphics.us>
+Douglas Neiner <doug@dougneiner.com>
Paul Irish <paul.irish@gmail.com>
Ralph Whitbeck <ralph.whitbeck@gmail.com>
Thibault Duplessis <thibault.duplessis@gmail.com>
@@ -79,16 +79,16 @@ Phillip Barnes <philbar@gmail.com>
Kyle Wilkinson <kai@wikyd.org>
Khaled AlHourani <me@khaledalhourani.com>
Marian Rudzynski <mr@impaled.org>
-Jean-Francois Remy <jfremy@virtuoz.com>
-Doug Blood <dougblood@gmail.com>
+Jean-Francois Remy <jeff@melix.org>
+Doug Blood
Filippo Cavallarin <filippo.cavallarin@codseq.it>
-Heiko Henning <h.henning@educa.ch>
+Heiko Henning <heiko@thehennings.ch>
Aliaksandr Rahalevich <saksmlz@gmail.com>
Mario Visic <mario@mariovisic.com>
Xavi Ramirez <xavi.rmz@gmail.com>
Max Schnur <max.schnur@gmail.com>
Saji Nediyanchath <saji89@gmail.com>
-Corey Frang <gnarf@gnarf.net>
+Corey Frang <gnarf37@gmail.com>
Aaron Peterson <aaronp123@yahoo.com>
Ivan Peters <ivan@ivanpeters.com>
Mohamed Cherif Bouchelaghem <cherifbouchelaghem@yahoo.fr>
@@ -106,7 +106,7 @@ Adam Parod <mystic414@gmail.com>
Guillaume Gautreau <guillaume+github@ghusse.com>
Marcel Toele <EleotleCram@gmail.com>
Dan Streetman <ddstreet@ieee.org>
-Matt Hoskins <furlined@cat-basket.org>
+Matt Hoskins <matt@nipltd.com>
Giovanni Giacobbi <giovanni@giacobbi.net>
Kyle Florence <kyle.florence@gmail.com>
Pavol Hluchý <lopo@losys.sk>
@@ -124,7 +124,7 @@ Israel Tsadok <itsadok@gmail.com>
Carson McDonald <carson@ioncannon.net>
Jason Davies <jason@jasondavies.com>
Garrison Locke <gplocke@gmail.com>
-David Murdoch <musicisair@yahoo.com>
+David Murdoch <david@davidmurdoch.com>
Benjamin Scott Boyle <benjamins.boyle@gmail.com>
Jesse Baird <jebaird@gmail.com>
Jonathan Vingiano <jvingiano@gmail.com>
@@ -150,11 +150,10 @@ Marwan Al Jubeh <marwan.aljubeh@gmail.com>
Milan Broum <midlis@googlemail.com>
Sebastian Sauer <info@dynpages.de>
Gaëtan Muller <m.gaetan89@gmail.com>
-Michel Weimerskirch <michel@weimerskirch.net>
William Griffiths <william@ycymro.com>
Stojce Slavkovski <stojce@gmail.com>
David Soms <david.soms@gmail.com>
-David De Sloovere <david.desloovere@hotmail.com>
+David De Sloovere <david.desloovere@outlook.com>
Michael P. Jung <michael.jung@terreon.de>
Shannon Pekary <spekary@gmail.com>
Matthew Edward Hutton <meh@corefiling.co.uk>
@@ -168,12 +167,12 @@ Genie <386@mail.com>
Rick Waldron <waldron.rick@gmail.com>
Ian Simpson <spoonlikesham@gmail.com>
Lev Kitsis <spam4lev@gmail.com>
-Ted VanToll <tj.vantoll@gmail.com>
+TJ VanToll <tj.vantoll@gmail.com>
Justin Domnitz <jdomnitz@gmail.com>
Douglas Cerna <douglascerna@yahoo.com>
Bert ter Heide <bertjh@hotmail.com>
Jasvir Nagra <jasvir@gmail.com>
-Petr Hromadko <yuriy@tokyoscale.com>
+Yuriy Khabarov <13real008@gmail.com>
Harri Kilpiö <harri.kilpio@gmail.com>
Lado Lomidze <lado.lomidze@gmail.com>
Amir E. Aharoni <amir.aharoni@mail.huji.ac.il>
@@ -198,7 +197,7 @@ Lee Rowlands <lee.rowlands@previousnext.com.au>
Timmy Willison <timmywillisn@gmail.com>
Karl Swedberg <kswedberg@gmail.com>
Baoju Yuan <the_guy_1987@hotmail.com>
-Maciej Mroziński <mrozik87@gmail.com>
+Maciej Mroziński <maciej.k.mrozinski@gmail.com>
Luis Dalmolin <luis.nh@gmail.com>
Mark Aaron Shirley <maspwr@gmail.com>
Martin Hoch <martin@fidion.de>
@@ -216,8 +215,8 @@ Marc-Andre Lafortune <github@marc-andre.ca>
Nate Eagle <nate.eagle@teamaol.com>
David Souther <davidsouther@gmail.com>
Mathias Stenbom <mathias@stenbom.com>
-Avinash R <nashpapa@gmail.com>
Sergey Kartashov <ebishkek@yandex.ru>
+Avinash R <nashpapa@gmail.com>
Ethan Romba <ethanromba@gmail.com>
Cory Gackenheimer <cory.gack@gmail.com>
Juan Pablo Kaniefsky <jpkaniefsky@gmail.com>
@@ -226,13 +225,41 @@ Anika Henke <anika@selfthinker.org>
Samuel Bovée <samycookie2000@yahoo.fr>
Fabrício Matté <ult_combo@hotmail.com>
Viktor Kojouharov <vkojouharov@gmail.com>
-Pawel Maruszczyk <lord_t@o2.pl>
+Pawel Maruszczyk (http://hrabstwo.net)
Pavel Selitskas <p.selitskas@gmail.com>
-Bjørn Johansen <bjorn.johansen@metronet.no>
+Bjørn Johansen <post@bjornjohansen.no>
Matthieu Penant <thieum22@hotmail.com>
Dominic Barnes <dominic@dbarnes.info>
David Sullivan <david.sullivan@gmail.com>
-Thomas Jaggi <thomas.jaggi@gmail.com>
+Thomas Jaggi <thomas@responsive.ch>
Vahid Sohrabloo <vahid4134@gmail.com>
Travis Carden <travis.carden@gmail.com>
Bruno M. Custódio <bruno@brunomcustodio.com>
+Nathanael Silverman <nathanael.silverman@gmail.com>
+Christian Wenz <christian@wenz.org>
+Steve Urmston <steve@urm.st>
+Zaven Muradyan <megalivoithos@gmail.com>
+Woody Gilk <shadowhand@deviantart.com>
+Zbigniew Motyka <zbigniew.motyka@gmail.com>
+Suhail Alkowaileet <xsoh.k7@gmail.com>
+Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
+David Hansen <hansede@gmail.com>
+Brian Grinstead <briangrinstead@gmail.com>
+Christian Klammer <christian314159@gmail.com>
+Steven Luscher <jquerycla@steveluscher.com>
+Gan Eng Chin <engchin.gan@gmail.com>
+Gabriel Schulhof <gabriel.schulhof@intel.com>
+Alexander Schmitz <arschmitz@gmail.com>
+Vilhjálmur Skúlason <vis@dmm.is>
+Siebrand Mazeland <s.mazeland@xs4all.nl>
+Mohsen Ekhtiari <mohsenekhtiari@yahoo.com>
+Pere Orga <gotrunks@gmail.com>
+Jasper de Groot <mail@ugomobi.com>
+Stephane Deschamps <stephane.deschamps@gmail.com>
+Jyoti Deka <dekajp@gmail.com>
+Andrei Picus <office.nightcrawler@gmail.com>
+Ondrej Novy <novy@ondrej.org>
+Jacob McCutcheon <jacob.mccutcheon@gmail.com>
+Monika Piotrowicz <monika.piotrowicz@gmail.com>
+Imants Horsts <imants.horsts@inbox.lv>
+Eric Dahl <eric.c.dahl@gmail.com>
Oops, something went wrong.

0 comments on commit c15481e

Please sign in to comment.