v1.1.0

- use Mobile-Detect@2.8.13 (fix #27) - fix #26 webpack build error
hgoebl · May 10, 2015 · 84619ea · 84619ea
1 parent ecd0373
commit 84619ea
Show file tree

Hide file tree

Showing 8 changed files with 2,288 additions and 777 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,9 @@
+v1.1.0:
+  date: 2015-05-10
+  changes:
+    - use Mobile-Detect@2.8.13 (fix #27)
+    - fix #26 webpack build error
+
 v1.0.1:
   date: 2015-04-10
   changes:

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ You can find out information about the device rendering your web page:
   * [Mobile Grade (A, B, C)](http://jquerymobile.com/gbs/)
   * specific versions (e.g. WebKit)
 
-Current `master` branch is using detection logic from **Mobile-Detect@2.8.12**
+Current `master` branch is using detection logic from **Mobile-Detect@2.8.13**
 
 # Live Demo
 
@@ -104,9 +104,9 @@ You can easily extend it, e.g. `android`, `iphone`, etc.
 
 ## Size (bytes)
 
- * development: 62001
- * minified: 34907
- * minified + gzipped: 14598 (`cat mobile-detect.min.js | gzip -9f | wc -c`)
+ * development: 62429
+ * minified: 35311
+ * minified + gzipped: 14789 (`cat mobile-detect.min.js | gzip -9f | wc -c`)
 
 # Installation
 
@@ -120,11 +120,11 @@ You can easily extend it, e.g. `android`, `iphone`, etc.
 
 ## CDN - [jsDelivr](http://www.jsdelivr.com/#!mobile-detect.js)
 
-    <script src="//cdn.jsdelivr.net/mobile-detect.js/1.0.0/mobile-detect.min.js"></script>
+    <script src="//cdn.jsdelivr.net/mobile-detect.js/1.1.0/mobile-detect.min.js"></script>
 
 ## cdnjs - [cdnjs.com](https://cdnjs.com/libraries/mobile-detect)
 
-    <script src="//cdnjs.cloudflare.com/ajax/libs/mobile-detect/1.0.0/mobile-detect.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/mobile-detect/1.1.0/mobile-detect.min.js"></script>
 
 # Extending/Modifying Behaviour
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "mobile-detect",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "description": "Device detection (phone, tablet, desktop, mobile grade, os, versions)",
     "homepage": "http://hgoebl.github.io/mobile-detect.js/",
     "keywords": [

diff --git a/generate/mobile-detect.template.js b/generate/mobile-detect.template.js
@@ -593,14 +593,14 @@ define(function () {
     return MobileDetect;
 }); // end of call of define()
 })((function (undefined) {
-    if (typeof define === 'function' && define.amd) {
-        return define;
-    } else if (typeof module !== 'undefined' && module.exports) {
+    if (typeof module !== 'undefined' && module.exports) {
         return function (factory) { module.exports = factory(); };
+    } else if (typeof define === 'function' && define.amd) {
+        return define;
     } else if (typeof window !== 'undefined') {
         return function (factory) { window.MobileDetect = factory(); };
     } else {
         // please file a bug if you get this error!
         throw new Error('unknown environment');
     }
-})());
+})());
diff --git a/mobile-detect.js b/mobile-detect.js
diff --git a/mobile-detect.min.js b/mobile-detect.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mobile-detect",
-    "version": "1.0.1",
+    "version": "1.1.0",
     "description": "Device detection (phone, tablet, desktop, mobile grade, os, versions)",
     "main": "mobile-detect.js",
     "scripts": {