Merge pull request gridstack#974 from garvank/develop

radiolips · web-flow · commit e84a7d90e3cf · 2019-03-28T13:22:40.000-04:00
Don't overwrite globals when in a modular environment.
diff --git a/src/gridstack.js b/src/gridstack.js
@@ -9,10 +9,13 @@
     if (typeof define === 'function' && define.amd) {
         define(['jquery', 'exports'], factory);
     } else if (typeof exports !== 'undefined') {
-        try { jQuery = require('jquery'); } catch (e) {}
-        factory(jQuery, exports);
+        var jQueryModule;
+
+        try { jQueryModule = require('jquery'); } catch (e) {}
+
+        factory(jQueryModule || window.jQuery, exports);
     } else {
-        factory(jQuery, window);
+        factory(window.jQuery, window);
     }
 })(function($, scope) {
     var obsolete = function(f, oldName, newName) {
