Merge pull request #374 from zaggino/master

Fixed issue when using custom RequireJS loader
markedjs · Mar 26, 2014 · 4ed4cc9 · 4ed4cc9
2 parents 43db549 + b422126
commit 4ed4cc9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/marked.js b/lib/marked.js
@@ -1253,7 +1253,10 @@ marked.inlineLexer = InlineLexer.output;
 
 marked.parse = marked;
 
-if (typeof exports === 'object') {
+// - custom setup of RequireJS provides 'exports' variable without 'module'
+//   function loadExtension @
+//   https://github.com/adobe/brackets/blob/master/src/utils/ExtensionLoader.js
+if (typeof module !== "undefined" && typeof exports === 'object') {
   module.exports = marked;
 } else if (typeof define === 'function' && define.amd) {
   define(function() { return marked; });