Merge branch 'master' of github.com:jquery/jquery-ui into interactions

Conflicts:
	ui/jquery.ui.draggable.js
	ui/jquery.ui.droppable.js
	ui/jquery.ui.sortable.js
This commit is contained in:
Mike Sherov 2013-01-11 20:25:03 -05:00
commit 854f6df2bc
62 changed files with 3584 additions and 3565 deletions

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
* text=auto

View File

@ -229,3 +229,5 @@ Viktor Kojouharov <vkojouharov@gmail.com>
Pawel Maruszczyk <lord_t@o2.pl> Pawel Maruszczyk <lord_t@o2.pl>
Pavel Selitskas <p.selitskas@gmail.com> Pavel Selitskas <p.selitskas@gmail.com>
Bjørn Johansen <bjorn.johansen@metronet.no> Bjørn Johansen <bjorn.johansen@metronet.no>
Matthieu Penant <thieum22@hotmail.com>
Dominic Barnes <dominic@dbarnes.info>

View File

@ -1,4 +1,4 @@
Copyright 2012 jQuery Foundation and other contributors, Copyright 2013 jQuery Foundation and other contributors,
http://jqueryui.com/ http://jqueryui.com/
This software consists of voluntary contributions made by many This software consists of voluntary contributions made by many

View File

@ -9,9 +9,6 @@
var baseDir, repoDir, prevVersion, newVersion, nextVersion, tagTime, preRelease, var baseDir, repoDir, prevVersion, newVersion, nextVersion, tagTime, preRelease,
fs = require( "fs" ), fs = require( "fs" ),
path = require( "path" ),
// support: node <0.8
existsSync = fs.existsSync || path.existsSync,
rnewline = /\r?\n/, rnewline = /\r?\n/,
repo = "git@github.com:jquery/jquery-ui.git", repo = "git@github.com:jquery/jquery-ui.git",
branch = "master"; branch = "master";
@ -50,8 +47,6 @@ walk([
section( "updating trac" ), section( "updating trac" ),
updateTrac, updateTrac,
confirm confirm
// TODO: upload release zip to GitHub
]); ]);
@ -376,7 +371,7 @@ function bootstrap( fn ) {
baseDir = process.cwd() + "/__release"; baseDir = process.cwd() + "/__release";
repoDir = baseDir + "/repo"; repoDir = baseDir + "/repo";
if ( existsSync( baseDir ) ) { if ( fs.existsSync( baseDir ) ) {
console.log( "The directory '" + baseDir + "' already exists." ); console.log( "The directory '" + baseDir + "' already exists." );
console.log( "Aborting." ); console.log( "Aborting." );
process.exit( 1 ); process.exit( 1 );

View File

@ -1,84 +1,84 @@
/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net) /*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net)
* Licensed under the MIT License (LICENSE.txt). * Licensed under the MIT License (LICENSE.txt).
* *
* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers. * 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: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
* Thanks to: Seamus Leahy for adding deltaX and deltaY * Thanks to: Seamus Leahy for adding deltaX and deltaY
* *
* Version: 3.0.6 * Version: 3.0.6
* *
* Requires: 1.2.2+ * Requires: 1.2.2+
*/ */
(function($) { (function($) {
var types = ['DOMMouseScroll', 'mousewheel']; var types = ['DOMMouseScroll', 'mousewheel'];
if ($.event.fixHooks) { if ($.event.fixHooks) {
for ( var i=types.length; i; ) { for ( var i=types.length; i; ) {
$.event.fixHooks[ types[--i] ] = $.event.mouseHooks; $.event.fixHooks[ types[--i] ] = $.event.mouseHooks;
} }
} }
$.event.special.mousewheel = { $.event.special.mousewheel = {
setup: function() { setup: function() {
if ( this.addEventListener ) { if ( this.addEventListener ) {
for ( var i=types.length; i; ) { for ( var i=types.length; i; ) {
this.addEventListener( types[--i], handler, false ); this.addEventListener( types[--i], handler, false );
} }
} else { } else {
this.onmousewheel = handler; this.onmousewheel = handler;
} }
}, },
teardown: function() { teardown: function() {
if ( this.removeEventListener ) { if ( this.removeEventListener ) {
for ( var i=types.length; i; ) { for ( var i=types.length; i; ) {
this.removeEventListener( types[--i], handler, false ); this.removeEventListener( types[--i], handler, false );
} }
} else { } else {
this.onmousewheel = null; this.onmousewheel = null;
} }
} }
}; };
$.fn.extend({ $.fn.extend({
mousewheel: function(fn) { mousewheel: function(fn) {
return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel"); return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
}, },
unmousewheel: function(fn) { unmousewheel: function(fn) {
return this.unbind("mousewheel", fn); return this.unbind("mousewheel", fn);
} }
}); });
function handler(event) { function handler(event) {
var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0; var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
event = $.event.fix(orgEvent); event = $.event.fix(orgEvent);
event.type = "mousewheel"; event.type = "mousewheel";
// Old school scrollwheel delta // Old school scrollwheel delta
if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta/120; } if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta/120; }
if ( orgEvent.detail ) { delta = -orgEvent.detail/3; } if ( orgEvent.detail ) { delta = -orgEvent.detail/3; }
// New school multidimensional scroll (touchpads) deltas // New school multidimensional scroll (touchpads) deltas
deltaY = delta; deltaY = delta;
// Gecko // Gecko
if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) { if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
deltaY = 0; deltaY = 0;
deltaX = -1*delta; deltaX = -1*delta;
} }
// Webkit // Webkit
if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; } if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; } if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }
// Add event and delta to the front of the arguments // Add event and delta to the front of the arguments
args.unshift(event, delta, deltaX, deltaY); args.unshift(event, delta, deltaX, deltaY);
return ($.event.dispatch || $.event.handle).apply(this, args); return ($.event.dispatch || $.event.handle).apply(this, args);
} }
})(jQuery); })(jQuery);

