Skip to content
Permalink
Browse files

Merge branch 'master' into selectmenu

  • Loading branch information...
fnagel committed Aug 11, 2012
2 parents 549b97e + 30b579f commit dd272e75689a7e105f7d852f0fc903e4f4bda245
Showing with 947 additions and 863 deletions.
  1. +6 −0 AUTHORS.txt
  2. +0 −278 GPL-LICENSE.txt
  3. +67 −0 build/core.json
  4. +38 −0 build/effect.json
  5. +36 −0 build/interaction.json
  6. +0 −336 build/release/prepare-release
  7. +399 −0 build/release/release.js
  8. +79 −0 build/tasks/build.js
  9. +37 −32 build/tasks/testswarm.js
  10. +98 −0 build/widget.json
  11. +1 −1 demos/spinner/currency.html
  12. +2 −4 grunt.js
  13. +60 −64 package.json
  14. +1 −1 tests/jquery.simulate.js
  15. +1 −1 tests/unit/dialog/dialog_tickets.js
  16. +0 −18 tests/unit/menu/menu_events.js
  17. +8 −0 tests/unit/slider/slider_core.js
  18. +2 −4 tests/unit/slider/slider_events.js
  19. +7 −12 tests/unit/slider/slider_methods.js
  20. +8 −4 tests/unit/slider/slider_options.js
  21. +3 −15 tests/unit/tabs/tabs_core.js
  22. +2 −2 tests/visual/effects/effects.css
  23. +1 −1 themes/base/jquery.ui.accordion.css
  24. +1 −1 themes/base/jquery.ui.all.css
  25. +1 −1 themes/base/jquery.ui.autocomplete.css
  26. +1 −1 themes/base/jquery.ui.base.css
  27. +1 −1 themes/base/jquery.ui.button.css
  28. +1 −1 themes/base/jquery.ui.core.css
  29. +1 −1 themes/base/jquery.ui.datepicker.css
  30. +1 −1 themes/base/jquery.ui.dialog.css
  31. +1 −1 themes/base/jquery.ui.menu.css
  32. +1 −1 themes/base/jquery.ui.progressbar.css
  33. +1 −1 themes/base/jquery.ui.resizable.css
  34. +1 −1 themes/base/jquery.ui.selectable.css
  35. +1 −1 themes/base/jquery.ui.slider.css
  36. +1 −1 themes/base/jquery.ui.spinner.css
  37. +1 −1 themes/base/jquery.ui.tabs.css
  38. +1 −1 themes/base/jquery.ui.theme.css
  39. +1 −1 themes/base/jquery.ui.tooltip.css
  40. +1 −1 ui/jquery.ui.accordion.js
  41. +3 −3 ui/jquery.ui.autocomplete.js
  42. +1 −1 ui/jquery.ui.button.js
  43. +1 −1 ui/jquery.ui.core.js
  44. +9 −6 ui/jquery.ui.datepicker.js
  45. +1 −1 ui/jquery.ui.dialog.js
  46. +1 −1 ui/jquery.ui.draggable.js
  47. +1 −1 ui/jquery.ui.droppable.js
  48. +3 −3 ui/jquery.ui.effect-blind.js
  49. +1 −1 ui/jquery.ui.effect-bounce.js
  50. +1 −1 ui/jquery.ui.effect-clip.js
  51. +2 −2 ui/jquery.ui.effect-drop.js
  52. +1 −1 ui/jquery.ui.effect-explode.js
  53. +1 −1 ui/jquery.ui.effect-fade.js
  54. +1 −1 ui/jquery.ui.effect-fold.js
  55. +1 −1 ui/jquery.ui.effect-highlight.js
  56. +1 −1 ui/jquery.ui.effect-pulsate.js
  57. +1 −1 ui/jquery.ui.effect-scale.js
  58. +1 −1 ui/jquery.ui.effect-shake.js
  59. +2 −4 ui/jquery.ui.effect-slide.js
  60. +1 −1 ui/jquery.ui.effect-transfer.js
  61. +1 −1 ui/jquery.ui.effect.js
  62. +21 −25 ui/jquery.ui.menu.js
  63. +6 −4 ui/jquery.ui.mouse.js
  64. +1 −1 ui/jquery.ui.position.js
  65. +1 −1 ui/jquery.ui.progressbar.js
  66. +1 −1 ui/jquery.ui.resizable.js
  67. +1 −1 ui/jquery.ui.selectable.js
  68. +1 −1 ui/jquery.ui.slider.js
  69. +3 −1 ui/jquery.ui.sortable.js
  70. +1 −1 ui/jquery.ui.spinner.js
  71. +1 −1 ui/jquery.ui.tabs.js
  72. +1 −1 ui/jquery.ui.tooltip.js
  73. +1 −1 ui/jquery.ui.widget.js
