X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=js%2Fnoconflict.js;h=d52906a31e5f3619926c61b685daec562469dfee;hb=9bb2b90cecfe75bfae05fe27a0d1080b50f8751b;hp=7284269128a694c66f861b80f834a2b443bc996d;hpb=8d33e12be1cfc6226cada7978de1306924fb6040;p=civicrm-core.git

diff --git a/js/noconflict.js b/js/noconflict.js
index 7284269128..d52906a31e 100644
--- a/js/noconflict.js
+++ b/js/noconflict.js
@@ -1 +1,3 @@
-var cj = jQuery.noConflict(true);
+window.CRM || (window.CRM = {});
+window.cj = CRM.$ = jQuery.noConflict(true);
+CRM._ = _.noConflict();