X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=js%2Fnoconflict.js;h=ec64c5e591893a972244b9b4f075dbce07ee8cd8;hb=1fd00049e69653227b53343bbc2976a3132f3b97;hp=d52906a31e5f3619926c61b685daec562469dfee;hpb=5563fe43b44b754e6441841a5d92664470b20366;p=civicrm-core.git diff --git a/js/noconflict.js b/js/noconflict.js index d52906a31e..ec64c5e591 100644 --- 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();