Merge pull request #277 from baconface/master

Allowed use of require() and Electron now uses it in the CommonJS env
nakupanda · Jun 21, 2016 · 74cf2e1 · 74cf2e1
2 parents a6d7f28 + 81d4bb1
commit 74cf2e1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/dist/js/bootstrap-dialog.js b/dist/js/bootstrap-dialog.js
@@ -17,13 +17,7 @@
 
     // CommonJS module is defined
     if (typeof module !== 'undefined' && module.exports) {
-        var isNode = (typeof process === "object") && (typeof process.versions === "object");
-        var isElectron = isNode && ('electron' in process.versions);
-        if (isElectron) {
-            root.BootstrapDialog = factory(root.jQuery);
-        } else {
-            module.exports = factory(require('jquery'), require('bootstrap'));
-        }
+        module.exports = factory(require('jquery'), require('bootstrap'));
     }
     // AMD module is defined
     else if (typeof define === "function" && define.amd) {