3364
jquery-1.8.3.js vendored

File diff suppressed because it is too large Load Diff

View File

@ -28,6 +28,16 @@
"name": "Corey Frang", "name": "Corey Frang",
"email": "gnarf37@gmail.com", "email": "gnarf37@gmail.com",
"url": "http://gnarf.net" "url": "http://gnarf.net"
},
{
"name": "Mike Sherov",
"email": "mike.sherov@gmail.com",
"url": "http://mike.sherov.com"
},
{
"name": "TJ VanToll",
"email": "tj.vantoll@gmail.com",
"url": "http://tjvantoll.com"
} }
], ],
"repository": { "repository": {

3364
tests/jquery-1.8.3.js vendored

File diff suppressed because it is too large Load Diff

View File

@ -19,10 +19,10 @@ asyncTest( "focus", function() {
$( "#inputTabindex0" ) $( "#inputTabindex0" )
.one( "focus", function() { .one( "focus", function() {
ok( true, "event triggered" ); ok( true, "event triggered" );
start();
}) })
.focus( 500, function() { .focus( 500, function() {
ok( true, "callback triggered" ); ok( true, "callback triggered" );
start();
}); });
}); });

View File

@ -2,7 +2,7 @@
* jQuery UI Accordion @VERSION * jQuery UI Accordion @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI CSS Framework @VERSION * jQuery UI CSS Framework @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Autocomplete @VERSION * jQuery UI Autocomplete @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI CSS Framework @VERSION * jQuery UI CSS Framework @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Button @VERSION * jQuery UI Button @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI CSS Framework @VERSION * jQuery UI CSS Framework @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Datepicker @VERSION * jQuery UI Datepicker @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Dialog @VERSION * jQuery UI Dialog @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Menu @VERSION * jQuery UI Menu @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Progressbar @VERSION * jQuery UI Progressbar @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Resizable @VERSION * jQuery UI Resizable @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Selectable @VERSION * jQuery UI Selectable @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Slider @VERSION * jQuery UI Slider @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Spinner @VERSION * jQuery UI Spinner @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Tabs @VERSION * jQuery UI Tabs @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI CSS Framework @VERSION * jQuery UI CSS Framework @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Tooltip @VERSION * jQuery UI Tooltip @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
*/ */

