projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch create MembershipPayment to use API
[civicrm-core.git]
/
js
/
noconflict.js
diff --git
a/js/noconflict.js
b/js/noconflict.js
index d52906a31e5f3619926c61b685daec562469dfee..ec64c5e591893a972244b9b4f075dbce07ee8cd8 100644
(file)
--- a/
js/noconflict.js
+++ b/
js/noconflict.js
@@
-1,3
+1,3
@@
-
window.CRM || (window.CRM = {})
;
+
if (!window.CRM) window.CRM = {}
;
window.cj = CRM.$ = jQuery.noConflict(true);
CRM._ = _.noConflict();
window.cj = CRM.$ = jQuery.noConflict(true);
CRM._ = _.noConflict();