caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #1155 in VISUAL/fineui from ~ZHENFEI.LI/fineui:master to master 

* commit '6f7467dad27f2ad25ad83f3f9a93dc6983597b37':
  BI-52759 chore: build
  BI-52759 refactor: 对$和jQuery做下判断，没有则直接暴露出来
es6
guy 5 years ago
parent
d4a86a256d 6f7467dad2
commit
f44de92ef0
15 changed files with 49 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dist/2.0/fineui.ie.js
  2. 10
      dist/2.0/fineui.ie.min.js
  3. 2
      dist/2.0/fineui.js
  4. 10
      dist/2.0/fineui.min.js
  5. 2
      dist/bundle.ie.js
  6. 10
      dist/bundle.ie.min.js
  7. 2
      dist/bundle.js
  8. 10
      dist/bundle.min.js
  9. 2
      dist/core.js
  10. 2
      dist/fineui.ie.js
  11. 12
      dist/fineui.ie.min.js
  12. 2
      dist/fineui.js
  13. 12
      dist/fineui.min.js
  14. 2
      dist/utils.min.js
  15. 2
      src/core/platform/web/jquery/_jquery.js

2
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -32337,6 +32337,8 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
// })(); // })();
// Expose jQuery to the global object // Expose jQuery to the global object
BI.jQuery = BI.$ = jQuery; BI.jQuery = BI.$ = jQuery;
window.$ = window.$ || jQuery;
window.jQuery = window.jQuery || jQuery;
// Expose jQuery as an AMD module, but only for AMD loaders that // Expose jQuery as an AMD module, but only for AMD loaders that
// understand the issues with loading multiple versions of jQuery // understand the issues with loading multiple versions of jQuery

10
dist/2.0/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.js vendored
Unescape View File

@ -32337,6 +32337,8 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
// })(); // })();
// Expose jQuery to the global object // Expose jQuery to the global object
BI.jQuery = BI.$ = jQuery; BI.jQuery = BI.$ = jQuery;
window.$ = window.$ || jQuery;
window.jQuery = window.jQuery || jQuery;
// Expose jQuery as an AMD module, but only for AMD loaders that // Expose jQuery as an AMD module, but only for AMD loaders that
// understand the issues with loading multiple versions of jQuery // understand the issues with loading multiple versions of jQuery

10
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/bundle.ie.js vendored
Unescape View File

@ -32337,6 +32337,8 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
// })(); // })();
// Expose jQuery to the global object // Expose jQuery to the global object
BI.jQuery = BI.$ = jQuery; BI.jQuery = BI.$ = jQuery;
window.$ = window.$ || jQuery;
window.jQuery = window.jQuery || jQuery;
// Expose jQuery as an AMD module, but only for AMD loaders that // Expose jQuery as an AMD module, but only for AMD loaders that
// understand the issues with loading multiple versions of jQuery // understand the issues with loading multiple versions of jQuery

10
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/bundle.js vendored
Unescape View File

@ -32337,6 +32337,8 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
// })(); // })();
// Expose jQuery to the global object // Expose jQuery to the global object
BI.jQuery = BI.$ = jQuery; BI.jQuery = BI.$ = jQuery;
window.$ = window.$ || jQuery;
window.jQuery = window.jQuery || jQuery;
// Expose jQuery as an AMD module, but only for AMD loaders that // Expose jQuery as an AMD module, but only for AMD loaders that
// understand the issues with loading multiple versions of jQuery // understand the issues with loading multiple versions of jQuery

10
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/core.js vendored
Unescape View File

@ -32337,6 +32337,8 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
// })(); // })();
// Expose jQuery to the global object // Expose jQuery to the global object
BI.jQuery = BI.$ = jQuery; BI.jQuery = BI.$ = jQuery;
window.$ = window.$ || jQuery;
window.jQuery = window.jQuery || jQuery;
// Expose jQuery as an AMD module, but only for AMD loaders that // Expose jQuery as an AMD module, but only for AMD loaders that
// understand the issues with loading multiple versions of jQuery // understand the issues with loading multiple versions of jQuery

2
dist/fineui.ie.js vendored
Unescape View File

@ -32582,6 +32582,8 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
// })(); // })();
// Expose jQuery to the global object // Expose jQuery to the global object
BI.jQuery = BI.$ = jQuery; BI.jQuery = BI.$ = jQuery;
window.$ = window.$ || jQuery;
window.jQuery = window.jQuery || jQuery;
// Expose jQuery as an AMD module, but only for AMD loaders that // Expose jQuery as an AMD module, but only for AMD loaders that
// understand the issues with loading multiple versions of jQuery // understand the issues with loading multiple versions of jQuery

12
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.js vendored
Unescape View File

@ -32582,6 +32582,8 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
// })(); // })();
// Expose jQuery to the global object // Expose jQuery to the global object
BI.jQuery = BI.$ = jQuery; BI.jQuery = BI.$ = jQuery;
window.$ = window.$ || jQuery;
window.jQuery = window.jQuery || jQuery;
// Expose jQuery as an AMD module, but only for AMD loaders that // Expose jQuery as an AMD module, but only for AMD loaders that
// understand the issues with loading multiple versions of jQuery // understand the issues with loading multiple versions of jQuery

12
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/core/platform/web/jquery/_jquery.js vendored
Unescape View File

@ -9596,6 +9596,8 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
// })(); // })();
// Expose jQuery to the global object // Expose jQuery to the global object
BI.jQuery = BI.$ = jQuery; BI.jQuery = BI.$ = jQuery;
window.$ = window.$ || jQuery;
window.jQuery = window.jQuery || jQuery;
// Expose jQuery as an AMD module, but only for AMD loaders that // Expose jQuery as an AMD module, but only for AMD loaders that
// understand the issues with loading multiple versions of jQuery // understand the issues with loading multiple versions of jQuery

Write Preview
Loading…
Cancel
Save