From c8e6a995007ac56bd03048b5cf1e8c3e1891d38b Mon Sep 17 00:00:00 2001 From: Dmitriy Kulichkin Date: Fri, 14 Aug 2015 15:40:15 +0200 Subject: [PATCH] Fixed AMD exporting issues: - When built by webpack as an npm package - gets exported as an amd module and produces "define could not be used isolated", hence changed export priority to commonjs - Exporting as amd module does not check jquery's presense --- odometer.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/odometer.js b/odometer.js index dcf926c..87252b7 100644 --- a/odometer.js +++ b/odometer.js @@ -640,12 +640,13 @@ }, false); } - if (typeof define === 'function' && define.amd) { - define(['jquery'], function() { + if (typeof exports !== "undefined" && exports !== null) { + module.exports = Odometer; + } + else if (typeof define === 'function' && define.amd) { + define(window.jQuery && ['jquery'], function() { return Odometer; }); - } else if (typeof exports !== "undefined" && exports !== null) { - module.exports = Odometer; } else { window.Odometer = Odometer; }