View File

@ -1,23 +1,23 @@
/* Belarusian initialisation for the jQuery UI date picker plugin. */ /* Belarusian initialisation for the jQuery UI date picker plugin. */
/* Written by Pavel Selitskas <p.selitskas@gmail.com> */ /* Written by Pavel Selitskas <p.selitskas@gmail.com> */
jQuery(function($){ jQuery(function($){
$.datepicker.regional['be'] = { $.datepicker.regional['be'] = {
closeText: 'Зачыніць', closeText: 'Зачыніць',
prevText: '&larr;Папяр.', prevText: '&larr;Папяр.',
nextText: 'Наст.&rarr;', nextText: 'Наст.&rarr;',
currentText: 'Сёньня', currentText: 'Сёньня',
monthNames: ['Студзень','Люты','Сакавік','Красавік','Травень','Чэрвень', monthNames: ['Студзень','Люты','Сакавік','Красавік','Травень','Чэрвень',
'Ліпень','Жнівень','Верасень','Кастрычнік','Лістапад','Сьнежань'], 'Ліпень','Жнівень','Верасень','Кастрычнік','Лістапад','Сьнежань'],
monthNamesShort: ['Сту','Лют','Сак','Кра','Тра','Чэр', monthNamesShort: ['Сту','Лют','Сак','Кра','Тра','Чэр',
'Ліп','Жні','Вер','Кас','Ліс','Сьн'], 'Ліп','Жні','Вер','Кас','Ліс','Сьн'],
dayNames: ['нядзеля','панядзелак','аўторак','серада','чацьвер','пятніца','субота'], dayNames: ['нядзеля','панядзелак','аўторак','серада','чацьвер','пятніца','субота'],
dayNamesShort: ['ндз','пнд','аўт','срд','чцв','птн','сбт'], dayNamesShort: ['ндз','пнд','аўт','срд','чцв','птн','сбт'],
dayNamesMin: ['Нд','Пн','Аў','Ср','Чц','Пт','Сб'], dayNamesMin: ['Нд','Пн','Аў','Ср','Чц','Пт','Сб'],
weekHeader: 'Тд', weekHeader: 'Тд',
dateFormat: 'dd.mm.yy', dateFormat: 'dd.mm.yy',
firstDay: 1, firstDay: 1,
isRTL: false, isRTL: false,
showMonthAfterYear: false, showMonthAfterYear: false,
yearSuffix: ''}; yearSuffix: ''};
$.datepicker.setDefaults($.datepicker.regional['be']); $.datepicker.setDefaults($.datepicker.regional['be']);
}); });

View File

@ -1,23 +1,23 @@
/* Canadian-French initialisation for the jQuery UI date picker plugin. */ /* Canadian-French initialisation for the jQuery UI date picker plugin. */
jQuery(function ($) { jQuery(function ($) {
$.datepicker.regional['fr-CA'] = { $.datepicker.regional['fr-CA'] = {
closeText: 'Fermer', closeText: 'Fermer',
prevText: 'Précédent', prevText: 'Précédent',
nextText: 'Suivant', nextText: 'Suivant',
currentText: 'Aujourd\'hui', currentText: 'Aujourd\'hui',
monthNames: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin', monthNames: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin',
'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'], 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
monthNamesShort: ['janv.', 'févr.', 'mars', 'avril', 'mai', 'juin', monthNamesShort: ['janv.', 'févr.', 'mars', 'avril', 'mai', 'juin',
'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'], 'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'],
dayNames: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'], dayNames: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
dayNamesShort: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'], dayNamesShort: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
dayNamesMin: ['D', 'L', 'M', 'M', 'J', 'V', 'S'], dayNamesMin: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
weekHeader: 'Sem.', weekHeader: 'Sem.',
dateFormat: 'yy-mm-dd', dateFormat: 'yy-mm-dd',
firstDay: 0, firstDay: 0,
isRTL: false, isRTL: false,
showMonthAfterYear: false, showMonthAfterYear: false,
yearSuffix: '' yearSuffix: ''
}; };
$.datepicker.setDefaults($.datepicker.regional['fr-CA']); $.datepicker.setDefaults($.datepicker.regional['fr-CA']);
}); });

