From af74e92a4bab13105c616d53df9b215bbd6b08c4 Mon Sep 17 00:00:00 2001 From: Andreas Argelius Date: Tue, 27 Oct 2015 12:49:18 +0900 Subject: [PATCH] feat(*): Make ons object importable with browserify. --- core/lib/ons-gesture-detector.js | 16 ++-------------- core/setup.es6 | 4 ++++ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/core/lib/ons-gesture-detector.js b/core/lib/ons-gesture-detector.js index 14bb37e9cb..50306048d2 100644 --- a/core/lib/ons-gesture-detector.js +++ b/core/lib/ons-gesture-detector.js @@ -2059,18 +2059,6 @@ GestureDetector.Instance.prototype = { }; })('transform'); - // AMD export - if(typeof define == 'function' && define.amd) { - define(function() { - return GestureDetector; - }); - // commonjs export - } else if(typeof module !== 'undefined' && module.exports) { - module.exports = GestureDetector; - // browser export - } else { - window.ons = window.ons || {}; - window.ons.GestureDetector = GestureDetector; - } - + window.ons = window.ons || {}; + window.ons.GestureDetector = GestureDetector; })(window); diff --git a/core/setup.es6 b/core/setup.es6 index 4f6f66548b..9dcb0264bf 100644 --- a/core/setup.es6 +++ b/core/setup.es6 @@ -32,4 +32,8 @@ } else { ons._BaseElement = HTMLElement; } + + if (typeof module !== 'undefined' && module.exports) { + module.exports = ons; + } })(window.ons = window.ons || {});