@@ -194,3 +194,9 @@ Pavel Stetina <pavel.stetina@nangu.tv>
Mike Stay <metaweta@gmail.com>
Steven Roussey <sroussey@gmail.com>
Mike Hollis <hollis21@gmail.com>
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>
Luis Dalmolin <luis.nh@gmail.com>

This file was deleted.

@@ -0,0 +1,67 @@
{
"core": {
"description": "The core of jQuery UI, required for all interactions and widgets.",
"homepage": "http://jqueryui.com/",
"demo": "http://jqueryui.com/",
"docs": "http://api.jqueryui.com/category/ui-core/"
},
"datepicker": {
"description": "Displays a calendar from an input or inline for selecting dates.",
"dependencies": [ "core" ],
"keywords": [
"form",
"calendar",
"date",
"i18n"
],
"category": "widget"
},
"effect": {
"title": "jQuery UI Effects Core",
"description": "Extends the internal jQuery effects. Includes morphing and easing. Required by all other effects.",
"keywords": [
"animation",
"show",
"hide",
"color",
"class",
"transition",
"easing"
],
"category": "effect",
"homepage": "http://jqueryui.com/",
"demo": "http://jqueryui.com/effects/",
"docs": "http://api.jqueryui.com/category/effects-core/"
},
"position": {
"description": "Positions elements relative to other elements.",
"keywords": [
"offset",
"relative",
"absolute",
"fixed",
"collision"
]
},
"transfer": {
"name": "ui.effect-transfer",
"title": "jQuery UI Transfer Effect",
"description": "Displays a transfer effect from one element to another.",
"keywords": [
"effect"
],
"homepage": "http://jqueryui.com/transfer-effect/",
"demo": "http://jqueryui.com/transfer-effect/",
"docs": "http://api.jqueryui.com/transfer-effect/",
"dependencies": [ "effect" ],
"category": "effect"
},
"widget": {
"description": "Provides a factory for creating stateful widgets with a common API.",
"keywords": [
"abstraction",
"state",
"factory"
]
}
}
@@ -0,0 +1,38 @@
{
"blind": {
"description": "Blinds the element."
},
"bounce": {
"description": "Bounces an element horizontally or vertically n times."
},
"clip": {
"description": "Clips the element on and off like an old TV."
},
"drop": {
"description": "Moves an element in one direction and hides it at the same time."
},
"explode": {
"description": "Explodes an element in all directions into n pieces. Implodes an element to its original wholeness."
},
"fade": {
"description": "Fades an element."
},
"fold": {
"description": "Folds an element first horizontally and then vertically."
},
"highlight": {
"description": "Highlights the background of an element in a defined color for a custom duration."
},
"pulsate": {
"description": "Pulsates an element n times by changing the opacity to zero and back."
},
"scale": {
"description": "Grows or shrinks an element and its content. Restores an elemnt to its original size."
},
"shake": {
"description": "Shakes an element horizontally or vertically n times."
},
"slide": {
"description": "Slides an element in and out of the viewport."
}
}

0 comments on commit dd272e7

Please sign in to comment.
You can’t perform that action at this time.