Browse Source

Pull request #1628: 无JIRA任务 如果外部已经有jquery对象时则不expose

Merge in VISUAL/fineui from ~TELLER/fineui:bugfix to master

* commit '30fb4ddd69680c7d7d38ba2b1be91b562991f708':
  fix: 如果外部已经有jquery对象时则不expose
es6
Teller 4 years ago
parent
commit
a37a882788
  1. 2
      src/core/platform/web/jquery/_jquery.js

2
src/core/platform/web/jquery/_jquery.js vendored

@ -11003,7 +11003,9 @@
// Expose jQuery and $ identifiers, even in // Expose jQuery and $ identifiers, even in
// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557) // AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
// and CommonJS for browser emulators (#13566) // and CommonJS for browser emulators (#13566)
if (!window.$ && !window.jQuery) {
window.jQuery = window.$ = jQuery; window.jQuery = window.$ = jQuery;
}
BI.jQuery = BI.$ = jQuery; BI.jQuery = BI.$ = jQuery;

Loading…
Cancel
Save