library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Various: Fixed #3596: Removed references to jQuery for .noConflict() compatibility.

Browse Source
This commit is contained in:
Scott González 2008-11-18 01:54:45 +00:00
parent e0dec0bd84
commit 291202dabe
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui/effects.core.js
View File

@ -183,8 +183,8 @@ $.fn.extend({
*/ */
// We override the animation for all of these color styles // We override the animation for all of these color styles
jQuery.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor', 'borderRightColor', 'borderTopColor', 'color', 'outlineColor'], function(i,attr){ $.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor', 'borderRightColor', 'borderTopColor', 'color', 'outlineColor'], function(i,attr){
jQuery.fx.step[attr] = function(fx){ $.fx.step[attr] = function(fx){
if ( fx.state == 0 ) { if ( fx.state == 0 ) {
fx.start = getColor( fx.elem, attr ); fx.start = getColor( fx.elem, attr );
fx.end = getRGB( fx.end ); fx.end = getRGB( fx.end );
@ -231,17 +231,17 @@ function getRGB(color) {
return colors['transparent']; return colors['transparent'];
// Otherwise, we're most likely dealing with a named color // Otherwise, we're most likely dealing with a named color
return colors[jQuery.trim(color).toLowerCase()]; return colors[$.trim(color).toLowerCase()];
} }
function getColor(elem, attr) { function getColor(elem, attr) {
var color; var color;
do { do {
color = jQuery.curCSS(elem, attr); color = $.curCSS(elem, attr);
// Keep going until we find an element that has color, or we hit the body // Keep going until we find an element that has color, or we hit the body
if ( color != '' && color != 'transparent' || jQuery.nodeName(elem, "body") ) if ( color != '' && color != 'transparent' || $.nodeName(elem, "body") )
break; break;
attr = "backgroundColor"; attr = "backgroundColor";
@ -339,14 +339,14 @@ var colors = {
*/ */
// t: current time, b: begInnIng value, c: change In value, d: duration // t: current time, b: begInnIng value, c: change In value, d: duration
jQuery.easing['jswing'] = jQuery.easing['swing']; $.easing.jswing = $.easing.swing;
jQuery.extend( jQuery.easing, $.extend($.easing,
{ {
def: 'easeOutQuad', def: 'easeOutQuad',
swing: function (x, t, b, c, d) { swing: function (x, t, b, c, d) {
//alert(jQuery.easing.default); //alert($.easing.default);
return jQuery.easing[jQuery.easing.def](x, t, b, c, d); return $.easing[$.easing.def](x, t, b, c, d);
}, },
easeInQuad: function (x, t, b, c, d) { easeInQuad: function (x, t, b, c, d) {
return c*(t/=d)*t + b; return c*(t/=d)*t + b;
@ -455,7 +455,7 @@ jQuery.extend( jQuery.easing,
return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b; return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
}, },
easeInBounce: function (x, t, b, c, d) { easeInBounce: function (x, t, b, c, d) {
return c - jQuery.easing.easeOutBounce (x, d-t, 0, c, d) + b; return c - $.easing.easeOutBounce (x, d-t, 0, c, d) + b;
}, },
easeOutBounce: function (x, t, b, c, d) { easeOutBounce: function (x, t, b, c, d) {
if ((t/=d) < (1/2.75)) { if ((t/=d) < (1/2.75)) {
@ -469,8 +469,8 @@ jQuery.extend( jQuery.easing,
} }
}, },
easeInOutBounce: function (x, t, b, c, d) { easeInOutBounce: function (x, t, b, c, d) {
if (t < d/2) return jQuery.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b; if (t < d/2) return $.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b;
return jQuery.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b; return $.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b;
} }
}); });

2
ui/effects.highlight.js
View File

@ -36,7 +36,7 @@ $.effects.highlight = function(o) {
el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() { el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
if(mode == "hide") el.hide(); if(mode == "hide") el.hide();
$.effects.restore(el, props); $.effects.restore(el, props);
if (mode == "show" && jQuery.browser.msie) this.style.removeAttribute('filter'); if (mode == "show" && $.browser.msie) this.style.removeAttribute('filter');
if(o.callback) o.callback.apply(this, arguments); if(o.callback) o.callback.apply(this, arguments);
el.dequeue(); el.dequeue();
}}); }});

6
ui/ui.accordion.js
View File

@ -195,7 +195,7 @@ function toggle(toShow, toHide, data, clickedActive, down) {
if ( !options.alwaysOpen && clickedActive ) { if ( !options.alwaysOpen && clickedActive ) {
animOptions = { animOptions = {
toShow: jQuery([]), toShow: $([]),
toHide: toHide, toHide: toHide,
complete: complete, complete: complete,
down: down, down: down,
@ -265,9 +265,9 @@ function clickHandler(event) {
var toHide = options.active.next(), var toHide = options.active.next(),
data = { data = {
options: options, options: options,
newHeader: jQuery([]), newHeader: $([]),
oldHeader: options.active, oldHeader: options.active,
newContent: jQuery([]), newContent: $([]),
oldContent: toHide oldContent: toHide
}, },
toShow = (options.active = $([])); toShow = (options.active = $([]));