From 6fe7dc98b6e886ce9f7c6022a63856143387f583 Mon Sep 17 00:00:00 2001 From: Garvan Kuskey Date: Thu, 28 Mar 2019 09:44:48 -0700 Subject: [PATCH] don't overwrite globals in modular environment --- src/gridstack.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gridstack.js b/src/gridstack.js index 195c4a19f..db54b8098 100644 --- 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) {