From 04b51d353a45ec413631bf8715152b8c290b467b Mon Sep 17 00:00:00 2001 From: John Resig Date: Thu, 4 Jan 2007 18:48:48 +0000 Subject: [PATCH] Added in the new .noConflict() function for resolving conflict between jQuery and other $ functions. --- src/jquery/jquery.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 5aa213026..3d9e3042a 100644 --- 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 -- 2.39.5