X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=js%2Fnoconflict.js;h=ec64c5e591893a972244b9b4f075dbce07ee8cd8;hb=85e7dfaf0fe14830efdc9dbea18fc36cb4e04f0b;hp=7284269128a694c66f861b80f834a2b443bc996d;hpb=a03524aa1edfa6a8f18fc91c72370946fde95db4;p=civicrm-core.git

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