Skip to content
Permalink
Browse files

Merge branch 'master' into selectmenu

  • Loading branch information...
fnagel committed Jan 10, 2013
2 parents fb47fd0 + 83cbf97 commit dcb28a7c71dc1f4a0ba89e60ae4b3ca8669b9617
Showing with 3,572 additions and 3,555 deletions.
  1. +1 −0 .gitattributes
  2. +2 −0 AUTHORS.txt
  3. +1 −1 MIT-LICENSE.txt
  4. +1 −6 build/release/release.js
  5. +83 −83 external/jquery.mousewheel.js
  6. +1,682 −1,682 jquery-1.8.3.js
  7. +10 −0 package.json
  8. +1,682 −1,682 tests/jquery-1.8.3.js
  9. +1 −1 tests/unit/core/core.js
  10. +1 −1 themes/base/jquery.ui.accordion.css
  11. +1 −1 themes/base/jquery.ui.all.css
  12. +1 −1 themes/base/jquery.ui.autocomplete.css
  13. +1 −1 themes/base/jquery.ui.base.css
  14. +1 −1 themes/base/jquery.ui.button.css
  15. +1 −1 themes/base/jquery.ui.core.css
  16. +1 −1 themes/base/jquery.ui.datepicker.css
  17. +1 −1 themes/base/jquery.ui.dialog.css
  18. +1 −1 themes/base/jquery.ui.menu.css
  19. +1 −1 themes/base/jquery.ui.progressbar.css
  20. +1 −1 themes/base/jquery.ui.resizable.css
  21. +1 −1 themes/base/jquery.ui.selectable.css
  22. +1 −1 themes/base/jquery.ui.slider.css
  23. +1 −1 themes/base/jquery.ui.spinner.css
  24. +1 −1 themes/base/jquery.ui.tabs.css
  25. +1 −1 themes/base/jquery.ui.theme.css
  26. +1 −1 themes/base/jquery.ui.tooltip.css
  27. +23 −23 ui/i18n/jquery.ui.datepicker-be.js
  28. +23 −23 ui/i18n/jquery.ui.datepicker-fr-CA.js
  29. +1 −1 ui/jquery.ui.accordion.js
  30. +1 −1 ui/jquery.ui.autocomplete.js
  31. +1 −1 ui/jquery.ui.button.js
  32. +1 −1 ui/jquery.ui.core.js
  33. +1 −1 ui/jquery.ui.datepicker.js
  34. +1 −1 ui/jquery.ui.dialog.js
  35. +1 −1 ui/jquery.ui.draggable.js
  36. +1 −1 ui/jquery.ui.droppable.js
  37. +1 −1 ui/jquery.ui.effect-blind.js
  38. +1 −1 ui/jquery.ui.effect-bounce.js
  39. +1 −1 ui/jquery.ui.effect-clip.js
  40. +1 −1 ui/jquery.ui.effect-drop.js
  41. +1 −1 ui/jquery.ui.effect-explode.js
  42. +1 −1 ui/jquery.ui.effect-fade.js
  43. +1 −1 ui/jquery.ui.effect-fold.js
  44. +1 −1 ui/jquery.ui.effect-highlight.js
  45. +1 −1 ui/jquery.ui.effect-pulsate.js
  46. +1 −1 ui/jquery.ui.effect-scale.js
  47. +1 −1 ui/jquery.ui.effect-shake.js
  48. +1 −1 ui/jquery.ui.effect-slide.js
  49. +1 −1 ui/jquery.ui.effect-transfer.js
  50. +13 −4 ui/jquery.ui.effect.js
  51. +1 −1 ui/jquery.ui.menu.js
  52. +1 −1 ui/jquery.ui.mouse.js
  53. +1 −1 ui/jquery.ui.position.js
  54. +1 −1 ui/jquery.ui.progressbar.js
  55. +1 −1 ui/jquery.ui.resizable.js
  56. +1 −1 ui/jquery.ui.selectable.js
  57. +1 −1 ui/jquery.ui.slider.js
  58. +1 −1 ui/jquery.ui.sortable.js
  59. +1 −1 ui/jquery.ui.spinner.js
  60. +1 −1 ui/jquery.ui.tabs.js
  61. +1 −1 ui/jquery.ui.tooltip.js
  62. +1 −1 ui/jquery.ui.widget.js
@@ -0,0 +1 @@
* text=auto
@@ -229,3 +229,5 @@ Viktor Kojouharov <vkojouharov@gmail.com>
Pawel Maruszczyk <lord_t@o2.pl>
Pavel Selitskas <p.selitskas@gmail.com>
Bjørn Johansen <bjorn.johansen@metronet.no>
Matthieu Penant <thieum22@hotmail.com>
Dominic Barnes <dominic@dbarnes.info>
@@ -1,4 +1,4 @@
Copyright 2012 jQuery Foundation and other contributors,
Copyright 2013 jQuery Foundation and other contributors,
http://jqueryui.com/

