Skip to content

Commit

Permalink
v1.2.0: fix #28 extend fallback pattern for unknown tablets (http://d…
Browse files Browse the repository at this point in the history 
…etectmobilebrowsers.com/)
  • Loading branch information
@hgoebl
hgoebl committed May 24, 2015
1 parent 3b8230a commit 9f7c122
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 16 deletions.
24 changes: 12 additions & 12 deletions doc/MobileDetect.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ <h5>Parameters:</h5>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line619">line 619</a>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line627">line 627</a>
</li></ul></dd>


Expand Down Expand Up @@ -345,7 +345,7 @@ <h5>Parameters:</h5>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line812">line 812</a>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line820">line 820</a>
</li></ul></dd>


Expand Down Expand Up @@ -489,7 +489,7 @@ <h5>Parameters:</h5>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line834">line 834</a>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line842">line 842</a>
</li></ul></dd>


Expand Down Expand Up @@ -596,7 +596,7 @@ <h4 class="name" id="mobile"><span class="type-signature"></span>mobile<span cla

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line629">line 629</a>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line637">line 637</a>
</li></ul></dd>


Expand Down Expand Up @@ -687,7 +687,7 @@ <h4 class="name" id="mobileGrade"><span class="type-signature"></span>mobileGrad

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line863">line 863</a>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line871">line 871</a>
</li></ul></dd>


Expand Down Expand Up @@ -782,7 +782,7 @@ <h4 class="name" id="os"><span class="type-signature"></span>os<span class="sign

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line752">line 752</a>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line760">line 760</a>
</li></ul></dd>


Expand Down Expand Up @@ -892,7 +892,7 @@ <h4 class="name" id="phone"><span class="type-signature"></span>phone<span class

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line656">line 656</a>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line664">line 664</a>
</li></ul></dd>


Expand Down Expand Up @@ -1020,7 +1020,7 @@ <h4 class="name" id="tablet"><span class="type-signature"></span>tablet<span cla

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line686">line 686</a>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line694">line 694</a>
</li></ul></dd>


Expand Down Expand Up @@ -1116,7 +1116,7 @@ <h4 class="name" id="userAgent"><span class="type-signature"></span>userAgent<sp

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line734">line 734</a>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line742">line 742</a>
</li></ul></dd>


Expand Down Expand Up @@ -1264,7 +1264,7 @@ <h5>Parameters:</h5>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line769">line 769</a>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line777">line 777</a>
</li></ul></dd>


Expand Down Expand Up @@ -1412,7 +1412,7 @@ <h5>Parameters:</h5>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line791">line 791</a>
<a href="mobile-detect.js.html">mobile-detect.js</a>, <a href="mobile-detect.js.html#line799">line 799</a>
</li></ul></dd>


Expand Down Expand Up @@ -1481,7 +1481,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="MobileDe
<br clear="both">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sun May 10 2015 11:24:52 GMT+0200 (MESZ)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sun May 24 2015 22:53:38 GMT+0200 (MESZ)
</footer>

<script> prettyPrint(); </script>
Expand Down
2 changes: 1 addition & 1 deletion doc/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="MobileDe
<br clear="both">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sun May 10 2015 11:24:52 GMT+0200 (MESZ)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sun May 24 2015 22:53:38 GMT+0200 (MESZ)
</footer>

<script> prettyPrint(); </script>
Expand Down
14 changes: 11 additions & 3 deletions doc/mobile-detect.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,9 @@ <h1 class="page-title">Source: mobile-detect.js</h1>

// following patterns come from http://detectmobilebrowsers.com/
impl.detectMobileBrowsers = {
fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i,
shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i
fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i,
shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i,
tabletPattern: /android|ipad|playbook|silk/i
};

var hasOwnProp = Object.prototype.hasOwnProperty,
Expand Down Expand Up @@ -439,6 +440,10 @@ <h1 class="page-title">Source: mobile-detect.js</h1>
impl.detectMobileBrowsers.shortPattern.test(userAgent.substr(0,4));
};

impl.isTabletFallback = function (userAgent) {
return impl.detectMobileBrowsers.tabletPattern.test(userAgent);
};

impl.prepareDetectionCache = function (cache, userAgent, maxPhoneWidth) {
if (cache.mobile !== undefined) {
return;
Expand Down Expand Up @@ -473,6 +478,9 @@ <h1 class="page-title">Source: mobile-detect.js</h1>
cache.mobile = cache.tablet = impl.FALLBACK_TABLET;
cache.phone = null;
}
} else if (impl.isTabletFallback(userAgent)) {
cache.mobile = cache.tablet = impl.FALLBACK_TABLET;
cache.phone = null;
} else {
// not mobile at all!
cache.mobile = cache.tablet = cache.phone = null;
Expand Down Expand Up @@ -942,7 +950,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="MobileDe
<br clear="both">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sun May 10 2015 11:24:52 GMT+0200 (MESZ)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sun May 24 2015 22:53:38 GMT+0200 (MESZ)
</footer>

<script> prettyPrint(); </script>
Expand Down

0 comments on commit 9f7c122

Please sign in to comment.