|
12 | 12 | * |
13 | 13 | * Date: 12-12-2014 |
14 | 14 | */ |
15 | | -/*global window: false */ |
| 15 | +/*global window: false, jQBrowser */ |
16 | 16 |
|
17 | 17 | (function (factory) { |
18 | 18 | if (typeof define === 'function' && define.amd) { |
|
30 | 30 | }(function(jQuery) { |
31 | 31 | "use strict"; |
32 | 32 |
|
33 | | - var matched, browser; |
34 | | - |
35 | 33 | window.jQBrowser = function( ua ) { |
36 | 34 | // If an UA is not provided, default to the current browser UA. |
37 | 35 | if ( ua === undefined ) { |
|
75 | 73 | platform: platform_match[ 0 ] || "" |
76 | 74 | }; |
77 | 75 |
|
78 | | - if ( matched.browser ) { |
79 | | - browser[ matched.browser ] = true; |
80 | | - browser.version = matched.version; |
81 | | - browser.versionNumber = parseInt(matched.versionNumber, 10); |
82 | | - } |
83 | | - |
84 | | - if ( matched.platform ) { |
85 | | - browser[ matched.platform ] = true; |
86 | | - } |
| 76 | + if ( matched.browser ) { |
| 77 | + browser[ matched.browser ] = true; |
| 78 | + browser.version = matched.version; |
| 79 | + browser.versionNumber = parseInt(matched.versionNumber, 10); |
| 80 | + } |
87 | 81 |
|
88 | | - // These are all considered mobile platforms, meaning they run a mobile browser |
89 | | - if ( browser.android || browser.bb || browser.blackberry || browser.ipad || browser.iphone || |
90 | | - browser.ipod || browser.kindle || browser.playbook || browser.silk || browser[ "windows phone" ]) { |
91 | | - browser.mobile = true; |
92 | | - } |
| 82 | + if ( matched.platform ) { |
| 83 | + browser[ matched.platform ] = true; |
| 84 | + } |
93 | 85 |
|
94 | | - // These are all considered desktop platforms, meaning they run a desktop browser |
95 | | - if ( browser.cros || browser.mac || browser.linux || browser.win ) { |
96 | | - browser.desktop = true; |
97 | | - } |
| 86 | + // These are all considered mobile platforms, meaning they run a mobile browser |
| 87 | + if ( browser.android || browser.bb || browser.blackberry || browser.ipad || browser.iphone || |
| 88 | + browser.ipod || browser.kindle || browser.playbook || browser.silk || browser[ "windows phone" ]) { |
| 89 | + browser.mobile = true; |
| 90 | + } |
98 | 91 |
|
99 | | - // Chrome, Opera 15+ and Safari are webkit based browsers |
100 | | - if ( browser.chrome || browser.opr || browser.safari ) { |
101 | | - browser.webkit = true; |
102 | | - } |
| 92 | + // These are all considered desktop platforms, meaning they run a desktop browser |
| 93 | + if ( browser.cros || browser.mac || browser.linux || browser.win ) { |
| 94 | + browser.desktop = true; |
| 95 | + } |
103 | 96 |
|
104 | | - // IE11 has a new token so we will assign it msie to avoid breaking changes |
105 | | - // IE12 disguises itself as Chrome, but adds a new Edge token. |
106 | | - if ( browser.rv || browser.edge ) { |
107 | | - var ie = "msie"; |
| 97 | + // Chrome, Opera 15+ and Safari are webkit based browsers |
| 98 | + if ( browser.chrome || browser.opr || browser.safari ) { |
| 99 | + browser.webkit = true; |
| 100 | + } |
108 | 101 |
|
109 | | - matched.browser = ie; |
110 | | - browser[ie] = true; |
111 | | - } |
| 102 | + // IE11 has a new token so we will assign it msie to avoid breaking changes |
| 103 | + // IE12 disguises itself as Chrome, but adds a new Edge token. |
| 104 | + if ( browser.rv || browser.edge ) { |
| 105 | + var ie = "msie"; |
112 | 106 |
|
113 | | - // Blackberry browsers are marked as Safari on BlackBerry |
114 | | - if ( browser.safari && browser.blackberry ) { |
115 | | - var blackberry = "blackberry"; |
| 107 | + matched.browser = ie; |
| 108 | + browser[ie] = true; |
| 109 | + } |
116 | 110 |
|
117 | | - matched.browser = blackberry; |
118 | | - browser[blackberry] = true; |
119 | | - } |
| 111 | + // Blackberry browsers are marked as Safari on BlackBerry |
| 112 | + if ( browser.safari && browser.blackberry ) { |
| 113 | + var blackberry = "blackberry"; |
120 | 114 |
|
121 | | - // Playbook browsers are marked as Safari on Playbook |
122 | | - if ( browser.safari && browser.playbook ) { |
123 | | - var playbook = "playbook"; |
| 115 | + matched.browser = blackberry; |
| 116 | + browser[blackberry] = true; |
| 117 | + } |
124 | 118 |
|
125 | | - matched.browser = playbook; |
126 | | - browser[playbook] = true; |
127 | | - } |
| 119 | + // Playbook browsers are marked as Safari on Playbook |
| 120 | + if ( browser.safari && browser.playbook ) { |
| 121 | + var playbook = "playbook"; |
128 | 122 |
|
129 | | - // BB10 is a newer OS version of BlackBerry |
130 | | - if ( browser.bb ) { |
131 | | - var bb = "blackberry"; |
| 123 | + matched.browser = playbook; |
| 124 | + browser[playbook] = true; |
| 125 | + } |
132 | 126 |
|
133 | | - matched.browser = bb; |
134 | | - browser[bb] = true; |
135 | | - } |
| 127 | + // BB10 is a newer OS version of BlackBerry |
| 128 | + if ( browser.bb ) { |
| 129 | + var bb = "blackberry"; |
136 | 130 |
|
137 | | - // Opera 15+ are identified as opr |
138 | | - if ( browser.opr ) { |
139 | | - var opera = "opera"; |
| 131 | + matched.browser = bb; |
| 132 | + browser[bb] = true; |
| 133 | + } |
140 | 134 |
|
141 | | - matched.browser = opera; |
142 | | - browser[opera] = true; |
143 | | - } |
| 135 | + // Opera 15+ are identified as opr |
| 136 | + if ( browser.opr ) { |
| 137 | + var opera = "opera"; |
144 | 138 |
|
145 | | - // Stock Android browsers are marked as Safari on Android. |
146 | | - if ( browser.safari && browser.android ) { |
147 | | - var android = "android"; |
| 139 | + matched.browser = opera; |
| 140 | + browser[opera] = true; |
| 141 | + } |
148 | 142 |
|
149 | | - matched.browser = android; |
150 | | - browser[android] = true; |
151 | | - } |
| 143 | + // Stock Android browsers are marked as Safari on Android. |
| 144 | + if ( browser.safari && browser.android ) { |
| 145 | + var android = "android"; |
152 | 146 |
|
153 | | - // Kindle browsers are marked as Safari on Kindle |
154 | | - if ( browser.safari && browser.kindle ) { |
155 | | - var kindle = "kindle"; |
| 147 | + matched.browser = android; |
| 148 | + browser[android] = true; |
| 149 | + } |
156 | 150 |
|
157 | | - matched.browser = kindle; |
158 | | - browser[kindle] = true; |
159 | | - } |
| 151 | + // Kindle browsers are marked as Safari on Kindle |
| 152 | + if ( browser.safari && browser.kindle ) { |
| 153 | + var kindle = "kindle"; |
160 | 154 |
|
161 | | - // Kindle Silk browsers are marked as Safari on Kindle |
162 | | - if ( browser.safari && browser.silk ) { |
163 | | - var silk = "silk"; |
| 155 | + matched.browser = kindle; |
| 156 | + browser[kindle] = true; |
| 157 | + } |
164 | 158 |
|
165 | | - matched.browser = silk; |
166 | | - browser[silk] = true; |
167 | | - } |
| 159 | + // Kindle Silk browsers are marked as Safari on Kindle |
| 160 | + if ( browser.safari && browser.silk ) { |
| 161 | + var silk = "silk"; |
168 | 162 |
|
169 | | - // Assign the name and platform variable |
170 | | - browser.name = matched.browser; |
171 | | - browser.platform = matched.platform; |
172 | | - return browser; |
| 163 | + matched.browser = silk; |
| 164 | + browser[silk] = true; |
| 165 | + } |
173 | 166 |
|
| 167 | + // Assign the name and platform variable |
| 168 | + browser.name = matched.browser; |
| 169 | + browser.platform = matched.platform; |
| 170 | + return browser; |
174 | 171 | }; |
175 | 172 |
|
176 | 173 | // Only assign to jQuery.browser if jQuery is loaded |
|
0 commit comments