').addClass(name).css({position:'absolute', top:'-5000px', left:'-5000px', display:'block'}).appendTo('body');
-
+
//if (!$.browser.safari)
- //tmp.appendTo('body');
-
+ //tmp.appendTo('body');
+
//Opera and Safari set width and height to 0px instead of auto
//Safari returns rgba(0,0,0,0) when bgcolor is not set
$.ui.cssCache[name] = !!(
- (!(/auto|default/).test(tmp.css('cursor')) || (/^[1-9]/).test(tmp.css('height')) || (/^[1-9]/).test(tmp.css('width')) ||
+ (!(/auto|default/).test(tmp.css('cursor')) || (/^[1-9]/).test(tmp.css('height')) || (/^[1-9]/).test(tmp.css('width')) ||
!(/none/).test(tmp.css('backgroundImage')) || !(/transparent|rgba\(0, 0, 0, 0\)/).test(tmp.css('backgroundColor')))
);
try { $('body').get(0).removeChild(tmp.get(0)); } catch(e){}
@@ -283,15 +283,15 @@ $.ui = {
.unbind('selectstart.ui');
},
hasScroll: function(e, a) {
-
+
//If overflow is hidden, the element might have extra content, but the user wants to hide it
if ($(e).css('overflow') == 'hidden') { return false; }
-
+
var scroll = (a && a == 'left') ? 'scrollLeft' : 'scrollTop',
has = false;
-
+
if (e[scroll] > 0) { return true; }
-
+
// TODO: determine which cases actually cause this to happen
// if the element doesn't have the scroll set, see if it's possible to
// set the scroll
@@ -308,50 +308,50 @@ $.ui = {
$.ui.mouse = {
_mouseInit: function() {
var self = this;
-
+
this.element.bind('mousedown.'+this.widgetName, function(e) {
return self._mouseDown(e);
});
-
+
// Prevent text selection in IE
if ($.browser.msie) {
this._mouseUnselectable = this.element.attr('unselectable');
this.element.attr('unselectable', 'on');
}
-
+
this.started = false;
},
-
+
// TODO: make sure destroying one instance of mouse doesn't mess with
// other instances of mouse
_mouseDestroy: function() {
this.element.unbind('.'+this.widgetName);
-
+
// Restore text selection in IE
($.browser.msie
&& this.element.attr('unselectable', this._mouseUnselectable));
},
-
+
_mouseDown: function(e) {
// we may have missed mouseup (out of window)
(this._mouseStarted && this._mouseUp(e));
-
+
this._mouseDownEvent = e;
-
+
var self = this,
btnIsLeft = (e.which == 1),
elIsCancel = (typeof this.options.cancel == "string" ? $(e.target).parents().add(e.target).filter(this.options.cancel).length : false);
if (!btnIsLeft || elIsCancel || !this._mouseCapture(e)) {
return true;
}
-
+
this.mouseDelayMet = !this.options.delay;
if (!this.mouseDelayMet) {
this._mouseDelayTimer = setTimeout(function() {
self.mouseDelayMet = true;
}, this.options.delay);
}
-
+
if (this._mouseDistanceMet(e) && this._mouseDelayMet(e)) {
this._mouseStarted = (this._mouseStart(e) !== false);
if (!this._mouseStarted) {
@@ -359,7 +359,7 @@ $.ui.mouse = {
return true;
}
}
-
+
// these delegates are required to keep context
this._mouseMoveDelegate = function(e) {
return self._mouseMove(e);
@@ -370,43 +370,43 @@ $.ui.mouse = {
$(document)
.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
-
+
return false;
},
-
+
_mouseMove: function(e) {
// IE mouseup check - mouseup happened when mouse was out of window
if ($.browser.msie && !e.button) {
return this._mouseUp(e);
}
-
+
if (this._mouseStarted) {
this._mouseDrag(e);
return false;
}
-
+
if (this._mouseDistanceMet(e) && this._mouseDelayMet(e)) {
this._mouseStarted =
(this._mouseStart(this._mouseDownEvent, e) !== false);
(this._mouseStarted ? this._mouseDrag(e) : this._mouseUp(e));
}
-
+
return !this._mouseStarted;
},
-
+
_mouseUp: function(e) {
$(document)
.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
-
+
if (this._mouseStarted) {
this._mouseStarted = false;
this._mouseStop(e);
}
-
+
return false;
},
-
+
_mouseDistanceMet: function(e) {
return (Math.max(
Math.abs(this._mouseDownEvent.pageX - e.pageX),
@@ -414,11 +414,11 @@ $.ui.mouse = {
) >= this.options.distance
);
},
-
+
_mouseDelayMet: function(e) {
return this.mouseDelayMet;
},
-
+
// These are placeholder methods, to be overriden by extending plugin
_mouseStart: function(e) {},
_mouseDrag: function(e) {},
diff --git a/ui/ui.datepicker.js b/ui/ui.datepicker.js
index 43dfac2c1..9a3ecd199 100644
--- a/ui/ui.datepicker.js
+++ b/ui/ui.datepicker.js
@@ -4,7 +4,7 @@
* Copyright (c) 2006, 2007, 2008 Marc Grabanski
* Dual licensed under the MIT (MIT-LICENSE.txt)
* and GPL (GPL-LICENSE.txt) licenses.
- *
+ *
* http://docs.jquery.com/UI/Datepicker
*
* Depends:
@@ -12,7 +12,7 @@
*
* Marc Grabanski (m@marcgrabanski.com) and Keith Wood (kbwood@virginbroadband.com.au).
*/
-
+
(function($) { // hide the namespace
var PROP_NAME = 'datepicker';
@@ -101,7 +101,7 @@ function Datepicker() {
calculateWeek: this.iso8601Week, // How to calculate the week of the year,
// takes a Date and returns the number of the week for it
shortYearCutoff: '+10', // Short year values < this are in the current century,
- // > this are in the previous century,
+ // > this are in the previous century,
// string value starting with '+' for current year + value
showStatus: false, // True to show status bar at bottom, false to not show it
statusForDate: this.dateStatus, // Function to provide status text for a date -
@@ -110,7 +110,7 @@ function Datepicker() {
maxDate: null, // The latest selectable date, or null for no limit
duration: 'normal', // Duration of display/closure
beforeShowDay: null, // Function that takes a date and returns an array with
- // [0] = true if selectable, false if not, [1] = custom CSS class name(s) or '',
+ // [0] = true if selectable, false if not, [1] = custom CSS class name(s) or '',
// [2] = cell title (optional), e.g. $.datepicker.noWeekends
beforeShow: null, // Function that takes an input field and
// returns a set of custom settings for the date picker
@@ -139,8 +139,8 @@ $.extend(Datepicker.prototype, {
if (this.debug)
console.log.apply('', arguments);
},
-
- /* Override the default settings for all instances of the date picker.
+
+ /* Override the default settings for all instances of the date picker.
@param settings object - the new settings to use as defaults (anonymous object)
@return the manager object */
setDefaults: function(settings) {
@@ -170,7 +170,7 @@ $.extend(Datepicker.prototype, {
if (!target.id)
target.id = 'dp' + (++this.uuid);
var inst = this._newInst($(target), inline);
- inst.settings = $.extend({}, settings || {}, inlineSettings || {});
+ inst.settings = $.extend({}, settings || {}, inlineSettings || {});
if (nodeName == 'input') {
this._connectDatepicker(target, inst);
} else if (inline) {
@@ -204,7 +204,7 @@ $.extend(Datepicker.prototype, {
if (showOn == 'button' || showOn == 'both') { // pop-up date picker when button clicked
var buttonText = this._get(inst, 'buttonText');
var buttonImage = this._get(inst, 'buttonImage');
- var trigger = $(this._get(inst, 'buttonImageOnly') ?
+ var trigger = $(this._get(inst, 'buttonImageOnly') ?
$('
').addClass(this._triggerClass).
attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
$('
').addClass(this._triggerClass).
@@ -248,7 +248,7 @@ $.extend(Datepicker.prototype, {
_inlineShow: function(inst) {
var numMonths = this._getNumberOfMonths(inst); // fix width for dynamic number of date pickers
inst.dpDiv.width(numMonths[1] * $('.ui-datepicker', inst.dpDiv[0]).width());
- },
+ },
/* Pop-up the date picker in a "dialog" box.
@param input element - ignored
@@ -458,7 +458,7 @@ $.extend(Datepicker.prototype, {
_getDateDatepicker: function(target) {
var inst = this._getInst(target);
if (inst && !inst.inline)
- this._setDateFromField(inst);
+ this._setDateFromField(inst);
return (inst ? this._getDate(inst) : null);
},
@@ -626,7 +626,7 @@ $.extend(Datepicker.prototype, {
offset.top -= (isFixed ? scrollY : 0);
return offset;
},
-
+
/* Find an object's position on the screen. */
_findPos: function(obj) {
while (obj && (obj.type == 'hidden' || obj.nodeType != 1)) {
@@ -767,7 +767,7 @@ $.extend(Datepicker.prototype, {
if (inst.stayOpen) {
$('.ui-datepicker td', inst.dpDiv).removeClass(this._currentClass);
$(td).addClass(this._currentClass);
- }
+ }
}
inst.selectedDay = inst.currentDay = $('a', td).html();
inst.selectedMonth = inst.currentMonth = month;
@@ -833,7 +833,7 @@ $.extend(Datepicker.prototype, {
this._lastInput = null;
}
},
-
+
/* Update any alternate field to synchronise with the main field. */
_updateAlternate: function(inst) {
var altField = this._get(inst, 'altField');
@@ -856,7 +856,7 @@ $.extend(Datepicker.prototype, {
var day = date.getDay();
return [(day > 0 && day < 6), ''];
},
-
+
/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
@param date Date - the date to get the week for
@return number - the number of the week within the year that contains this date */
@@ -877,7 +877,7 @@ $.extend(Datepicker.prototype, {
}
return Math.floor(((checkDate - firstMon) / 86400000) / 7) + 1; // Weeks to given date
},
-
+
/* Provide status text for a particular date.
@param date the date to get the status for
@param inst the current datepicker instance
@@ -920,7 +920,7 @@ $.extend(Datepicker.prototype, {
var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
if (matches)
iFormat++;
- return matches;
+ return matches;
};
// Extract a number from the string value
var getNumber = function(match) {
@@ -972,17 +972,17 @@ $.extend(Datepicker.prototype, {
case 'd':
day = getNumber('d');
break;
- case 'D':
+ case 'D':
getName('D', dayNamesShort, dayNames);
break;
case 'o':
doy = getNumber('o');
break;
- case 'm':
+ case 'm':
month = getNumber('m');
break;
case 'M':
- month = getName('M', monthNamesShort, monthNames);
+ month = getName('M', monthNamesShort, monthNames);
break;
case 'y':
year = getNumber('y');
@@ -1074,7 +1074,7 @@ $.extend(Datepicker.prototype, {
var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
if (matches)
iFormat++;
- return matches;
+ return matches;
};
// Format a number, with leading zero if necessary
var formatNumber = function(match, value, len) {
@@ -1102,7 +1102,7 @@ $.extend(Datepicker.prototype, {
case 'd':
output += formatNumber('d', date.getDate(), 2);
break;
- case 'D':
+ case 'D':
output += formatName('D', date.getDay(), dayNamesShort, dayNames);
break;
case 'o':
@@ -1111,18 +1111,18 @@ $.extend(Datepicker.prototype, {
doy += this._getDaysInMonth(date.getFullYear(), m);
output += formatNumber('o', doy, 3);
break;
- case 'm':
+ case 'm':
output += formatNumber('m', date.getMonth() + 1, 2);
break;
case 'M':
- output += formatName('M', date.getMonth(), monthNamesShort, monthNames);
+ output += formatName('M', date.getMonth(), monthNamesShort, monthNames);
break;
case 'y':
- output += (lookAhead('y') ? date.getFullYear() :
+ output += (lookAhead('y') ? date.getFullYear() :
(date.getYear() % 100 < 10 ? '0' : '') + date.getYear() % 100);
break;
case '@':
- output += date.getTime();
+ output += date.getTime();
break;
case "'":
if (lookAhead("'"))
@@ -1150,7 +1150,7 @@ $.extend(Datepicker.prototype, {
else
switch (format.charAt(iFormat)) {
case 'd': case 'm': case 'y': case '@':
- chars += '0123456789';
+ chars += '0123456789';
break;
case 'D': case 'M':
return null; // Accept anything
@@ -1175,7 +1175,7 @@ $.extend(Datepicker.prototype, {
/* Parse existing date and initialise date picker. */
_setDateFromField: function(inst) {
var dateFormat = this._get(inst, 'dateFormat');
- var dates = inst.input ? inst.input.val().split(this._get(inst, 'rangeSeparator')) : null;
+ var dates = inst.input ? inst.input.val().split(this._get(inst, 'rangeSeparator')) : null;
inst.endDay = inst.endMonth = inst.endYear = null;
var date = defaultDate = this._getDefaultDate(inst);
if (dates.length > 0) {
@@ -1201,7 +1201,7 @@ $.extend(Datepicker.prototype, {
inst.currentYear = (dates[0] ? date.getFullYear() : 0);
this._adjustInstDate(inst);
},
-
+
/* Retrieve the default date shown on opening. */
_getDefaultDate: function(inst) {
var date = this._determineDate(this._get(inst, 'defaultDate'), new Date());
@@ -1233,7 +1233,7 @@ $.extend(Datepicker.prototype, {
case 'w' : case 'W' :
day += parseInt(matches[1],10) * 7; break;
case 'm' : case 'M' :
- month += parseInt(matches[1],10);
+ month += parseInt(matches[1],10);
day = Math.min(day, getDaysInMonth(year, month));
break;
case 'y': case 'Y' :
@@ -1348,7 +1348,7 @@ $.extend(Datepicker.prototype, {
var prevBigText = (showBigPrevNext ? this._get(inst, 'prevBigText') : '');
prevBigText = (!navigationAsDateFormat ? prevBigText : this.formatDate(
prevBigText, new Date(drawYear, drawMonth - stepBigMonths, 1), this._getFormatConfig(inst)));
- var prev = '
' + (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
+ var prev = '
' + (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
(showBigPrevNext ? '
' + prevBigText + ' ' : '') +
'
' + nextBigText + ' ' : '') :
(hideIfNoPrevNext ? '' : '
' + nextText + ' ' + nextBigText + ' ')) + '
';
var currentText = this._get(inst, 'currentText');
- var gotoDate = (this._get(inst, 'gotoCurrent') && inst.currentDay ? currentDate : today);
+ var gotoDate = (this._get(inst, 'gotoCurrent') && inst.currentDay ? currentDate : today);
currentText = (!navigationAsDateFormat ? currentText :
this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
var html = (prompt ? '
' + prompt + '
' : '') +
@@ -1398,7 +1398,7 @@ $.extend(Datepicker.prototype, {
html += '
' +
this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
selectedDate, row > 0 || col > 0, showStatus, initStatus, monthNames) + // draw month headers
- '
' +
+ '' +
'' +
(showWeeks ? '' +
this._get(inst, 'weekHeader') + '' : '');
@@ -1408,7 +1408,7 @@ $.extend(Datepicker.prototype, {
status.replace(/D/, dayNamesShort[day]));
html += '= 5 ? ' class="ui-datepicker-week-end-cell"' : '') + '>' +
(!changeFirstDay ? '' +
dayNamesMin[day] + (changeFirstDay ? '' : '') + '';
}
@@ -1470,15 +1470,15 @@ $.extend(Datepicker.prototype, {
}
html += '
';
}
- html += (showStatus ? '
' + initStatus + '
' : '') +
(!closeAtTop && !inst.inline ? controls : '') +
- '
' +
- ($.browser.msie && parseInt($.browser.version,10) < 7 && !inst.inline ?
+ '
' +
+ ($.browser.msie && parseInt($.browser.version,10) < 7 && !inst.inline ?
'' : '');
return html;
},
-
+
/* Generate the month and year header. */
_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
selectedDate, secondary, showStatus, initStatus, monthNames) {
@@ -1579,7 +1579,7 @@ $.extend(Datepicker.prototype, {
onChange.apply((inst.input ? inst.input[0] : null),
[inst.selectedYear, inst.selectedMonth + 1, inst]);
},
-
+
/* Determine the number of months to show. */
_getNumberOfMonths: function(inst) {
var numMonths = this._get(inst, 'numberOfMonths');
@@ -1628,7 +1628,7 @@ $.extend(Datepicker.prototype, {
var maxDate = this._getMinMaxDate(inst, 'max');
return ((!minDate || date >= minDate) && (!maxDate || date <= maxDate));
},
-
+
/* Provide the configuration settings for formatting/parsing. */
_getFormatConfig: function(inst) {
var shortYearCutoff = this._get(inst, 'shortYearCutoff');
@@ -1672,14 +1672,14 @@ function isArray(a) {
Object - settings for attaching new datepicker functionality
@return jQuery object */
$.fn.datepicker = function(options){
-
+
/* Initialise the date picker. */
if (!$.datepicker.initialized) {
$(document.body).append($.datepicker.dpDiv).
mousedown($.datepicker._checkExternalClick);
$.datepicker.initialized = true;
}
-
+
var otherArgs = Array.prototype.slice.call(arguments, 1);
if (typeof options == 'string' && (options == 'isDisabled' || options == 'getDate'))
return $.datepicker['_' + options + 'Datepicker'].
diff --git a/ui/ui.dialog.js b/ui/ui.dialog.js
index c6ceb0534..cc4f37762 100644
--- a/ui/ui.dialog.js
+++ b/ui/ui.dialog.js
@@ -4,7 +4,7 @@
* Copyright (c) 2008 Richard D. Worth (rdworth.org)
* Dual licensed under the MIT (MIT-LICENSE.txt)
* and GPL (GPL-LICENSE.txt) licenses.
- *
+ *
* http://docs.jquery.com/UI/Dialog
*
* Depends:
@@ -31,16 +31,16 @@ $.widget("ui.dialog", {
_init: function() {
this.originalTitle = this.element.attr('title');
this.options.title = this.options.title || this.originalTitle;
-
+
var self = this,
options = this.options,
-
+
uiDialogContent = this.element
.removeAttr('title')
.addClass('ui-dialog-content')
.wrap('
')
.wrap('
'),
-
+
uiDialogContainer = (this.uiDialogContainer = uiDialogContent.parent())
.addClass('ui-dialog-container')
.css({
@@ -48,14 +48,14 @@ $.widget("ui.dialog", {
width: '100%',
height: '100%'
}),
-
+
title = options.title || ' ',
uiDialogTitlebar = (this.uiDialogTitlebar =
$('
'))
.append('' + title + ' ')
.append('X
'))
.addClass('ui-dialog-buttonpane')
.css({
@@ -89,7 +89,7 @@ $.widget("ui.dialog", {
bottom: 0
})
.appendTo(uiDialog);
-
+
this.uiDialogTitlebarClose = $('.ui-dialog-titlebar-close', uiDialogTitlebar)
.hover(
function() {
@@ -106,21 +106,21 @@ $.widget("ui.dialog", {
self.close();
return false;
});
-
+
uiDialogTitlebar.find("*").add(uiDialogTitlebar).each(function() {
$.ui.disableSelection(this);
});
-
+
(options.draggable && $.fn.draggable && this._makeDraggable());
(options.resizable && $.fn.resizable && this._makeResizable());
-
+
this._createButtons(options.buttons);
this._isOpen = false;
-
+
(options.bgiframe && $.fn.bgiframe && uiDialog.bgiframe());
(options.autoOpen && this.open());
},
-
+
destroy: function() {
(this.overlay && this.overlay.destroy());
this.uiDialog.hide();
@@ -130,50 +130,50 @@ $.widget("ui.dialog", {
.removeClass('ui-dialog-content')
.hide().appendTo('body');
this.uiDialog.remove();
-
+
(this.originalTitle && this.element.attr('title', this.originalTitle));
},
-
+
close: function() {
if (false === this._trigger('beforeclose', null, { options: this.options })) {
return;
}
-
+
(this.overlay && this.overlay.destroy());
this.uiDialog
.hide(this.options.hide)
.unbind('keypress.ui-dialog');
-
+
this._trigger('close', null, { options: this.options });
$.ui.dialog.overlay.resize();
-
+
this._isOpen = false;
},
-
+
isOpen: function() {
return this._isOpen;
},
-
+
open: function() {
if (this._isOpen) { return; }
-
+
this.overlay = this.options.modal ? new $.ui.dialog.overlay(this) : null;
(this.uiDialog.next().length && this.uiDialog.appendTo('body'));
this._position(this.options.position);
this.uiDialog.show(this.options.show);
(this.options.autoResize && this._size());
this._moveToTop(true);
-
+
// prevent tabbing out of modal dialogs
(this.options.modal && this.uiDialog.bind('keypress.ui-dialog', function(e) {
if (e.keyCode != $.keyCode.TAB) {
return;
}
-
+
var tabbables = $(':tabbable', this),
first = tabbables.filter(':first')[0],
last = tabbables.filter(':last')[0];
-
+
if (e.target == last && !e.shiftKey) {
setTimeout(function() {
first.focus();
@@ -184,20 +184,20 @@ $.widget("ui.dialog", {
}, 1);
}
}));
-
+
this.uiDialog.find(':tabbable:first').focus();
this._trigger('open', null, { options: this.options });
this._isOpen = true;
},
-
+
_createButtons: function(buttons) {
var self = this,
hasButtons = false,
uiDialogButtonPane = this.uiDialogButtonPane;
-
+
// remove any existing buttons
uiDialogButtonPane.empty().hide();
-
+
$.each(buttons, function() { return !(hasButtons = true); });
if (hasButtons) {
uiDialogButtonPane.show();
@@ -209,11 +209,11 @@ $.widget("ui.dialog", {
});
}
},
-
+
_makeDraggable: function() {
var self = this,
options = this.options;
-
+
this.uiDialog.draggable({
cancel: '.ui-dialog-content',
helper: options.dragHelper,
@@ -231,7 +231,7 @@ $.widget("ui.dialog", {
}
});
},
-
+
_makeResizable: function(handles) {
handles = (handles === undefined ? this.options.resizable : handles);
var self = this,
@@ -239,7 +239,7 @@ $.widget("ui.dialog", {
resizeHandles = typeof handles == 'string'
? handles
: 'n,e,s,w,se,sw,ne,nw';
-
+
this.uiDialog.resizable({
cancel: '.ui-dialog-content',
helper: options.resizeHelper,
@@ -262,31 +262,31 @@ $.widget("ui.dialog", {
}
});
},
-
+
// the force parameter allows us to move modal dialogs to their correct
// position on open
_moveToTop: function(force) {
-
+
if ((this.options.modal && !force)
|| (!this.options.stack && !this.options.modal)) {
return this._trigger('focus', null, { options: this.options });
}
-
+
var maxZ = this.options.zIndex, options = this.options;
$('.ui-dialog:visible').each(function() {
maxZ = Math.max(maxZ, parseInt($(this).css('z-index'), 10) || options.zIndex);
});
(this.overlay && this.overlay.$el.css('z-index', ++maxZ));
this.uiDialog.css('z-index', ++maxZ);
-
+
this._trigger('focus', null, { options: this.options });
},
-
+
_position: function(pos) {
var wnd = $(window), doc = $(document),
pTop = doc.scrollTop(), pLeft = doc.scrollLeft(),
minTop = pTop;
-
+
if ($.inArray(pos, ['center','top','right','bottom','left']) >= 0) {
pos = [
pos == 'right' || pos == 'left' ? pos : 'center',
@@ -326,13 +326,13 @@ $.widget("ui.dialog", {
pTop += (wnd.height() - this.uiDialog.height()) / 2;
}
}
-
+
// prevent the dialog from being too high (make sure the titlebar
// is accessible)
pTop = Math.max(pTop, minTop);
this.uiDialog.css({top: pTop, left: pLeft});
},
-
+
_setData: function(key, value){
(setDataSwitch[key] && this.uiDialog.data(setDataSwitch[key], value));
switch (key) {
@@ -353,17 +353,17 @@ $.widget("ui.dialog", {
case "resizable":
var uiDialog = this.uiDialog,
isResizable = this.uiDialog.is(':data(resizable)');
-
+
// currently resizable, becoming non-resizable
(isResizable && !value && uiDialog.resizable('destroy'));
-
+
// currently resizable, changing handles
(isResizable && typeof value == 'string' &&
uiDialog.resizable('option', 'handles', value));
-
+
// currently non-resizable, becoming resizable
(isResizable || this._makeResizable(value));
-
+
break;
case "title":
$(".ui-dialog-title", this.uiDialogTitlebar).html(value || ' ');
@@ -372,10 +372,10 @@ $.widget("ui.dialog", {
this.uiDialog.width(value);
break;
}
-
+
$.widget.prototype._setData.apply(this, arguments);
},
-
+
_size: function() {
var container = this.uiDialogContainer,
titlebar = this.uiDialogTitlebar,
@@ -408,9 +408,9 @@ $.extend($.ui.dialog, {
width: 300,
zIndex: 1000
},
-
+
getter: 'isOpen',
-
+
overlay: function(dialog) {
this.$el = $.ui.dialog.overlay.create(dialog);
}
@@ -447,17 +447,17 @@ $.extend($.ui.dialog.overlay, {
return allow;
});
}, 1);
-
+
// allow closing by pressing the escape key
$(document).bind('keydown.dialog-overlay', function(e) {
(dialog.options.closeOnEscape && e.keyCode
&& e.keyCode == $.keyCode.ESCAPE && dialog.close());
});
-
+
// handle window resize
$(window).bind('resize.dialog-overlay', $.ui.dialog.overlay.resize);
}
-
+
var $el = $('
').appendTo(document.body)
.addClass('ui-dialog-overlay').css($.extend({
borderWidth: 0, margin: 0, padding: 0,
@@ -465,23 +465,23 @@ $.extend($.ui.dialog.overlay, {
width: this.width(),
height: this.height()
}, dialog.options.overlay));
-
+
(dialog.options.bgiframe && $.fn.bgiframe && $el.bgiframe());
-
+
this.instances.push($el);
return $el;
},
-
+
destroy: function($el) {
this.instances.splice($.inArray(this.instances, $el), 1);
-
+
if (this.instances.length === 0) {
$('a, :input').add([document, window]).unbind('.dialog-overlay');
}
-
+
$el.remove();
},
-
+
height: function() {
// handle IE 6
if ($.browser.msie && $.browser.version < 7) {
@@ -493,7 +493,7 @@ $.extend($.ui.dialog.overlay, {
document.documentElement.offsetHeight,
document.body.offsetHeight
);
-
+
if (scrollHeight < offsetHeight) {
return $(window).height() + 'px';
} else {
@@ -510,7 +510,7 @@ $.extend($.ui.dialog.overlay, {
return $(document).height() + 'px';
}
},
-
+
width: function() {
// handle IE 6
if ($.browser.msie && $.browser.version < 7) {
@@ -522,7 +522,7 @@ $.extend($.ui.dialog.overlay, {
document.documentElement.offsetWidth,
document.body.offsetWidth
);
-
+
if (scrollWidth < offsetWidth) {
return $(window).width() + 'px';
} else {
@@ -539,7 +539,7 @@ $.extend($.ui.dialog.overlay, {
return $(document).width() + 'px';
}
},
-
+
resize: function() {
/* If the dialog is draggable and the user drags it past the
* right edge of the window, the document becomes wider so we
@@ -553,7 +553,7 @@ $.extend($.ui.dialog.overlay, {
$.each($.ui.dialog.overlay.instances, function() {
$overlays = $overlays.add(this);
});
-
+
$overlays.css({
width: 0,
height: 0
diff --git a/ui/ui.draggable.js b/ui/ui.draggable.js
index 8dd125cb9..fa8fbc611 100644
--- a/ui/ui.draggable.js
+++ b/ui/ui.draggable.js
@@ -4,7 +4,7 @@
* Copyright (c) 2008 Paul Bakaus
* Dual licensed under the MIT (MIT-LICENSE.txt)
* and GPL (GPL-LICENSE.txt) licenses.
- *
+ *
* http://docs.jquery.com/UI/Draggables
*
* Depends:
@@ -13,7 +13,7 @@
(function($) {
$.widget("ui.draggable", $.extend({}, $.ui.mouse, {
-
+
getHandle: function(e) {
var handle = !this.options.handle || !$(this.options.handle, this.element).length ? true : false;
@@ -23,83 +23,83 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
.each(function() {
if(this == e.target) handle = true;
});
-
+
return handle;
},
-
+
createHelper: function() {
var o = this.options;
var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [e])) : (o.helper == 'clone' ? this.element.clone() : this.element);
-
+
if(!helper.parents('body').length)
helper.appendTo((o.appendTo == 'parent' ? this.element[0].parentNode : o.appendTo));
-
+
if(helper[0] != this.element[0] && !(/(fixed|absolute)/).test(helper.css("position")))
helper.css("position", "absolute");
-
+
return helper;
-
+
},
-
-
+
+
_init: function() {
-
+
if (this.options.helper == 'original' && !(/^(?:r|a|f)/).test(this.element.css("position")))
this.element[0].style.position = 'relative';
-
+
(this.options.cssNamespace && this.element.addClass(this.options.cssNamespace+"-draggable"));
(this.options.disabled && this.element.addClass('ui-draggable-disabled'));
-
+
this._mouseInit();
-
+
},
_mouseCapture: function(e) {
var o = this.options;
-
+
if (this.helper || o.disabled || $(e.target).is('.ui-resizable-handle'))
return false;
-
+
//Quit if we're not on a valid handle
this.handle = this.getHandle(e);
if (!this.handle)
return false;
-
+
return true;
},
_mouseStart: function(e) {
-
+
var o = this.options;
-
+
//Create and append the visible helper
this.helper = this.createHelper();
-
+
//If ddmanager is used for droppables, set the global draggable
if($.ui.ddmanager)
$.ui.ddmanager.current = this;
-
+
/*
* - Position generation -
* This block generates everything position related - it's the core of draggables.
*/
-
+
this.margins = { //Cache the margins
left: (parseInt(this.element.css("marginLeft"),10) || 0),
top: (parseInt(this.element.css("marginTop"),10) || 0)
- };
-
+ };
+
this.cssPosition = this.helper.css("position"); //Store the helper's css position
this.offset = this.element.offset(); //The element's absolute position on the page
this.offset = { //Substract the margins from the element's absolute offset
top: this.offset.top - this.margins.top,
left: this.offset.left - this.margins.left
};
-
+
this.offset.click = { //Where the click happened, relative to the element
left: e.pageX - this.offset.left,
top: e.pageY - this.offset.top
@@ -107,15 +107,15 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
//Calling this method cached the next parents that have scrollTop / scrollLeft attached
this.cacheScrollParents();
-
-
+
+
this.offsetParent = this.helper.offsetParent(); var po = this.offsetParent.offset(); //Get the offsetParent and cache its position
if(this.offsetParent[0] == document.body && $.browser.mozilla) po = { top: 0, left: 0 }; //Ugly FF3 fix
this.offset.parent = { //Store its position plus border
top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
};
-
+
//This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
if(this.cssPosition == "relative") {
var p = this.element.position();
@@ -126,13 +126,13 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
} else {
this.offset.relative = { top: 0, left: 0 };
}
-
+
//Generate the original position
this.originalPosition = this._generatePosition(e);
-
+
//Cache the helper size
this.cacheHelperProportions();
-
+
//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
if(o.cursorAt)
this.adjustOffsetFromHelper(o.cursorAt);
@@ -144,26 +144,26 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
OFFSET_PARENT_NOT_SCROLL_PARENT_Y: this.scrollTopParent[0] != this.offsetParent[0] && !(this.scrollTopParent[0] == document && (/(body|html)/i).test(this.offsetParent[0].tagName)),
OFFSET_PARENT_NOT_SCROLL_PARENT_X: this.scrollLeftParent[0] != this.offsetParent[0] && !(this.scrollLeftParent[0] == document && (/(body|html)/i).test(this.offsetParent[0].tagName))
});
-
+
if(o.containment)
this.setContainment();
-
+
//Call plugins and callbacks
this._propagate("start", e);
-
+
//Recache the helper size
this.cacheHelperProportions();
-
+
//Prepare the droppable offsets
if ($.ui.ddmanager && !o.dropBehaviour)
$.ui.ddmanager.prepareOffsets(this, e);
-
+
this.helper.addClass("ui-draggable-dragging");
this._mouseDrag(e); //Execute the drag once - this causes the helper not to be visible before getting its correct position
return true;
},
-
+
cacheScrollParents: function() {
this.scrollTopParent = function(el) {
@@ -176,21 +176,21 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
}(this.helper);
},
-
+
adjustOffsetFromHelper: function(obj) {
if(obj.left != undefined) this.offset.click.left = obj.left + this.margins.left;
if(obj.right != undefined) this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
if(obj.top != undefined) this.offset.click.top = obj.top + this.margins.top;
if(obj.bottom != undefined) this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
},
-
+
cacheHelperProportions: function() {
this.helperProportions = {
width: this.helper.outerWidth(),
height: this.helper.outerHeight()
};
},
-
+
setContainment: function() {
var o = this.options;
@@ -201,12 +201,12 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
$(o.containment == 'document' ? document : window).width() - this.offset.relative.left - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.element.css("marginRight"),10) || 0),
($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.offset.relative.top - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.element.css("marginBottom"),10) || 0)
];
-
+
if(!(/^(document|window|parent)$/).test(o.containment)) {
var ce = $(o.containment)[0];
var co = $(o.containment).offset();
var over = ($(ce).css("overflow") != 'hidden');
-
+
this.containment = [
co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.relative.left - this.offset.parent.left,
co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.relative.top - this.offset.parent.top,
@@ -216,8 +216,8 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
}
},
-
-
+
+
_convertPositionTo: function(d, pos) {
if(!pos) pos = this.position;
@@ -263,9 +263,9 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
- (this.cssPosition == "fixed" ? $(document).scrollLeft() : 0)
)
};
-
+
if(!this.originalPosition) return position; //If we are not dragging yet, we won't check for options
-
+
/*
* - Position constraining -
* Constrain the position to a mix of grid, containment.
@@ -276,39 +276,39 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
if(position.left > this.containment[2]) position.left = this.containment[2];
if(position.top > this.containment[3]) position.top = this.containment[3];
}
-
+
if(o.grid) {
var top = this.originalPosition.top + Math.round((position.top - this.originalPosition.top) / o.grid[1]) * o.grid[1];
position.top = this.containment ? (!(top < this.containment[1] || top > this.containment[3]) ? top : (!(top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-
+
var left = this.originalPosition.left + Math.round((position.left - this.originalPosition.left) / o.grid[0]) * o.grid[0];
position.left = this.containment ? (!(left < this.containment[0] || left > this.containment[2]) ? left : (!(left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
}
-
+
return position;
},
_mouseDrag: function(e) {
-
+
//Compute the helpers position
this.position = this._generatePosition(e);
this.positionAbs = this._convertPositionTo("absolute");
-
- //Call plugins and callbacks and use the resulting position if something is returned
+
+ //Call plugins and callbacks and use the resulting position if something is returned
this.position = this._propagate("drag", e) || this.position;
-
+
if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
if($.ui.ddmanager) $.ui.ddmanager.drag(this, e);
-
+
return false;
},
_mouseStop: function(e) {
-
+
//If we are using droppables, inform the manager about the drop
var dropped = false;
if ($.ui.ddmanager && !this.options.dropBehaviour)
- var dropped = $.ui.ddmanager.drop(this, e);
-
+ var dropped = $.ui.ddmanager.drop(this, e);
+
if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
var self = this;
$(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10) || 500, function() {
@@ -319,7 +319,7 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
this._propagate("stop", e);
this._clear();
}
-
+
return false;
},
_clear: function() {
@@ -329,7 +329,7 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
this.helper = null;
this.cancelHelperRemoval = false;
},
-
+
// From now on bulk stuff - mainly helpers
plugins: {},
uiHash: function(e) {
@@ -337,7 +337,7 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
helper: this.helper,
position: this.position,
absolutePosition: this.positionAbs,
- options: this.options
+ options: this.options
};
},
_propagate: function(n,e) {
@@ -400,7 +400,7 @@ $.ui.plugin.add("draggable", "opacity", {
$.ui.plugin.add("draggable", "iframeFix", {
start: function(e, ui) {
- $(ui.options.iframeFix === true ? "iframe" : ui.options.iframeFix).each(function() {
+ $(ui.options.iframeFix === true ? "iframe" : ui.options.iframeFix).each(function() {
$('
')
.css({
width: this.offsetWidth+"px", height: this.offsetHeight+"px",
@@ -411,7 +411,7 @@ $.ui.plugin.add("draggable", "iframeFix", {
});
},
stop: function(e, ui) {
- $("div.ui-draggable-iframeFix").each(function() { this.parentNode.removeChild(this); }); //Remove frame helpers
+ $("div.ui-draggable-iframeFix").each(function() { this.parentNode.removeChild(this); }); //Remove frame helpers
}
});
@@ -423,7 +423,7 @@ $.ui.plugin.add("draggable", "scroll", {
var i = $(this).data("draggable");
o.scrollSensitivity = o.scrollSensitivity || 20;
o.scrollSpeed = o.scrollSpeed || 20;
-
+
i.overflowY = function(el) {
do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-y'))) return el; el = el.parent(); } while (el[0].parentNode);
return $(document);
@@ -432,29 +432,29 @@ $.ui.plugin.add("draggable", "scroll", {
do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-x'))) return el; el = el.parent(); } while (el[0].parentNode);
return $(document);
}(this);
-
+
if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') i.overflowYOffset = i.overflowY.offset();
if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') i.overflowXOffset = i.overflowX.offset();
-
+
},
drag: function(e, ui) {
-
+
var o = ui.options, scrolled = false;
var i = $(this).data("draggable");
-
+
if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') {
if((i.overflowYOffset.top + i.overflowY[0].offsetHeight) - e.pageY < o.scrollSensitivity)
i.overflowY[0].scrollTop = scrolled = i.overflowY[0].scrollTop + o.scrollSpeed;
if(e.pageY - i.overflowYOffset.top < o.scrollSensitivity)
i.overflowY[0].scrollTop = scrolled = i.overflowY[0].scrollTop - o.scrollSpeed;
-
+
} else {
if(e.pageY - $(document).scrollTop() < o.scrollSensitivity)
scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
if($(window).height() - (e.pageY - $(document).scrollTop()) < o.scrollSensitivity)
scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
}
-
+
if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') {
if((i.overflowXOffset.left + i.overflowX[0].offsetWidth) - e.pageX < o.scrollSensitivity)
i.overflowX[0].scrollLeft = scrolled = i.overflowX[0].scrollLeft + o.scrollSpeed;
@@ -466,17 +466,17 @@ $.ui.plugin.add("draggable", "scroll", {
if($(window).width() - (e.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
}
-
+
if(scrolled !== false)
$.ui.ddmanager.prepareOffsets(i, e);
-
+
}
});
$.ui.plugin.add("draggable", "snap", {
start: function(e, ui) {
-
+
var inst = $(this).data("draggable");
inst.snapElements = [];
@@ -488,28 +488,28 @@ $.ui.plugin.add("draggable", "snap", {
top: $o.top, left: $o.left
});
});
-
+
},
drag: function(e, ui) {
-
+
var inst = $(this).data("draggable");
var d = ui.options.snapTolerance || 20;
var x1 = ui.absolutePosition.left, x2 = x1 + inst.helperProportions.width,
y1 = ui.absolutePosition.top, y2 = y1 + inst.helperProportions.height;
-
+
for (var i = inst.snapElements.length - 1; i >= 0; i--){
-
- var l = inst.snapElements[i].left, r = l + inst.snapElements[i].width,
+
+ var l = inst.snapElements[i].left, r = l + inst.snapElements[i].width,
t = inst.snapElements[i].top, b = t + inst.snapElements[i].height;
-
+
//Yes, I know, this is insane ;)
if(!((l-d < x1 && x1 < r+d && t-d < y1 && y1 < b+d) || (l-d < x1 && x1 < r+d && t-d < y2 && y2 < b+d) || (l-d < x2 && x2 < r+d && t-d < y1 && y1 < b+d) || (l-d < x2 && x2 < r+d && t-d < y2 && y2 < b+d))) {
if(inst.snapElements[i].snapping) (inst.options.snap.release && inst.options.snap.release.call(inst.element, null, $.extend(inst.uiHash(), { snapItem: inst.snapElements[i].item })));
inst.snapElements[i].snapping = false;
continue;
}
-
+
if(ui.options.snapMode != 'inner') {
var ts = Math.abs(t - y2) <= d;
var bs = Math.abs(b - y1) <= d;
@@ -520,9 +520,9 @@ $.ui.plugin.add("draggable", "snap", {
if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left;
if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left;
}
-
+
var first = (ts || bs || ls || rs);
-
+
if(ui.options.snapMode != 'outer') {
var ts = Math.abs(t - y1) <= d;
var bs = Math.abs(b - y2) <= d;
@@ -533,11 +533,11 @@ $.ui.plugin.add("draggable", "snap", {
if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left;
if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left;
}
-
+
if(!inst.snapElements[i].snapping && (ts || bs || ls || rs || first))
(inst.options.snap.snap && inst.options.snap.snap.call(inst.element, null, $.extend(inst.uiHash(), { snapItem: inst.snapElements[i].item })));
inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
-
+
};
}
@@ -545,7 +545,7 @@ $.ui.plugin.add("draggable", "snap", {
$.ui.plugin.add("draggable", "connectToSortable", {
start: function(e,ui) {
-
+
var inst = $(this).data("draggable");
inst.sortables = [];
$(ui.options.connectToSortable).each(function() {
@@ -555,17 +555,17 @@ $.ui.plugin.add("draggable", "connectToSortable", {
instance: sortable,
shouldRevert: sortable.options.revert
});
- sortable._refreshItems(); //Do a one-time refresh at start to refresh the containerCache
+ sortable._refreshItems(); //Do a one-time refresh at start to refresh the containerCache
sortable._propagate("activate", e, inst);
}
});
},
stop: function(e,ui) {
-
+
//If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
var inst = $(this).data("draggable");
-
+
$.each(inst.sortables, function() {
if(this.instance.isOver) {
this.instance.isOver = 0;
@@ -573,7 +573,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
if(this.shouldRevert) this.instance.options.revert = true; //revert here
this.instance._mouseStop(e);
-
+
//Also propagate receive event, since the sortable is actually receiving a element
this.instance.element.triggerHandler("sortreceive", [e, $.extend(this.instance.ui(), { sender: inst.element })], this.instance.options["receive"]);
@@ -583,21 +583,21 @@ $.ui.plugin.add("draggable", "connectToSortable", {
}
});
-
+
},
drag: function(e,ui) {
var inst = $(this).data("draggable"), self = this;
-
+
var checkPos = function(o) {
-
+
var l = o.left, r = l + o.width,
t = o.top, b = t + o.height;
return (l < (this.positionAbs.left + this.offset.click.left) && (this.positionAbs.left + this.offset.click.left) < r
- && t < (this.positionAbs.top + this.offset.click.top) && (this.positionAbs.top + this.offset.click.top) < b);
+ && t < (this.positionAbs.top + this.offset.click.top) && (this.positionAbs.top + this.offset.click.top) < b);
};
-
+
$.each(inst.sortables, function(i) {
if(checkPos.call(inst, this.instance.containerCache)) {
@@ -612,7 +612,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
this.instance.currentItem = $(self).clone().appendTo(this.instance.element).data("sortable-item", true);
this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
this.instance.options.helper = function() { return ui.helper[0]; };
-
+
e.target = this.instance.currentItem[0];
this.instance._mouseCapture(e, true);
this.instance._mouseStart(e, true, true);
@@ -622,16 +622,16 @@ $.ui.plugin.add("draggable", "connectToSortable", {
this.instance.offset.click.left = inst.offset.click.left;
this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
-
+
inst._propagate("toSortable", e);
-
+
}
-
+
//Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
if(this.instance.currentItem) this.instance._mouseDrag(e);
-
+
} else {
-
+
//If it doesn't intersect with the sortable, and it intersected before,
//we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
if(this.instance.isOver) {
@@ -640,14 +640,14 @@ $.ui.plugin.add("draggable", "connectToSortable", {
this.instance.options.revert = false; //No revert here
this.instance._mouseStop(e, true);
this.instance.options.helper = this.instance.options._helper;
-
+
//Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
this.instance.currentItem.remove();
if(this.instance.placeholder) this.instance.placeholder.remove();
-
+
inst._propagate("fromSortable", e);
}
-
+
};
});
@@ -660,11 +660,11 @@ $.ui.plugin.add("draggable", "stack", {
var group = $.makeArray($(ui.options.stack.group)).sort(function(a,b) {
return (parseInt($(a).css("zIndex"),10) || ui.options.stack.min) - (parseInt($(b).css("zIndex"),10) || ui.options.stack.min);
});
-
+
$(group).each(function(i) {
this.style.zIndex = ui.options.stack.min + i;
});
-
+
this[0].style.zIndex = ui.options.stack.min + group.length;
}
});
diff --git a/ui/ui.droppable.js b/ui/ui.droppable.js
index e13efec8d..5d14a64d2 100644
--- a/ui/ui.droppable.js
+++ b/ui/ui.droppable.js
@@ -4,7 +4,7 @@
* Copyright (c) 2008 Paul Bakaus
* Dual licensed under the MIT (MIT-LICENSE.txt)
* and GPL (GPL-LICENSE.txt) licenses.
- *
+ *
* http://docs.jquery.com/UI/Droppables
*
* Depends:
@@ -14,7 +14,7 @@
(function($) {
$.widget("ui.droppable", {
-
+
_setData: function(key, value) {
if(key == 'accept') {
@@ -26,9 +26,9 @@ $.widget("ui.droppable", {
}
},
-
+
_init: function() {
-
+
var o = this.options, accept = o.accept;
this.isover = 0; this.isout = 1;
@@ -38,13 +38,13 @@ $.widget("ui.droppable", {
//Store the droppable's proportions
this.proportions = { width: this.element[0].offsetWidth, height: this.element[0].offsetHeight };
-
+
// Add the reference and positions to the manager
$.ui.ddmanager.droppables[this.options.scope] = $.ui.ddmanager.droppables[this.options.scope] || [];
$.ui.ddmanager.droppables[this.options.scope].push(this);
-
+
(this.options.cssNamespace && this.element.addClass(this.options.cssNamespace+"-droppable"));
-
+
},
plugins: {},
ui: function(c) {
@@ -62,39 +62,39 @@ $.widget("ui.droppable", {
for ( var i = 0; i < drop.length; i++ )
if ( drop[i] == this )
drop.splice(i, 1);
-
+
this.element
.removeClass("ui-droppable-disabled")
.removeData("droppable")
.unbind(".droppable");
},
_over: function(e) {
-
+
var draggable = $.ui.ddmanager.current;
if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
-
+
if (this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
$.ui.plugin.call(this, 'over', [e, this.ui(draggable)]);
this.element.triggerHandler("dropover", [e, this.ui(draggable)], this.options.over);
}
-
+
},
_out: function(e) {
-
+
var draggable = $.ui.ddmanager.current;
if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
-
+
if (this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
$.ui.plugin.call(this, 'out', [e, this.ui(draggable)]);
this.element.triggerHandler("dropout", [e, this.ui(draggable)], this.options.out);
}
-
+
},
_drop: function(e,custom) {
-
+
var draggable = custom || $.ui.ddmanager.current;
if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return false; // Bail if draggable and droppable are same element
-
+
var childrenIntersection = false;
this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function() {
var inst = $.data(this, 'droppable');
@@ -103,29 +103,29 @@ $.widget("ui.droppable", {
}
});
if(childrenIntersection) return false;
-
+
if(this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
$.ui.plugin.call(this, 'drop', [e, this.ui(draggable)]);
this.element.triggerHandler("drop", [e, this.ui(draggable)], this.options.drop);
return this.element;
}
-
+
return false;
-
+
},
_activate: function(e) {
-
+
var draggable = $.ui.ddmanager.current;
$.ui.plugin.call(this, 'activate', [e, this.ui(draggable)]);
if(draggable) this.element.triggerHandler("dropactivate", [e, this.ui(draggable)], this.options.activate);
-
+
},
_deactivate: function(e) {
-
+
var draggable = $.ui.ddmanager.current;
$.ui.plugin.call(this, 'deactivate', [e, this.ui(draggable)]);
if(draggable) this.element.triggerHandler("dropdeactivate", [e, this.ui(draggable)], this.options.deactivate);
-
+
}
});
@@ -139,14 +139,14 @@ $.extend($.ui.droppable, {
});
$.ui.intersect = function(draggable, droppable, toleranceMode) {
-
+
if (!droppable.offset) return false;
-
+
var x1 = (draggable.positionAbs || draggable.position.absolute).left, x2 = x1 + draggable.helperProportions.width,
y1 = (draggable.positionAbs || draggable.position.absolute).top, y2 = y1 + draggable.helperProportions.height;
var l = droppable.offset.left, r = l + droppable.proportions.width,
t = droppable.offset.top, b = t + droppable.proportions.height;
-
+
switch (toleranceMode) {
case 'fit':
return (l < x1 && x2 < r
@@ -177,7 +177,7 @@ $.ui.intersect = function(draggable, droppable, toleranceMode) {
return false;
break;
}
-
+
};
/*
@@ -187,58 +187,58 @@ $.ui.ddmanager = {
current: null,
droppables: { 'default': [] },
prepareOffsets: function(t, e) {
-
+
var m = $.ui.ddmanager.droppables[t.options.scope];
var type = e ? e.type : null; // workaround for #2317
- var list = (t.currentItem || t.element).find(":data(droppable)").andSelf();
+ var list = (t.currentItem || t.element).find(":data(droppable)").andSelf();
droppablesLoop: for (var i = 0; i < m.length; i++) {
-
+
if(m[i].options.disabled || (t && !m[i].options.accept.call(m[i].element,(t.currentItem || t.element)))) continue; //No disabled and non-accepted
for (var j=0; j < list.length; j++) { if(list[j] == m[i].element[0]) { m[i].proportions.height = 0; continue droppablesLoop; } }; //Filter out elements in the current dragged item
m[i].visible = m[i].element.css("display") != "none"; if(!m[i].visible) continue; //If the element is not visible, continue
-
+
m[i].offset = m[i].element.offset();
m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
-
+
if(type == "dragstart" || type == "sortactivate") m[i]._activate.call(m[i], e); //Activate the droppable if used directly from draggables
-
+
}
-
+
},
drop: function(draggable, e) {
-
+
var dropped = false;
$.each($.ui.ddmanager.droppables[draggable.options.scope], function() {
-
+
if(!this.options) return;
if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance))
dropped = this._drop.call(this, e);
-
+
if (!this.options.disabled && this.visible && this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
this.isout = 1; this.isover = 0;
this._deactivate.call(this, e);
}
-
+
});
return dropped;
-
+
},
drag: function(draggable, e) {
-
+
//If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
if(draggable.options.refreshPositions) $.ui.ddmanager.prepareOffsets(draggable, e);
-
+
//Run through all droppables and check their positions based on specific tolerance options
$.each($.ui.ddmanager.droppables[draggable.options.scope], function() {
-
+
if(this.options.disabled || this.greedyChild || !this.visible) return;
var intersects = $.ui.intersect(draggable, this, this.options.tolerance);
-
+
var c = !intersects && this.isover == 1 ? 'isout' : (intersects && this.isover == 0 ? 'isover' : null);
if(!c) return;
-
+
var parentInstance;
if (this.options.greedy) {
var parent = this.element.parents(':data(droppable):eq(0)');
@@ -247,17 +247,17 @@ $.ui.ddmanager = {
parentInstance.greedyChild = (c == 'isover' ? 1 : 0);
}
}
-
+
// we just moved into a greedy child
if (parentInstance && c == 'isover') {
parentInstance['isover'] = 0;
parentInstance['isout'] = 1;
parentInstance._out.call(parentInstance, e);
}
-
+
this[c] = 1; this[c == 'isout' ? 'isover' : 'isout'] = 0;
this[c == "isover" ? "_over" : "_out"].call(this, e);
-
+
// we just moved out of a greedy child
if (parentInstance && c == 'isout') {
parentInstance['isout'] = 0;
@@ -265,7 +265,7 @@ $.ui.ddmanager = {
parentInstance._over.call(parentInstance, e);
}
});
-
+
}
};
diff --git a/ui/ui.magnifier.js b/ui/ui.magnifier.js
index ef32c6859..ada0820f2 100644
--- a/ui/ui.magnifier.js
+++ b/ui/ui.magnifier.js
@@ -18,7 +18,7 @@ $.widget("ui.magnifier", {
_init: function() {
var self = this,
o = this.options;
-
+
this.element
.addClass("ui-magnifier")
.bind('click.magnifier', function(e) {
@@ -28,12 +28,12 @@ $.widget("ui.magnifier", {
currentOffset: self.current[1]
}]));
});
-
+
// the element must have relative or absolute positioning
if (!(/^(r|a)/).test(this.element.css("position"))) {
this.element.css("position", "relative");
}
-
+
this.items = [];
this.element.find(o.items).each(function() {
var $this = $(this);
@@ -44,10 +44,10 @@ $.widget("ui.magnifier", {
[$this.width(),$this.height()],
(o.overlap ? $this.position() : null)
]);
-
+
(o.opacity && $this.css('opacity', o.opacity.min));
});
-
+
// absolutize
(o.overlap && $.each(this.items, function() {
$(this[0]).css({
@@ -56,15 +56,15 @@ $.widget("ui.magnifier", {
left: this[3].left
});
}));
-
+
this.identifier = ++counter;
$(document).bind("mousemove.magnifier"+this.identifier, function(e) {
(self.disabled || self._magnify.apply(self, [e]));
});
-
+
this.pp = this.element.offset();
},
-
+
destroy: function() {
this.reset();
this.element
@@ -72,15 +72,15 @@ $.widget("ui.magnifier", {
.unbind(".magnifier");
$(document).unbind("mousemove.magnifier"+this.identifier);
},
-
+
disable: function() {
this.reset();
$.widget.prototype.disable.apply(this, arguments);
},
-
+
reset: function(e) {
var o = this.options;
-
+
$.each(this.items, function() {
var item = this;
$(item[0]).css({
@@ -89,16 +89,16 @@ $.widget("ui.magnifier", {
top: (item[3] ? item[3].top : 0),
left: (item[3] ? item[3].left : 0)
});
-
+
(o.opacity && $(item[0]).css('opacity', o.opacity.min));
(o.zIndex && $(item[0]).css("z-index", ""));
});
},
-
+
_magnify: function(e) {
var p = [e.pageX,e.pageY], o = this.options, c, distance = 1;
this.current = this.items[0];
-
+
// Compute the parent's distance
// we don't need to fire anything if we are not near the parent
var overlap = ((p[0] > this.pp.left-o.distance) &&
@@ -106,10 +106,10 @@ $.widget("ui.magnifier", {
(p[1] > this.pp.top-o.distance) &&
(p[1] < this.pp.top + this.element[0].offsetHeight + o.distance));
if (!overlap) { return false; }
-
+
for (var i=0; i').css( {
@@ -78,40 +78,40 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
left: el.css('left')
})
);
-
+
var oel = this.element; this.element = this.element.parent();
-
+
// store instance on wrapper
- this.element.data('resizable', this);
-
+ this.element.data('resizable', this);
+
//Move margins to the wrapper
this.element.css({ marginLeft: oel.css("marginLeft"), marginTop: oel.css("marginTop"),
marginRight: oel.css("marginRight"), marginBottom: oel.css("marginBottom")
});
-
+
oel.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
-
+
//Prevent Safari textarea resize
if ($.browser.safari && o.preventDefault) oel.css('resize', 'none');
-
+
o.proportionallyResize = oel.css({ position: 'static', zoom: 1, display: 'block' });
-
+
// avoid IE jump
this.element.css({ margin: oel.css('margin') });
-
+
// fix handlers offset
this._proportionallyResize();
}
-
+
if(!o.handles) o.handles = !$('.ui-resizable-handle', this.element).length ? "e,s,se" : { n: '.ui-resizable-n', e: '.ui-resizable-e', s: '.ui-resizable-s', w: '.ui-resizable-w', se: '.ui-resizable-se', sw: '.ui-resizable-sw', ne: '.ui-resizable-ne', nw: '.ui-resizable-nw' };
if(o.handles.constructor == String) {
-
+
o.zIndex = o.zIndex || 1000;
-
+
if(o.handles == 'all') o.handles = 'n,e,s,w,se,sw,ne,nw';
-
+
var n = o.handles.split(","); o.handles = {};
-
+
// insertions are applied when don't have theme loaded
var insertionsDefault = {
handle: 'position: absolute; display: none; overflow:hidden;',
@@ -124,18 +124,18 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
ne: 'top: 0pt; right: 0px;',
nw: 'top: 0pt; left: 0px;'
};
-
+
for(var i = 0; i < n.length; i++) {
- var handle = $.trim(n[i]), dt = o.defaultTheme, hname = 'ui-resizable-'+handle, loadDefault = !$.ui.css(hname) && !o.knobHandles, userKnobClass = $.ui.css('ui-resizable-knob-handle'),
+ var handle = $.trim(n[i]), dt = o.defaultTheme, hname = 'ui-resizable-'+handle, loadDefault = !$.ui.css(hname) && !o.knobHandles, userKnobClass = $.ui.css('ui-resizable-knob-handle'),
allDefTheme = $.extend(dt[hname], dt['ui-resizable-handle']), allKnobTheme = $.extend(o.knobTheme[hname], !userKnobClass ? o.knobTheme['ui-resizable-handle'] : {});
-
+
// increase zIndex of sw, se, ne, nw axis
var applyZIndex = /sw|se|ne|nw/.test(handle) ? { zIndex: ++o.zIndex } : {};
-
- var defCss = (loadDefault ? insertionsDefault[handle] : ''),
+
+ var defCss = (loadDefault ? insertionsDefault[handle] : ''),
axis = $(['
'].join('')).css( applyZIndex );
o.handles[handle] = '.ui-resizable-'+handle;
-
+
this.element.append(
//Theme detection, if not loaded, load o.defaultTheme
axis.css( loadDefault ? allDefTheme : {} )
@@ -143,60 +143,60 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
.css( o.knobHandles ? allKnobTheme : {} ).addClass(o.knobHandles ? 'ui-resizable-knob-handle' : '').addClass(o.knobHandles)
);
}
-
+
if (o.knobHandles) this.element.addClass('ui-resizable-knob').css( !$.ui.css('ui-resizable-knob') ? { /*border: '1px #fff dashed'*/ } : {} );
}
-
+
this._renderAxis = function(target) {
target = target || this.element;
-
+
for(var i in o.handles) {
- if(o.handles[i].constructor == String)
+ if(o.handles[i].constructor == String)
o.handles[i] = $(o.handles[i], this.element).show();
-
+
if (o.transparent)
o.handles[i].css({opacity:0});
-
+
//Apply pad to wrapper element, needed to fix axis position (textarea, inputs, scrolls)
- if (this.element.is('.ui-wrapper') &&
+ if (this.element.is('.ui-wrapper') &&
o._nodeName.match(/textarea|input|select|button/i)) {
-
+
var axis = $(o.handles[i], this.element), padWrapper = 0;
-
+
//Checking the correct pad and border
padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
-
+
//The padding type i have to apply...
- var padPos = [ 'padding',
+ var padPos = [ 'padding',
/ne|nw|n/.test(i) ? 'Top' :
- /se|sw|s/.test(i) ? 'Bottom' :
- /^e$/.test(i) ? 'Right' : 'Left' ].join("");
-
+ /se|sw|s/.test(i) ? 'Bottom' :
+ /^e$/.test(i) ? 'Right' : 'Left' ].join("");
+
if (!o.transparent)
target.css(padPos, padWrapper);
-
+
this._proportionallyResize();
}
if(!$(o.handles[i]).length) continue;
}
};
-
+
this._renderAxis(this.element);
o._handles = $('.ui-resizable-handle', self.element);
-
+
if (o.disableSelection)
o._handles.each(function(i, e) { $.ui.disableSelection(e); });
-
+
//Matching axis name
o._handles.mouseover(function() {
if (!o.resizing) {
- if (this.className)
+ if (this.className)
var axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
//Axis, default = se
self.axis = o.axis = axis && axis[1] ? axis[1] : 'se';
}
});
-
+
//If we want to auto hide the elements
if (o.autoHide) {
o._handles.hide();
@@ -211,7 +211,7 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
}
});
}
-
+
this._mouseInit();
},
plugins: {},
@@ -233,16 +233,16 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
},
destroy: function() {
var el = this.element, wrapped = el.children(".ui-resizable").get(0);
-
+
this._mouseDestroy();
-
+
var _destroy = function(exp) {
$(exp).removeClass("ui-resizable ui-resizable-disabled")
.removeData("resizable").unbind(".resizable").find('.ui-resizable-handle').remove();
};
-
+
_destroy(el);
-
+
if (el.is('.ui-wrapper') && wrapped) {
el.parent().append(
$(wrapped).css({
@@ -253,55 +253,55 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
left: el.css('left')
})
).end().remove();
-
+
_destroy(wrapped);
}
},
-
+
_mouseCapture: function(e) {
-
+
if(this.options.disabled) return false;
-
+
var handle = false;
for(var i in this.options.handles) {
if($(this.options.handles[i])[0] == e.target) handle = true;
}
if (!handle) return false;
-
+
return true;
-
+
},
-
+
_mouseStart: function(e) {
-
- var o = this.options, iniPos = this.element.position(), el = this.element,
+
+ var o = this.options, iniPos = this.element.position(), el = this.element,
num = function(v) { return parseInt(v, 10) || 0; }, ie6 = $.browser.msie && $.browser.version < 7;
o.resizing = true;
o.documentScroll = { top: $(document).scrollTop(), left: $(document).scrollLeft() };
-
+
// bugfix #1749
if (el.is('.ui-draggable') || (/absolute/).test(el.css('position'))) {
-
+
// sOffset decides if document scrollOffset will be added to the top/left of the resizable element
var sOffset = $.browser.msie && !o.containment && (/absolute/).test(el.css('position')) && !(/relative/).test(el.parent().css('position'));
var dscrollt = sOffset ? o.documentScroll.top : 0, dscrolll = sOffset ? o.documentScroll.left : 0;
-
+
el.css({ position: 'absolute', top: (iniPos.top + dscrollt), left: (iniPos.left + dscrolll) });
}
-
+
//Opera fixing relative position
if ($.browser.opera && /relative/.test(el.css('position')))
el.css({ position: 'relative', top: 'auto', left: 'auto' });
-
+
this._renderProxy();
-
+
var curleft = num(this.helper.css('left')), curtop = num(this.helper.css('top'));
-
+
if (o.containment) {
curleft += $(o.containment).scrollLeft()||0;
curtop += $(o.containment).scrollTop()||0;
}
-
+
//Store needed variables
this.offset = this.helper.offset();
this.position = { left: curleft, top: curtop };
@@ -310,79 +310,79 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
this.originalPosition = { left: curleft, top: curtop };
this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
this.originalMousePosition = { left: e.pageX, top: e.pageY };
-
+
//Aspect Ratio
o.aspectRatio = (typeof o.aspectRatio == 'number') ? o.aspectRatio : ((this.originalSize.width / this.originalSize.height)||1);
-
+
if (o.preserveCursor)
$('body').css('cursor', this.axis + '-resize');
-
+
this._propagate("start", e);
return true;
},
_mouseDrag: function(e) {
-
+
//Increase performance, avoid regex
var el = this.helper, o = this.options, props = {},
self = this, smp = this.originalMousePosition, a = this.axis;
-
+
var dx = (e.pageX-smp.left)||0, dy = (e.pageY-smp.top)||0;
var trigger = this._change[a];
if (!trigger) return false;
-
+
// Calculate the attrs that will be change
var data = trigger.apply(this, [e, dx, dy]), ie6 = $.browser.msie && $.browser.version < 7, csdif = this.sizeDiff;
-
+
if (o._aspectRatio || e.shiftKey)
data = this._updateRatio(data, e);
-
+
data = this._respectSize(data, e);
-
+
// plugins callbacks need to be called first
this._propagate("resize", e);
-
+
el.css({
- top: this.position.top + "px", left: this.position.left + "px",
+ top: this.position.top + "px", left: this.position.left + "px",
width: this.size.width + "px", height: this.size.height + "px"
});
-
+
if (!o.helper && o.proportionallyResize)
this._proportionallyResize();
-
+
this._updateCache(data);
-
+
// calling the user callback at the end
this.element.triggerHandler("resize", [e, this.ui()], this.options["resize"]);
-
+
return false;
},
_mouseStop: function(e) {
-
+
this.options.resizing = false;
var o = this.options, num = function(v) { return parseInt(v, 10) || 0; }, self = this;
-
+
if(o.helper) {
- var pr = o.proportionallyResize, ista = pr && (/textarea/i).test(pr.get(0).nodeName),
+ var pr = o.proportionallyResize, ista = pr && (/textarea/i).test(pr.get(0).nodeName),
soffseth = ista && $.ui.hasScroll(pr.get(0), 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
soffsetw = ista ? 0 : self.sizeDiff.width;
-
+
var s = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) },
- left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null,
+ left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null,
top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
-
+
if (!o.animate)
this.element.css($.extend(s, { top: top, left: left }));
-
+
if (o.helper && !o.animate) this._proportionallyResize();
}
-
+
if (o.preserveCursor)
$('body').css('cursor', 'auto');
-
+
this._propagate("stop", e);
-
+
if (o.helper) this.helper.remove();
-
+
return false;
},
_updateCache: function(data) {
@@ -394,61 +394,61 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
if (data.width) this.size.width = data.width;
},
_updateRatio: function(data, e) {
-
+
var o = this.options, cpos = this.position, csize = this.size, a = this.axis;
-
+
if (data.height) data.width = (csize.height * o.aspectRatio);
else if (data.width) data.height = (csize.width / o.aspectRatio);
-
+
if (a == 'sw') {
data.left = cpos.left + (csize.width - data.width);
data.top = null;
}
- if (a == 'nw') {
+ if (a == 'nw') {
data.top = cpos.top + (csize.height - data.height);
data.left = cpos.left + (csize.width - data.width);
}
-
+
return data;
},
_respectSize: function(data, e) {
-
- var el = this.helper, o = this.options, pRatio = o._aspectRatio || e.shiftKey, a = this.axis,
+
+ var el = this.helper, o = this.options, pRatio = o._aspectRatio || e.shiftKey, a = this.axis,
ismaxw = data.width && o.maxWidth && o.maxWidth < data.width, ismaxh = data.height && o.maxHeight && o.maxHeight < data.height,
isminw = data.width && o.minWidth && o.minWidth > data.width, isminh = data.height && o.minHeight && o.minHeight > data.height;
-
+
if (isminw) data.width = o.minWidth;
if (isminh) data.height = o.minHeight;
if (ismaxw) data.width = o.maxWidth;
if (ismaxh) data.height = o.maxHeight;
-
+
var dw = this.originalPosition.left + this.originalSize.width, dh = this.position.top + this.size.height;
var cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
-
+
if (isminw && cw) data.left = dw - o.minWidth;
if (ismaxw && cw) data.left = dw - o.maxWidth;
if (isminh && ch) data.top = dh - o.minHeight;
if (ismaxh && ch) data.top = dh - o.maxHeight;
-
+
// fixing jump error on top/left - bug #2330
var isNotwh = !data.width && !data.height;
if (isNotwh && !data.left && data.top) data.top = null;
else if (isNotwh && !data.top && data.left) data.left = null;
-
+
return data;
},
_proportionallyResize: function() {
var o = this.options;
if (!o.proportionallyResize) return;
var prel = o.proportionallyResize, el = this.helper || this.element;
-
+
if (!o.borderDif) {
var b = [prel.css('borderTopWidth'), prel.css('borderRightWidth'), prel.css('borderBottomWidth'), prel.css('borderLeftWidth')],
p = [prel.css('paddingTop'), prel.css('paddingRight'), prel.css('paddingBottom'), prel.css('paddingLeft')];
-
+
o.borderDif = $.map(b, function(v, i) {
var border = parseInt(v,10)||0, padding = parseInt(p[i],10)||0;
- return border + padding;
+ return border + padding;
});
}
prel.css({
@@ -459,14 +459,14 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
_renderProxy: function() {
var el = this.element, o = this.options;
this.elementOffset = el.offset();
-
+
if(o.helper) {
this.helper = this.helper || $('
');
-
+
// fix ie6 offset
var ie6 = $.browser.msie && $.browser.version < 7, ie6offset = (ie6 ? 1 : 0),
pxyoffset = ( ie6 ? 2 : -1 );
-
+
this.helper.addClass(o.helper).css({
width: el.outerWidth() + pxyoffset,
height: el.outerHeight() + pxyoffset,
@@ -475,14 +475,14 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
top: this.elementOffset.top - ie6offset +'px',
zIndex: ++o.zIndex
});
-
+
this.helper.appendTo("body");
-
+
if (o.disableSelection)
$.ui.disableSelection(this.helper.get(0));
-
+
} else {
- this.helper = el;
+ this.helper = el;
}
},
_change: {
@@ -537,97 +537,97 @@ $.extend($.ui.resizable, {
*/
$.ui.plugin.add("resizable", "containment", {
-
+
start: function(e, ui) {
var o = ui.options, self = $(this).data("resizable"), el = self.element;
var oc = o.containment, ce = (oc instanceof $) ? oc.get(0) : (/parent/.test(oc)) ? el.parent().get(0) : oc;
if (!ce) return;
-
+
self.containerElement = $(ce);
-
+
if (/document/.test(oc) || oc == document) {
self.containerOffset = { left: 0, top: 0 };
self.containerPosition = { left: 0, top: 0 };
-
- self.parentData = {
- element: $(document), left: 0, top: 0,
+
+ self.parentData = {
+ element: $(document), left: 0, top: 0,
width: $(document).width(), height: $(document).height() || document.body.parentNode.scrollHeight
};
}
-
-
+
+
// i'm a node, so compute top, left, right, bottom
else{
self.containerOffset = $(ce).offset();
self.containerPosition = $(ce).position();
self.containerSize = { height: $(ce).innerHeight(), width: $(ce).innerWidth() };
-
- var co = self.containerOffset, ch = self.containerSize.height, cw = self.containerSize.width,
+
+ var co = self.containerOffset, ch = self.containerSize.height, cw = self.containerSize.width,
width = ($.ui.hasScroll(ce, "left") ? ce.scrollWidth : cw ), height = ($.ui.hasScroll(ce) ? ce.scrollHeight : ch);
-
- self.parentData = {
+
+ self.parentData = {
element: ce, left: co.left, top: co.top, width: width, height: height
};
}
},
-
+
resize: function(e, ui) {
- var o = ui.options, self = $(this).data("resizable"),
+ var o = ui.options, self = $(this).data("resizable"),
ps = self.containerSize, co = self.containerOffset, cs = self.size, cp = self.position,
pRatio = o._aspectRatio || e.shiftKey, cop = { top:0, left:0 }, ce = self.containerElement;
-
+
if (ce[0] != document && /static/.test(ce.css('position')))
cop = self.containerPosition;
-
+
if (cp.left < (o.helper ? co.left : cop.left)) {
self.size.width = self.size.width + (o.helper ? (self.position.left - co.left) : (self.position.left - cop.left));
if (pRatio) self.size.height = self.size.width / o.aspectRatio;
self.position.left = o.helper ? co.left : cop.left;
}
-
+
if (cp.top < (o.helper ? co.top : 0)) {
self.size.height = self.size.height + (o.helper ? (self.position.top - co.top) : self.position.top);
if (pRatio) self.size.width = self.size.height * o.aspectRatio;
self.position.top = o.helper ? co.top : 0;
}
-
- var woset = (o.helper ? self.offset.left - co.left : (self.position.left - cop.left)) + self.sizeDiff.width,
+
+ var woset = (o.helper ? self.offset.left - co.left : (self.position.left - cop.left)) + self.sizeDiff.width,
hoset = (o.helper ? self.offset.top - co.top : self.position.top) + self.sizeDiff.height;
-
+
if (woset + self.size.width >= self.parentData.width) {
self.size.width = self.parentData.width - woset;
if (pRatio) self.size.height = self.size.width / o.aspectRatio;
}
-
+
if (hoset + self.size.height >= self.parentData.height) {
self.size.height = self.parentData.height - hoset;
if (pRatio) self.size.width = self.size.height * o.aspectRatio;
}
},
-
+
stop: function(e, ui){
var o = ui.options, self = $(this).data("resizable"), cp = self.position,
co = self.containerOffset, cop = self.containerPosition, ce = self.containerElement;
-
+
var helper = $(self.helper), ho = helper.offset(), w = helper.innerWidth(), h = helper.innerHeight();
-
-
+
+
if (o.helper && !o.animate && /relative/.test(ce.css('position')))
$(this).css({ left: (ho.left - co.left), top: (ho.top - co.top), width: w, height: h });
-
+
if (o.helper && !o.animate && /static/.test(ce.css('position')))
$(this).css({ left: cop.left + (ho.left - co.left), top: cop.top + (ho.top - co.top), width: w, height: h });
-
+
}
});
$.ui.plugin.add("resizable", "grid", {
-
+
resize: function(e, ui) {
var o = ui.options, self = $(this).data("resizable"), cs = self.size, os = self.originalSize, op = self.originalPosition, a = self.axis, ratio = o._aspectRatio || e.shiftKey;
o.grid = typeof o.grid == "number" ? [o.grid, o.grid] : o.grid;
var ox = Math.round((cs.width - os.width) / (o.grid[0]||1)) * (o.grid[0]||1), oy = Math.round((cs.height - os.height) / (o.grid[1]||1)) * (o.grid[1]||1);
-
+
if (/^(se|s|e)$/.test(a)) {
self.size.width = os.width + ox;
self.size.height = os.height + oy;
@@ -649,83 +649,83 @@ $.ui.plugin.add("resizable", "grid", {
self.position.left = op.left - ox;
}
}
-
+
});
$.ui.plugin.add("resizable", "animate", {
-
+
stop: function(e, ui) {
var o = ui.options, self = $(this).data("resizable");
-
- var pr = o.proportionallyResize, ista = pr && (/textarea/i).test(pr.get(0).nodeName),
+
+ var pr = o.proportionallyResize, ista = pr && (/textarea/i).test(pr.get(0).nodeName),
soffseth = ista && $.ui.hasScroll(pr.get(0), 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
soffsetw = ista ? 0 : self.sizeDiff.width;
-
+
var style = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) },
- left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null,
- top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
-
+ left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null,
+ top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
+
self.element.animate(
- $.extend(style, top && left ? { top: top, left: left } : {}), {
- duration: o.animateDuration || "slow", easing: o.animateEasing || "swing",
+ $.extend(style, top && left ? { top: top, left: left } : {}), {
+ duration: o.animateDuration || "slow", easing: o.animateEasing || "swing",
step: function() {
-
+
var data = {
width: parseInt(self.element.css('width'), 10),
height: parseInt(self.element.css('height'), 10),
top: parseInt(self.element.css('top'), 10),
left: parseInt(self.element.css('left'), 10)
};
-
+
if (pr) pr.css({ width: data.width, height: data.height });
-
+
// propagating resize, and updating values for each animation step
self._updateCache(data);
self._propagate("animate", e);
-
+
}
}
);
}
-
+
});
$.ui.plugin.add("resizable", "ghost", {
-
+
start: function(e, ui) {
var o = ui.options, self = $(this).data("resizable"), pr = o.proportionallyResize, cs = self.size;
-
+
if (!pr) self.ghost = self.element.clone();
else self.ghost = pr.clone();
-
+
self.ghost.css(
{ opacity: .25, display: 'block', position: 'relative', height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 }
)
.addClass('ui-resizable-ghost').addClass(typeof o.ghost == 'string' ? o.ghost : '');
-
+
self.ghost.appendTo(self.helper);
-
+
},
-
+
resize: function(e, ui){
var o = ui.options, self = $(this).data("resizable"), pr = o.proportionallyResize;
-
+
if (self.ghost) self.ghost.css({ position: 'relative', height: self.size.height, width: self.size.width });
-
+
},
-
+
stop: function(e, ui){
var o = ui.options, self = $(this).data("resizable"), pr = o.proportionallyResize;
if (self.ghost && self.helper) self.helper.get(0).removeChild(self.ghost.get(0));
}
-
+
});
$.ui.plugin.add("resizable", "alsoResize", {
-
+
start: function(e, ui) {
- var o = ui.options, self = $(this).data("resizable"),
-
+ var o = ui.options, self = $(this).data("resizable"),
+
_store = function(exp) {
$(exp).each(function() {
$(this).data("resizable-alsoresize", {
@@ -734,27 +734,27 @@ $.ui.plugin.add("resizable", "alsoResize", {
});
});
};
-
+
if (typeof(o.alsoResize) == 'object') {
if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
else { $.each(o.alsoResize, function(exp, c) { _store(exp); }); }
}else{
_store(o.alsoResize);
- }
+ }
},
-
+
resize: function(e, ui){
var o = ui.options, self = $(this).data("resizable"), os = self.originalSize, op = self.originalPosition;
-
- var delta = {
+
+ var delta = {
height: (self.size.height - os.height) || 0, width: (self.size.width - os.width) || 0,
top: (self.position.top - op.top) || 0, left: (self.position.left - op.left) || 0
},
-
+
_alsoResize = function(exp, c) {
$(exp).each(function() {
var start = $(this).data("resizable-alsoresize"), style = {}, css = c && c.length ? c : ['width', 'height', 'top', 'left'];
-
+
$.each(css || ['width', 'height', 'top', 'left'], function(i, prop) {
var sum = (start[prop]||0) + (delta[prop]||0);
if (sum && sum >= 0)
@@ -763,14 +763,14 @@ $.ui.plugin.add("resizable", "alsoResize", {
$(this).css(style);
});
};
-
+
if (typeof(o.alsoResize) == 'object') {
$.each(o.alsoResize, function(exp, c) { _alsoResize(exp, c); });
}else{
_alsoResize(o.alsoResize);
}
},
-
+
stop: function(e, ui){
$(this).removeData("resizable-alsoresize-start");
}
diff --git a/ui/ui.selectable.js b/ui/ui.selectable.js
index 5c2f4b2a5..7d8d8cc2b 100644
--- a/ui/ui.selectable.js
+++ b/ui/ui.selectable.js
@@ -4,7 +4,7 @@
* Copyright (c) 2008 Richard D. Worth (rdworth.org)
* Dual licensed under the MIT (MIT-LICENSE.txt)
* and GPL (GPL-LICENSE.txt) licenses.
- *
+ *
* http://docs.jquery.com/UI/Selectables
*
* Depends:
@@ -15,9 +15,9 @@
$.widget("ui.selectable", $.extend({}, $.ui.mouse, {
_init: function() {
var self = this;
-
+
this.element.addClass("ui-selectable");
-
+
this.dragged = false;
// cache selectee children based on filter
@@ -44,9 +44,9 @@ $.widget("ui.selectable", $.extend({}, $.ui.mouse, {
this.refresh();
this.selectees = selectees.addClass("ui-selectee");
-
+
this._mouseInit();
-
+
this.helper = $(document.createElement('div'))
.css({border:'1px dotted black'})
.addClass("ui-selectable-helper");
@@ -67,9 +67,9 @@ $.widget("ui.selectable", $.extend({}, $.ui.mouse, {
},
_mouseStart: function(e) {
var self = this;
-
+
this.opos = [e.pageX, e.pageY];
-
+
if (this.options.disabled)
return;
@@ -114,7 +114,7 @@ $.widget("ui.selectable", $.extend({}, $.ui.mouse, {
}], options.unselecting);
}
});
-
+
var isSelectee = false;
$(e.target).parents().andSelf().each(function() {
if($.data(this, "selectable-item")) isSelectee = true;
@@ -124,7 +124,7 @@ $.widget("ui.selectable", $.extend({}, $.ui.mouse, {
_mouseDrag: function(e) {
var self = this;
this.dragged = true;
-
+
if (this.options.disabled)
return;
@@ -207,14 +207,14 @@ $.widget("ui.selectable", $.extend({}, $.ui.mouse, {
}
}
});
-
+
return false;
},
_mouseStop: function(e) {
var self = this;
-
+
this.dragged = false;
-
+
var options = this.options;
$('.ui-unselecting', this.element[0]).each(function() {
@@ -244,9 +244,9 @@ $.widget("ui.selectable", $.extend({}, $.ui.mouse, {
selectable: self.element[0],
options: this.options
}], this.options.stop);
-
+
this.helper.remove();
-
+
return false;
}
}));
diff --git a/ui/ui.slider.js b/ui/ui.slider.js
index 1615f52b9..e31e64545 100644
--- a/ui/ui.slider.js
+++ b/ui/ui.slider.js
@@ -4,7 +4,7 @@
* Copyright (c) 2008 Paul Bakaus
* Dual licensed under the MIT (MIT-LICENSE.txt)
* and GPL (GPL-LICENSE.txt) licenses.
- *
+ *
* http://docs.jquery.com/UI/Slider
*
* Depends:
@@ -36,12 +36,12 @@ $.widget("ui.slider", {
this.element.triggerHandler(n == "slide" ? n : "slide"+n, [e, this.ui()], this.options[n]);
},
destroy: function() {
-
+
this.element
.removeClass("ui-slider ui-slider-disabled")
.removeData("slider")
.unbind(".slider");
-
+
if(this.handle && this.handle.length) {
this.handle
.unwrap("a");
@@ -49,28 +49,28 @@ $.widget("ui.slider", {
$(this).data("mouse")._mouseDestroy();
});
}
-
+
this.generated && this.generated.remove();
-
+
},
_setData: function(key, value) {
$.widget.prototype._setData.apply(this, arguments);
if (/min|max|steps/.test(key)) {
this._initBoundaries();
}
-
+
if(key == "range") {
value ? this.handle.length == 2 && this._createRange() : this._removeRange();
}
-
+
},
_init: function() {
-
+
var self = this;
this.element.addClass("ui-slider");
this._initBoundaries();
-
+
// Initialize mouse and key events for interaction
this.handle = $(this.options.handle, this.element);
if (!this.handle.length) {
@@ -81,21 +81,21 @@ $.widget("ui.slider", {
return handle[0];
});
}
-
-
+
+
var handleclass = function(el) {
this.element = $(el);
this.element.data("mouse", this);
this.options = self.options;
-
+
this.element.bind("mousedown", function() {
if(self.currentHandle) this.blur(self.currentHandle);
self._focus(this, true);
});
-
+
this._mouseInit();
};
-
+
$.extend(handleclass.prototype, $.ui.mouse, {
_mouseStart: function(e) { return self._start.call(self, e, this.element[0]); },
_mouseStop: function(e) { return self._stop.call(self, e, this.element[0]); },
@@ -103,27 +103,27 @@ $.widget("ui.slider", {
_mouseCapture: function() { return true; },
trigger: function(e) { this._mouseDown(e); }
});
-
-
+
+
$(this.handle)
.each(function() {
new handleclass(this);
})
.wrap('')
.parent()
@@ -117,9 +117,9 @@ $.widget('ui.spinner', {
self._propagate('change', e);
})
.end();
-
-
- // DataList: Set contraints for object length and step size.
+
+
+ // DataList: Set contraints for object length and step size.
// Manipulate height of spinner.
this._items = this.element.children().length;
if (this._items > 1) {
@@ -136,7 +136,7 @@ $.widget('ui.spinner', {
this.options.min = 0;
this.options.max = this._items-1;
}
-
+
this.element
.bind('keydown.spinner', function(e) {
if(!self.counter) self.counter = 1;
@@ -149,15 +149,15 @@ $.widget('ui.spinner', {
.bind('blur.spinner', function(e) {
self._cleanUp();
});
-
+
if ($.fn.mousewheel) {
this.element.mousewheel(function(e, delta) {
self._mousewheel(e, delta);
});
}
},
-
-
+
+
_constrain: function() {
if(this.options.min != undefined && this._getValue() < this.options.min) this._setValue(this.options.min);
if(this.options.max != undefined && this._getValue() > this.options.max) this._setValue(this.options.max);
@@ -168,7 +168,7 @@ $.widget('ui.spinner', {
},
_spin: function(d, e) {
if (this.disabled) return;
-
+
if(isNaN(this._getValue())) this._setValue(this.options.start);
this._setValue(this._getValue() + (d == 'up' ? 1:-1) * (this.options.incremental && this.counter > 100 ? (this.counter > 200 ? 100 : 10) : 1) * this.options.stepping);
this._animate(d);
@@ -201,14 +201,14 @@ $.widget('ui.spinner', {
},
_keydown: function(e) {
var KEYS = $.keyCode;
-
+
if(e.keyCode == KEYS.UP) this._up(e);
if(e.keyCode == KEYS.DOWN) this._down(e);
if(e.keyCode == KEYS.HOME) this._setValue(this.options.min || this.options.start); //Home key goes to min, if defined, else to start
if(e.keyCode == KEYS.END && this.options.max != undefined) this._setValue(this.options.max); //End key goes to maximum
return (e.keyCode == KEYS.TAB || e.keyCode == KEYS.BACKSPACE ||
- e.keyCode == KEYS.LEFT || e.keyCode == KEYS.RIGHT || e.keyCode == KEYS.PERIOD ||
- e.keyCode == KEYS.NUMPAD_DECIMAL || e.keyCode == KEYS.NUMPAD_SUBTRACT ||
+ e.keyCode == KEYS.LEFT || e.keyCode == KEYS.RIGHT || e.keyCode == KEYS.PERIOD ||
+ e.keyCode == KEYS.NUMPAD_DECIMAL || e.keyCode == KEYS.NUMPAD_SUBTRACT ||
(e.keyCode >= 96 && e.keyCode <= 105) || // add support for numeric keypad 0-9
(/[0-9\-\.]/).test(String.fromCharCode(e.keyCode))) ? true : false;
},
@@ -223,15 +223,15 @@ $.widget('ui.spinner', {
_setValue: function(newVal) {
if(isNaN(newVal)) newVal = this.options.start;
this.element.val(
- this.options.currency ?
- $.ui.spinner.format.currency(newVal, this.options.currency) :
+ this.options.currency ?
+ $.ui.spinner.format.currency(newVal, this.options.currency) :
$.ui.spinner.format.number(newVal, this._decimals)
);
},
_animate: function(d) {
if (this.element.hasClass('ui-spinner-list') && ((d == 'up' && this._getValue() <= this.options.max) || (d == 'down' && this._getValue() >= this.options.min)) ) {
this.element.animate({marginTop: '-' + this._getValue() * this.element.outerHeight() }, {
- duration: 'fast',
+ duration: 'fast',
queue: false
});
}
@@ -245,8 +245,8 @@ $.widget('ui.spinner', {
this.element.append('<'+ wrapper +' class="ui-spinner-dyn">'+ html + '');
}
},
-
-
+
+
plugins: {},
ui: function(e) {
return {
diff --git a/ui/ui.tabs.js b/ui/ui.tabs.js
index 4c4e37b00..109ead137 100644
--- a/ui/ui.tabs.js
+++ b/ui/ui.tabs.js
@@ -15,7 +15,7 @@
$.widget("ui.tabs", {
_init: function() {
this.options.event += '.tabs'; // namespace event
-
+
// create tabs
this._tabify(true);
},
@@ -125,14 +125,14 @@ $.widget("ui.tabs", {
)).sort();
if ($.inArray(o.selected, o.disabled) != -1)
o.disabled.splice($.inArray(o.selected, o.disabled), 1);
-
+
// highlight selected tab
this.$panels.addClass(o.hideClass);
this.$lis.removeClass(o.selectedClass);
if (o.selected !== null) {
this.$panels.eq(o.selected).show().removeClass(o.hideClass); // use show and remove class to show in any case no matter how it has been hidden before
this.$lis.eq(o.selected).addClass(o.selectedClass);
-
+
// seems to be expected behavior that the show callback is fired
var onShow = function() {
self._trigger('show', null,
@@ -146,7 +146,7 @@ $.widget("ui.tabs", {
else
onShow();
}
-
+
// clean up to avoid memory leaks in certain versions of IE 6
$(window).bind('unload', function() {
self.$tabs.unbind('.tabs');
@@ -161,7 +161,7 @@ $.widget("ui.tabs", {
// set or update cookie after init and add/remove respectively
if (o.cookie)
$.cookie('ui-tabs-' + $.data(self.element[0]), o.selected, o.cookie);
-
+
// disable tabs
for (var i = 0, li; li = this.$lis[i]; i++)
$(li)[$.inArray(i, o.disabled) != -1 && !$(li).hasClass(o.selectedClass) ? 'addClass' : 'removeClass'](o.disabledClass);
@@ -169,7 +169,7 @@ $.widget("ui.tabs", {
// reset cache if switching from cached to not cached
if (o.cache === false)
this.$tabs.removeData('cache.tabs');
-
+
// set up animations
var hideFx, showFx, baseFx = { 'min-width': 0, duration: 1 }, baseDuration = 'normal';
if (o.fx && o.fx.constructor == Array)
@@ -227,12 +227,12 @@ $.widget("ui.tabs", {
$hide = self.$panels.filter(':visible'),
$show = $(this.hash);
- // If tab is already selected and not unselectable or tab disabled or
+ // If tab is already selected and not unselectable or tab disabled or
// or is already loading or click callback returns false stop here.
// Check if click handler returns false last so that it is not executed
// for a disabled or loading tab!
if (($li.hasClass(o.selectedClass) && !o.unselect)
- || $li.hasClass(o.disabledClass)
+ || $li.hasClass(o.disabledClass)
|| $(this).hasClass(o.loadingClass)
|| self._trigger('select', null, self.ui(this, $show[0])) === false
) {
@@ -282,7 +282,7 @@ $.widget("ui.tabs", {
}*/
var a = this;
- self.load(self.$tabs.index(this), $hide.length ?
+ self.load(self.$tabs.index(this), $hide.length ?
function() {
switchTab(a, $li, $hide, $show);
} :
@@ -320,7 +320,7 @@ $.widget("ui.tabs", {
},
add: function(url, label, index) {
- if (index == undefined)
+ if (index == undefined)
index = this.$tabs.length; // append by default
var o = this.options;
@@ -344,10 +344,10 @@ $.widget("ui.tabs", {
$li.insertBefore(this.$lis[index]);
$panel.insertBefore(this.$panels[index]);
}
-
+
o.disabled = $.map(o.disabled,
function(n, i) { return n >= index ? ++n : n });
-
+
this._tabify();
if (this.$tabs.length == 1) {
@@ -382,7 +382,7 @@ $.widget("ui.tabs", {
var o = this.options;
if ($.inArray(index, o.disabled) == -1)
return;
-
+
var $li = this.$lis.eq(index).removeClass(o.disabledClass);
if ($.browser.safari) { // fix disappearing tab (that used opacity indicating disabling) after enabling in Safari 2...
$li.css('display', 'inline-block');
@@ -414,12 +414,12 @@ $.widget("ui.tabs", {
this.$tabs.eq(index).trigger(this.options.event);
},
load: function(index, callback) { // callback is for internal usage only
-
+
var self = this, o = this.options, $a = this.$tabs.eq(index), a = $a[0],
bypassCache = callback == undefined || callback === false, url = $a.data('load.tabs');
callback = callback || function() {};
-
+
// no remote or from cache - just finish with callback
if (!url || !bypassCache && $.data(a, 'cache.tabs')) {
callback();
@@ -427,7 +427,7 @@ $.widget("ui.tabs", {
}
// load remote from here on
-
+
var inner = function(parent) {
var $parent = $(parent), $inner = $parent.find('*:last');
return $inner.length && $inner.is(':not(img)') && $inner || $parent;
@@ -440,7 +440,7 @@ $.widget("ui.tabs", {
});
self.xhr = null;
};
-
+
if (o.spinner) {
var label = inner(a).html();
inner(a).wrapInner('