From 7b2c84ddbe004ed4ab2ee3982af40b7275d7dfde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Zaefferer?= Date: Fri, 6 Oct 2006 17:15:33 +0000 Subject: [PATCH] Removed (hopefully) all references to $ within the jQuery code itself --- src/ajax/ajax.js | 6 +++--- src/event/event.js | 2 +- src/fx/fx.js | 4 ++-- src/jquery/jquery.js | 8 ++------ 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js index 2c63605d..5aeb9439 100644 --- a/src/ajax/ajax.js +++ b/src/ajax/ajax.js @@ -87,9 +87,9 @@ jQuery.fn.extend({ self.html(res.responseText).each( callback, [res.responseText, status] ); // Execute all the scripts inside of the newly-injected HTML - $("script", self).each(function(){ + jQuery("script", self).each(function(){ if ( this.src ) - $.getScript( this.src ); + jQuery.getScript( this.src ); else eval.call( window, this.text || this.textContent || this.innerHTML || "" ); }); @@ -124,7 +124,7 @@ jQuery.fn.extend({ * @cat AJAX */ serialize: function() { - return $.param( this ); + return jQuery.param( this ); } }); diff --git a/src/event/event.js b/src/event/event.js index 81c62d83..471c8cb3 100644 --- a/src/event/event.js +++ b/src/event/event.js @@ -1658,7 +1658,7 @@ new function(){ }; // Clean up after IE to avoid memory leaks -if ($.browser.msie) $(window).unload(function() { +if (jQuery.browser.msie) jQuery(window).unload(function() { var event = jQuery.event, global = event.global; for (var type in global) { var els = global[type], i = els.length; diff --git a/src/fx/fx.js b/src/fx/fx.js index 64706685..1dfd31e5 100644 --- a/src/fx/fx.js +++ b/src/fx/fx.js @@ -173,8 +173,8 @@ jQuery.fn.extend({ */ slideToggle: function(speed,callback){ return this.each(function(){ - var state = $(this).is(":hidden") ? "show" : "hide"; - $(this).animate({height: state}, speed, callback); + var state = jQuery(this).is(":hidden") ? "show" : "hide"; + jQuery(this).animate({height: state}, speed, callback); }); }, diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 5446ed2c..12b342cb 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1384,10 +1384,6 @@ jQuery.extend({ o.className += ( o.className ? " " : "" ) + c; }, remove: function(o,c){ - /* - o.className = !c ? "" : - o.className.replace( - new RegExp("(^|\\s*\\b[^-])"+c+"($|\\b(?=[^-]))", "g"), "");*/ if( !c ) { o.className = ""; } else { @@ -1497,7 +1493,7 @@ jQuery.extend({ for ( var i = 0; i < a.length; i++ ) { if ( a[i].constructor == String ) { // trim whitespace, otherwise indexOf won't work as expected - a[i] = $.trim(a[i]); + a[i] = jQuery.trim(a[i]); var table = ""; @@ -1837,7 +1833,7 @@ jQuery.extend({ if ( fix[name] ) { if ( value != undefined ) elem[fix[name]] = value; return elem[fix[name]]; - } else if( value == undefined && $.browser.msie && elem.nodeName && elem.nodeName.toUpperCase() == 'FORM' && (name == 'action' || name == 'method') ) { + } else if( value == undefined && jQuery.browser.msie && elem.nodeName && elem.nodeName.toUpperCase() == 'FORM' && (name == 'action' || name == 'method') ) { return elem.getAttributeNode(name).nodeValue; } else if ( elem.getAttribute != undefined ) { if ( value != undefined ) elem.setAttribute( name, value );