Merge pull request #743 from paltman/master

Use jQuery if already loaded
dangrossman · Aug 2, 2015 · 563a458 · 563a458
2 parents 5a616f4 + f05b569
commit 563a458
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/daterangepicker.js b/daterangepicker.js
@@ -15,12 +15,13 @@
 
   } else if (typeof exports !== 'undefined') {
     var momentjs = require('moment');
-    var jQuery;
-    try {
-      jQuery = require('jquery');
-    } catch (err) {
-      jQuery = window.jQuery;
-      if (!jQuery) throw new Error('jQuery dependnecy not found');
+    var jQuery = window.jQuery;
+    if (jQuery === undefined) {
+      try {
+        jQuery = require('jquery');
+      } catch (err) {
+        if (!jQuery) throw new Error('jQuery dependency not found');
+      }
     }
 
     factory(root, exports, momentjs, jQuery);