projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge pull request #3557 from jitendrapurohit/CRM-14880
[civicrm-core.git]
/
js
/
noconflict.js
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();