Added in the new .noConflict() function for resolving conflict betwee…

…n jQuery and other $ functions.
jquery · Jan 4, 2007 · 04b51d353a45ec413631bf8715152b8c290b467b · 04b51d3
1 parent 783f589
commit 04b51d353a45ec413631bf8715152b8c290b467b
Showing with 18 additions and 0 deletions.

+18 −0 src/jquery/jquery.js
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
@@ -1062,6 +1062,24 @@ jQuery.extend = jQuery.fn.extend = function() {
 };
 
 jQuery.extend({
+	/**
+	 * Run this function to give control of the $ variable back
+	 * to whichever library first implemented it. This helps to make 
+	 * sure that jQuery doesn't conflict with the $ object
+	 * of other libraries.
+	 *
+	 * By using this function, you will only be able to access jQuery
+	 * using the 'jQuery' variable. For example, where you use to do
+	 * $("div p"), you now must do jQuery("div p").
+	 *
+	 * @name noConflict
+	 * @type undefined
+	 * @cat Core 
+	 */
+	noConflict: function(){
+		$ = jQuery._$;
+	},
+
 	/**
 	 * @private
 	 * @name init