This software consists of voluntary contributions made by many
@@ -9,9 +9,6 @@

var baseDir, repoDir, prevVersion, newVersion, nextVersion, tagTime, preRelease,
fs = require( "fs" ),
path = require( "path" ),
// support: node <0.8
existsSync = fs.existsSync || path.existsSync,
rnewline = /\r?\n/,
repo = "git@github.com:jquery/jquery-ui.git",
branch = "master";
@@ -50,8 +47,6 @@ walk([
section( "updating trac" ),
updateTrac,
confirm

// TODO: upload release zip to GitHub
]);


@@ -376,7 +371,7 @@ function bootstrap( fn ) {
baseDir = process.cwd() + "/__release";
repoDir = baseDir + "/repo";

if ( existsSync( baseDir ) ) {
if ( fs.existsSync( baseDir ) ) {
console.log( "The directory '" + baseDir + "' already exists." );
console.log( "Aborting." );
process.exit( 1 );
@@ -1,84 +1,84 @@
/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net)
* Licensed under the MIT License (LICENSE.txt).
*
* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
* Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
* Thanks to: Seamus Leahy for adding deltaX and deltaY
*
* Version: 3.0.6
*
* Requires: 1.2.2+
*/

(function($) {

var types = ['DOMMouseScroll', 'mousewheel'];

if ($.event.fixHooks) {
for ( var i=types.length; i; ) {
$.event.fixHooks[ types[--i] ] = $.event.mouseHooks;
}
}

$.event.special.mousewheel = {
setup: function() {
if ( this.addEventListener ) {
for ( var i=types.length; i; ) {
this.addEventListener( types[--i], handler, false );
}
} else {
this.onmousewheel = handler;
}
},

teardown: function() {
if ( this.removeEventListener ) {
for ( var i=types.length; i; ) {
this.removeEventListener( types[--i], handler, false );
}
} else {
this.onmousewheel = null;
}
}
};

$.fn.extend({
mousewheel: function(fn) {
return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
},

unmousewheel: function(fn) {
return this.unbind("mousewheel", fn);
}
});


function handler(event) {
var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
event = $.event.fix(orgEvent);
event.type = "mousewheel";

// Old school scrollwheel delta
if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta/120; }
if ( orgEvent.detail ) { delta = -orgEvent.detail/3; }

// New school multidimensional scroll (touchpads) deltas
deltaY = delta;

// Gecko
if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
deltaY = 0;
deltaX = -1*delta;
}

// Webkit
if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }

// Add event and delta to the front of the arguments
args.unshift(event, delta, deltaX, deltaY);

return ($.event.dispatch || $.event.handle).apply(this, args);
}

/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net)
* Licensed under the MIT License (LICENSE.txt).
*
* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
* Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
* Thanks to: Seamus Leahy for adding deltaX and deltaY
*
* Version: 3.0.6
*
* Requires: 1.2.2+
*/

(function($) {

var types = ['DOMMouseScroll', 'mousewheel'];

if ($.event.fixHooks) {
for ( var i=types.length; i; ) {
$.event.fixHooks[ types[--i] ] = $.event.mouseHooks;
}
}

$.event.special.mousewheel = {
setup: function() {
if ( this.addEventListener ) {
for ( var i=types.length; i; ) {
this.addEventListener( types[--i], handler, false );
}
} else {
this.onmousewheel = handler;
}
},

teardown: function() {
if ( this.removeEventListener ) {
for ( var i=types.length; i; ) {
this.removeEventListener( types[--i], handler, false );
}
} else {
this.onmousewheel = null;
}
}
};

$.fn.extend({
mousewheel: function(fn) {
return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
},

unmousewheel: function(fn) {
return this.unbind("mousewheel", fn);
}
});


function handler(event) {
var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
event = $.event.fix(orgEvent);
event.type = "mousewheel";

// Old school scrollwheel delta
if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta/120; }
if ( orgEvent.detail ) { delta = -orgEvent.detail/3; }

// New school multidimensional scroll (touchpads) deltas
deltaY = delta;

// Gecko
if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
deltaY = 0;
deltaX = -1*delta;
}

// Webkit
if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }

// Add event and delta to the front of the arguments
args.unshift(event, delta, deltaX, deltaY);

return ($.event.dispatch || $.event.handle).apply(this, args);
}

})(jQuery);
Oops, something went wrong.

0 comments on commit dcb28a7

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