projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3241047)
CRM-14383 - Add CRM.$ and CRM._ noconflict objects
authorColeman Watts <coleman@civicrm.org>
Tue, 25 Mar 2014 19:01:45 +0000 (15:01 -0400)
committerColeman Watts <coleman@civicrm.org>
Tue, 25 Mar 2014 19:25:05 +0000 (15:25 -0400)
js/noconflict.js patch | blob | blame | history

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