Skip to content

Commit

Permalink
Merge pull request #16 from sourcebits-robertbiggs/master
Browse files Browse the repository at this point in the history
Feature detection update to handle Windows Phone 8 and MS Edge changes.
  • Loading branch information
chocolatechipui committed Jun 12, 2015
2 parents df74af0 + 615a8d6 commit 9e03124
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 44 deletions.
47 changes: 28 additions & 19 deletions dist/chocolatechip-3.8.9.js → dist/chocolatechip-3.8.10.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
ChocolateChip.js
Copyright 2015 Sourcebits www.sourcebits.com
License: MIT
Version: 3.8.9
Version: 3.8.10
*/
(function() {
'use strict';
Expand Down Expand Up @@ -130,7 +130,7 @@ Version: 3.8.9

$.extend({

version : "3.8.9",
version : "3.8.10",

libraryName : 'ChocolateChip',

Expand Down Expand Up @@ -1747,28 +1747,37 @@ Version: 3.8.9


$.extend($, {
isiPhone : /iphone/img.test(navigator.userAgent),
isiPad : /ipad/img.test(navigator.userAgent),
isiPod : /ipod/img.test(navigator.userAgent),
isiOS : /ip(hone|od|ad)/img.test(navigator.userAgent),
isAndroid : (/android/img.test(navigator.userAgent) && !/trident/img.test(navigator.userAgent)),
isMobile : /mobile/img.test(navigator.userAgent),
isTrident : /trident/img.test(navigator.userAgent),
isIEEdge : /edge/img.test(navigator.userAgent),
isWinPhone : /trident/img.test(navigator.userAgent) && /mobile/img.test(navigator.userAgent),
isiPhone : !/edge/img.test(navigator.userAgent) && !$.isWinPhone && !/trident/img.test(navigator.userAgent) && /iphone/img.test(navigator.userAgent),
isiPad : !/edge/img.test(navigator.userAgent) && /ipad/img.test(navigator.userAgent),
isiPod : !$.isWinPhone && !/edge/img.test(navigator.userAgent) && /ipod/img.test(navigator.userAgent),
isiOS : !/edge/img.test(navigator.userAgent) && !/trident/img.test(navigator.userAgent) && /ip(hone|od|ad)/img.test(navigator.userAgent),
isAndroid : !/trident/img.test(navigator.userAgent) && !/edge/img.test(navigator.userAgent) && (/android/img.test(navigator.userAgent) && !/trident/img.test(navigator.userAgent)),
isWebOS : /webos/img.test(navigator.userAgent),
isBlackberry : /blackberry/img.test(navigator.userAgent),
isTouchEnabled : ('createTouch' in document),

isTouchEnabled : !/trident/img.test(navigator.userAgent) && !/edge/img.test(navigator.userAgent) && 'createTouch' in document,

isOnline : navigator.onLine,
isStandalone : navigator.standalone,
isiOS6 : navigator.userAgent.match(/OS 6/i),
isiOS7 : navigator.userAgent.match(/OS 7/i),
isWin : /trident/img.test(navigator.userAgent),
isWinPhone : (/trident/img.test(navigator.userAgent) && /mobile/img.test(navigator.userAgent)),
isIE10 : navigator.userAgent.match(/msie 10/i),
isIE11 : navigator.userAgent.match(/msie 11/i),
isWebkit : navigator.userAgent.match(/webkit/),
isMobile : /mobile/img.test(navigator.userAgent),
isiOS6 : !/trident/img.test(navigator.userAgent) && !$.isEdge && /OS 6/img.test(navigator.userAgent),
isiOS7 : !/trident/img.test(navigator.userAgent) && !/edge/img.test(navigator.userAgent) && /OS 7/img.test(navigator.userAgent),
isiOS8 : !/trident/img.test(navigator.userAgent) && !/edge/img.test(navigator.userAgent) && /OS 8/img.test(navigator.userAgent),
isiOS9 : !/trident/img.test(navigator.userAgent) && !/edge/img.test(navigator.userAgent) && /OS 9/img.test(navigator.userAgent),
isWin : /edge/img.test(navigator.userAgent) || /trident/img.test(navigator.userAgent),
isIE10 : /msie 10/img.test(navigator.userAgent),
isIE11 : (/windows nt/img.test(navigator.userAgent) && /trident/img.test(navigator.userAgent)),

isWebkit : !/edge/img.test(navigator.userAgent) && !$.isWinPhone && !/trident/img.test(navigator.userAgent) && /webkit/img.test(navigator.userAgent),
isDesktop : !(/mobile/img.test(navigator.userAgent)),
isSafari : (!/Chrome/img.test(navigator.userAgent) && /Safari/img.test(navigator.userAgent) && !/android/img.test(navigator.userAgent)),
isChrome : /Chrome/img.test(navigator.userAgent),
isNativeAndroid : (/android/i.test(navigator.userAgent) && /webkit/i.test(navigator.userAgent) && !/chrome/i.test(navigator.userAgent))
isSafari : (!/edge/img.test(navigator.userAgent) && !/Chrome/img.test(navigator.userAgent) && /Safari/img.test(navigator.userAgent) && !/android/img.test(navigator.userAgent)),

isChrome : !/trident/img.test(navigator.userAgent) && !/edge/img.test(navigator.userAgent) && /Chrome/img.test(navigator.userAgent),

isNativeAndroid : ((/samsung/img.test(navigator.userAgent) || /Galaxy Nexus/img.test(navigator.userAgent) || /HTC/img.test(navigator.userAgent) || /LG/img.test(navigator.userAgent)) && !/trident/img.test(navigator.userAgent) && !/edge/img.test(navigator.userAgent) && /android/i.test(navigator.userAgent) && /webkit/i.test(navigator.userAgent))
});


Expand Down
7 changes: 7 additions & 0 deletions dist/chocolatechip-3.8.10.min.js

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions dist/chocolatechip-3.8.9.min.js

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "chocolatechipjs",
"title": "ChocolateChip.js",
"description": "JavaScript library for mobile Web apps",
"version": "3.8.9",
"version": "3.8.10",
"homepage": "http://chocolatechip-ui.com",
"author": {
"name": "Sourcebits Inc. and other contributors"
Expand Down
43 changes: 26 additions & 17 deletions src/chocolatechip/feature-detection.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,36 @@
(function(){
"use strict";
$.extend($, {
isiPhone : /iphone/img.test(navigator.userAgent),
isiPad : /ipad/img.test(navigator.userAgent),
isiPod : /ipod/img.test(navigator.userAgent),
isiOS : /ip(hone|od|ad)/img.test(navigator.userAgent),
isAndroid : (/android/img.test(navigator.userAgent) && !/trident/img.test(navigator.userAgent)),
isMobile : /mobile/img.test(navigator.userAgent),
isTrident : /trident/img.test(navigator.userAgent),
isIEEdge : /edge/img.test(navigator.userAgent),
isWinPhone : /trident/img.test(navigator.userAgent) && /mobile/img.test(navigator.userAgent),
isiPhone : !/edge/img.test(navigator.userAgent) && !$.isWinPhone && !/trident/img.test(navigator.userAgent) && /iphone/img.test(navigator.userAgent),
isiPad : !/edge/img.test(navigator.userAgent) && /ipad/img.test(navigator.userAgent),
isiPod : !$.isWinPhone && !/edge/img.test(navigator.userAgent) && /ipod/img.test(navigator.userAgent),
isiOS : !/edge/img.test(navigator.userAgent) && !/trident/img.test(navigator.userAgent) && /ip(hone|od|ad)/img.test(navigator.userAgent),
isAndroid : !/trident/img.test(navigator.userAgent) && !/edge/img.test(navigator.userAgent) && (/android/img.test(navigator.userAgent) && !/trident/img.test(navigator.userAgent)),
isWebOS : /webos/img.test(navigator.userAgent),
isBlackberry : /blackberry/img.test(navigator.userAgent),
isTouchEnabled : ('createTouch' in document),

isTouchEnabled : !/trident/img.test(navigator.userAgent) && !/edge/img.test(navigator.userAgent) && 'createTouch' in document,

isOnline : navigator.onLine,
isStandalone : navigator.standalone,
isiOS6 : navigator.userAgent.match(/OS 6/i),
isiOS7 : navigator.userAgent.match(/OS 7/i),
isWin : /trident/img.test(navigator.userAgent),
isWinPhone : (/trident/img.test(navigator.userAgent) && /mobile/img.test(navigator.userAgent)),
isIE10 : navigator.userAgent.match(/msie 10/i),
isIE11 : navigator.userAgent.match(/msie 11/i),
isWebkit : navigator.userAgent.match(/webkit/),
isMobile : /mobile/img.test(navigator.userAgent),
isiOS6 : !/trident/img.test(navigator.userAgent) && !$.isEdge && /OS 6/img.test(navigator.userAgent),
isiOS7 : !/trident/img.test(navigator.userAgent) && !/edge/img.test(navigator.userAgent) && /OS 7/img.test(navigator.userAgent),
isiOS8 : !/trident/img.test(navigator.userAgent) && !/edge/img.test(navigator.userAgent) && /OS 8/img.test(navigator.userAgent),
isiOS9 : !/trident/img.test(navigator.userAgent) && !/edge/img.test(navigator.userAgent) && /OS 9/img.test(navigator.userAgent),
isWin : /edge/img.test(navigator.userAgent) || /trident/img.test(navigator.userAgent),
isIE10 : /msie 10/img.test(navigator.userAgent),
isIE11 : (/windows nt/img.test(navigator.userAgent) && /trident/img.test(navigator.userAgent)),

isWebkit : !/edge/img.test(navigator.userAgent) && !$.isWinPhone && !/trident/img.test(navigator.userAgent) && /webkit/img.test(navigator.userAgent),
isDesktop : !(/mobile/img.test(navigator.userAgent)),
isSafari : (!/Chrome/img.test(navigator.userAgent) && /Safari/img.test(navigator.userAgent) && !/android/img.test(navigator.userAgent)),
isChrome : /Chrome/img.test(navigator.userAgent),
isNativeAndroid : (/android/i.test(navigator.userAgent) && /webkit/i.test(navigator.userAgent) && !/chrome/i.test(navigator.userAgent))
isSafari : (!/edge/img.test(navigator.userAgent) && !/Chrome/img.test(navigator.userAgent) && /Safari/img.test(navigator.userAgent) && !/android/img.test(navigator.userAgent)),

isChrome : !/trident/img.test(navigator.userAgent) && !/edge/img.test(navigator.userAgent) && /Chrome/img.test(navigator.userAgent),

isNativeAndroid : ((/samsung/img.test(navigator.userAgent) || /Galaxy Nexus/img.test(navigator.userAgent) || /HTC/img.test(navigator.userAgent) || /LG/img.test(navigator.userAgent)) && !/trident/img.test(navigator.userAgent) && !/edge/img.test(navigator.userAgent) && /android/i.test(navigator.userAgent) && /webkit/i.test(navigator.userAgent))
});
})();

0 comments on commit 9e03124

Please sign in to comment.