Merge pull request #12500 from pradpnayak/28

[civicrm-core.git] / js / noconflict.js

diff --git a/js/noconflict.js b/js/noconflict.js
index 7284269128a694c66f861b80f834a2b443bc996d..ec64c5e591893a972244b9b4f075dbce07ee8cd8 100644 (file)
--- 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();