View File

@ -2,7 +2,7 @@
* jQuery UI Accordion @VERSION * jQuery UI Accordion @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Autocomplete @VERSION * jQuery UI Autocomplete @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Button @VERSION * jQuery UI Button @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Core @VERSION * jQuery UI Core @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Datepicker @VERSION * jQuery UI Datepicker @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Dialog @VERSION * jQuery UI Dialog @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,8 +2,8 @@
* jQuery UI Draggable @VERSION * jQuery UI Draggable @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *
* http://docs.jquery.com/UI/Draggable * http://docs.jquery.com/UI/Draggable
@ -326,16 +326,16 @@ $.widget( "ui.draggable", $.ui.interaction, {
// Handle vertical scrolling // Handle vertical scrolling
if ( yBottom < scrollSensitivity ) { if ( yBottom < scrollSensitivity ) {
change = this._speed( scrollSensitivity - yBottom ); change = this._speed( scrollSensitivity - yBottom );
this.scrollParent.scrollTop( scrollTop + change ); this.scrollParent.scrollTop( scrollTop + change );
this.originalPointer.y = this.originalPointer.y + change; this.originalPointer.y = this.originalPointer.y + change;
} else if ( yTop < scrollSensitivity ) { } else if ( yTop < scrollSensitivity ) {
change = this._speed( scrollSensitivity - yTop ); change = this._speed( scrollSensitivity - yTop );
newScrollTop = scrollTop - change; newScrollTop = scrollTop - change;
// Don't do anything unless new value is "real" // Don't do anything unless new value is "real"
if ( newScrollTop >= 0 ) { if ( newScrollTop >= 0 ) {
this.scrollParent.scrollTop( newScrollTop ); this.scrollParent.scrollTop( newScrollTop );
@ -362,7 +362,7 @@ $.widget( "ui.draggable", $.ui.interaction, {
this.scrollParent.scrollLeft( newScrollLeft ); this.scrollParent.scrollLeft( newScrollLeft );
this.originalPointer.x = this.originalPointer.x - change; this.originalPointer.x = this.originalPointer.x - change;
} }
} }
}, },
@ -397,7 +397,7 @@ $.widget( "ui.draggable", $.ui.interaction, {
// Places draggable where event, or user via event/callback, indicates // Places draggable where event, or user via event/callback, indicates
_setCss: function() { _setCss: function() {
var newLeft = this.position.left, var newLeft = this.position.left,
newTop = this.position.top; newTop = this.position.top;
@ -414,7 +414,7 @@ $.widget( "ui.draggable", $.ui.interaction, {
newLeft += this.scrollParent.scrollLeft(); newLeft += this.scrollParent.scrollLeft();
newTop += this.scrollParent.scrollTop(); newTop += this.scrollParent.scrollTop();
} }
this.dragEl.css({ this.dragEl.css({
left: newLeft, left: newLeft,
top: newTop top: newTop

View File

@ -2,8 +2,8 @@
* jQuery UI Droppable @VERSION * jQuery UI Droppable @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *
* http://docs.jquery.com/UI/Droppable * http://docs.jquery.com/UI/Droppable

View File

@ -2,7 +2,7 @@
* jQuery UI Effects Blind @VERSION * jQuery UI Effects Blind @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Effects Bounce @VERSION * jQuery UI Effects Bounce @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Effects Clip @VERSION * jQuery UI Effects Clip @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Effects Drop @VERSION * jQuery UI Effects Drop @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Effects Explode @VERSION * jQuery UI Effects Explode @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Effects Fade @VERSION * jQuery UI Effects Fade @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Effects Fold @VERSION * jQuery UI Effects Fold @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Effects Highlight @VERSION * jQuery UI Effects Highlight @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Effects Pulsate @VERSION * jQuery UI Effects Pulsate @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Effects Scale @VERSION * jQuery UI Effects Scale @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Effects Shake @VERSION * jQuery UI Effects Shake @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Effects Slide @VERSION * jQuery UI Effects Slide @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Effects Transfer @VERSION * jQuery UI Effects Transfer @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Effects @VERSION * jQuery UI Effects @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *
@ -17,14 +17,14 @@ $.effects = {
}; };
/*! /*!
* jQuery Color Animations v2.1.1 * jQuery Color Animations v2.1.2pre@b11ed286205199b8db74220cd237c4f045050e63
* https://github.com/jquery/jquery-color * https://github.com/jquery/jquery-color
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2012 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *
* Date: Sun Oct 28 15:08:06 2012 -0400 * Date: Thu Jan 3 14:21:32 2013 -0500
*/ */
(function( jQuery, undefined ) { (function( jQuery, undefined ) {
@ -596,7 +596,7 @@ color.hook = function( hook ) {
var parsed, curElem, var parsed, curElem,
backgroundColor = ""; backgroundColor = "";
if ( jQuery.type( value ) !== "string" || ( parsed = stringParse( value ) ) ) { if ( value !== "transparent" && ( jQuery.type( value ) !== "string" || ( parsed = stringParse( value ) ) ) ) {
value = color( parsed || value ); value = color( parsed || value );
if ( !support.rgba && value._rgba[ 3 ] !== 1 ) { if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
curElem = hook === "backgroundColor" ? elem.parentNode : elem; curElem = hook === "backgroundColor" ? elem.parentNode : elem;
@ -754,6 +754,15 @@ function styleDifference( oldStyle, newStyle ) {
return diff; return diff;
} }
// support: jQuery <1.8
if ( !$.fn.addBack ) {
$.fn.addBack = function( selector ) {
return this.add( selector == null ?
this.prevObject : this.prevObject.filter( selector )
);
};
}
$.effects.animateClass = function( value, duration, easing, callback ) { $.effects.animateClass = function( value, duration, easing, callback ) {
var o = $.speed( duration, easing, callback ); var o = $.speed( duration, easing, callback );

View File

@ -2,7 +2,7 @@
* jQuery UI Menu @VERSION * jQuery UI Menu @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Mouse @VERSION * jQuery UI Mouse @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Position @VERSION * jQuery UI Position @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Progressbar @VERSION * jQuery UI Progressbar @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Resizable @VERSION * jQuery UI Resizable @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Selectable @VERSION * jQuery UI Selectable @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Slider @VERSION * jQuery UI Slider @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,8 +2,8 @@
* jQuery UI Sortable @VERSION * jQuery UI Sortable @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *
* http://docs.jquery.com/UI/Sortable * http://docs.jquery.com/UI/Sortable

View File

@ -2,7 +2,7 @@
* jQuery UI Spinner @VERSION * jQuery UI Spinner @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Tabs @VERSION * jQuery UI Tabs @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *

View File

@ -2,7 +2,7 @@
* jQuery UI Tooltip @VERSION * jQuery UI Tooltip @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *
@ -46,7 +46,9 @@ $.widget( "ui.tooltip", {
version: "@VERSION", version: "@VERSION",
options: { options: {
content: function() { content: function() {
var title = $( this ).attr( "title" ); // support: IE<9, Opera in jQuery <1.7
// .text() can't accept undefined, so coerce to a string
var title = $( this ).attr( "title" ) || "";
// Escape title, since we're going from an attribute to raw HTML // Escape title, since we're going from an attribute to raw HTML
return $( "<a>" ).text( title ).html(); return $( "<a>" ).text( title ).html();
}, },

View File

@ -2,7 +2,7 @@
* jQuery UI Widget @VERSION * jQuery UI Widget @VERSION
* http://jqueryui.com * http://jqueryui.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *