From ffa5761e5056a680f8ffbbace4bc034cfd55ac0e Mon Sep 17 00:00:00 2001 From: Matt Nibecker Date: Mon, 5 Jan 2015 15:06:41 -0800 Subject: [PATCH 1/2] Making Papa require friendly. Added functionality to return Papa obj is app is using require --- papaparse.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/papaparse.js b/papaparse.js index 5bef834..2c0aee1 100644 --- a/papaparse.js +++ b/papaparse.js @@ -1432,4 +1432,11 @@ { return typeof func === 'function'; } + + // if requirejs is available, return Papa + if (typeof define === "function" && define.amd) { + define('papaparse', [], function() { + return global.Papa; + }); + } })(this); From 40d5be9eb3125f9b9e2eb8b8cd59fdd62b056e98 Mon Sep 17 00:00:00 2001 From: Matt Nibecker Date: Sat, 31 Jan 2015 11:23:30 -0800 Subject: [PATCH 2/2] Use isFunction method. Use anonymous define --- papaparse.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/papaparse.js b/papaparse.js index 2c0aee1..ee920ef 100644 --- a/papaparse.js +++ b/papaparse.js @@ -1434,9 +1434,7 @@ } // if requirejs is available, return Papa - if (typeof define === "function" && define.amd) { - define('papaparse', [], function() { - return global.Papa; - }); + if (isFunction(define) && define.amd) { + define( function() { return global.Papa; }); } })(this);