Skip to content

Commit 1fe20df

Browse files
gabcebgabceb
committed
Modified min version
Fixed number of test on test.js now that we added mobile and desktop flags Updated test jquery browser file
1 parent 0cf7d33 commit 1fe20df

File tree

3 files changed

+34
-24
lines changed

3 files changed

+34
-24
lines changed

‎dist/jquery.browser.min.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
*
1111
* Released under the MIT license
1212
*
13-
* Date: 05-01-2014
14-
*/!function(a,b){"use strict";var c,d;if(a.uaMatch=function(a){a=a.toLowerCase();var b=/(opr)[\/]([\w.]+)/.exec(a)||/(chrome)[ \/]([\w.]+)/.exec(a)||/(version)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("trident")>=0&&/(rv)(?::| )([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[],c=/(ipad)/.exec(a)||/(iphone)/.exec(a)||/(android)/.exec(a)||/(windows phone)/.exec(a)||/(win)/.exec(a)||/(mac)/.exec(a)||/(linux)/.exec(a)||[];return{browser:b[3]||b[1]||"",version:b[2]||"0",platform:c[0]||""}},c=a.uaMatch(b.navigator.userAgent),d={},c.browser&&(d[c.browser]=!0,d.version=c.version,d.versionNumber=parseInt(c.version)),c.platform&&(d[c.platform]=!0),(d.chrome||d.opr||d.safari)&&(d.webkit=!0),d.rv){var e="msie";c.browser=e,d[e]=!0}if(d.opr){var f="opera";c.browser=f,d[f]=!0}if(d.safari&&d.android){var g="android";c.browser=g,d[g]=!0}d.name=c.browser,d.platform=c.platform,a.browser=d}(jQuery,window);
13+
* Date: 19-03-2014
14+
*/!function(a,b){"use strict";var c,d;if(a.uaMatch=function(a){a=a.toLowerCase();var b=/(opr)[\/]([\w.]+)/.exec(a)||/(chrome)[ \/]([\w.]+)/.exec(a)||/(version)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("trident")>=0&&/(rv)(?::| )([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[],c=/(ipad)/.exec(a)||/(iphone)/.exec(a)||/(android)/.exec(a)||/(windows phone)/.exec(a)||/(win)/.exec(a)||/(mac)/.exec(a)||/(linux)/.exec(a)||[];return{browser:b[3]||b[1]||"",version:b[2]||"0",platform:c[0]||""}},c=a.uaMatch(b.navigator.userAgent),d={},c.browser&&(d[c.browser]=!0,d.version=c.version,d.versionNumber=parseInt(c.version)),c.platform&&(d[c.platform]=!0),(d.android||d.ipad||d.iphone||d["windows phone"])&&(d.mobile=!0),(d.mac||d.linux||d.win)&&(d.desktop=!0),(d.chrome||d.opr||d.safari)&&(d.webkit=!0),d.rv){var e="msie";c.browser=e,d[e]=!0}if(d.opr){var f="opera";c.browser=f,d[f]=!0}if(d.safari&&d.android){var g="android";c.browser=g,d[g]=!0}d.name=c.browser,d.platform=c.platform,a.browser=d}(jQuery,window);

‎test/src/jquery.browser.js‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,23 @@ browser = {};
5353
if ( matched.browser ) {
5454
browser[ matched.browser ] = true;
5555
browser.version = matched.version;
56-
browser.versionNumber = parseInt(matched.version);
56+
browser.versionNumber = parseInt(matched.version);
5757
}
5858

5959
if ( matched.platform ) {
6060
browser[ matched.platform ] = true;
6161
}
6262

63+
// These are all considered mobile platforms, meaning they run a mobile browser
64+
if ( browser.android || browser.ipad || browser.iphone || browser[ "windows phone" ] ) {
65+
browser.mobile = true;
66+
}
67+
68+
// These are all considered desktop platforms, meaning they run a desktop browser
69+
if ( browser.mac || browser.linux || browser.win ) {
70+
browser.desktop = true;
71+
}
72+
6373
// Chrome, Opera 15+ and Safari are webkit based browsers
6474
if ( browser.chrome || browser.opr || browser.safari ) {
6575
browser.webkit = true;

‎test/test.js‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ ua = {
7979
}
8080
};
8181

82-
casper.test.begin("when using Chrome on Windows", 6, function(test) {
82+
casper.test.begin("when using Chrome on Windows", 7, function(test) {
8383
casper.userAgent(ua.chrome.windows);
8484

8585
casper.start(test_url).then(function(){
@@ -103,7 +103,7 @@ casper.test.begin("when using Chrome on Windows", 6, function(test) {
103103
});
104104
});
105105

106-
casper.test.begin("when using Chrome on Mac", 6, function(test) {
106+
casper.test.begin("when using Chrome on Mac", 7, function(test) {
107107
casper.userAgent(ua.chrome.mac);
108108

109109
casper.start(test_url).then(function(){
@@ -127,7 +127,7 @@ casper.test.begin("when using Chrome on Mac", 6, function(test) {
127127
});
128128
});
129129

130-
casper.test.begin("when using Chrome on an Android device", 6, function(test) {
130+
casper.test.begin("when using Chrome on an Android device", 7, function(test) {
131131
casper.userAgent(ua.chrome.android);
132132

133133
casper.start(test_url).then(function(){
@@ -151,7 +151,7 @@ casper.test.begin("when using Chrome on an Android device", 6, function(test) {
151151
});
152152
});
153153

154-
casper.test.begin("when using Chrome on Linux", 6, function(test) {
154+
casper.test.begin("when using Chrome on Linux", 7, function(test) {
155155
casper.userAgent(ua.chrome.linux);
156156

157157
casper.start(test_url).then(function(){
@@ -175,7 +175,7 @@ casper.test.begin("when using Chrome on Linux", 6, function(test) {
175175
});
176176
});
177177

178-
casper.test.begin("when using Firefox on Windows", 6, function(test) {
178+
casper.test.begin("when using Firefox on Windows", 7, function(test) {
179179
casper.userAgent(ua.firefox.windows);
180180

181181
casper.start(test_url).then(function(){
@@ -200,7 +200,7 @@ casper.test.begin("when using Firefox on Windows", 6, function(test) {
200200
});
201201
});
202202

203-
casper.test.begin("when using Firefox on Mac", 6, function(test) {
203+
casper.test.begin("when using Firefox on Mac", 7, function(test) {
204204
casper.userAgent(ua.firefox.mac);
205205

206206
casper.start(test_url).then(function(){
@@ -225,7 +225,7 @@ casper.test.begin("when using Firefox on Mac", 6, function(test) {
225225
});
226226
});
227227

228-
casper.test.begin("when using Firefox on Linux", 6, function(test) {
228+
casper.test.begin("when using Firefox on Linux", 7, function(test) {
229229
casper.userAgent(ua.firefox.linux);
230230

231231
casper.start(test_url).then(function(){
@@ -250,7 +250,7 @@ casper.test.begin("when using Firefox on Linux", 6, function(test) {
250250
});
251251
});
252252

253-
casper.test.begin("when using Safari on Mac", 6, function(test) {
253+
casper.test.begin("when using Safari on Mac", 7, function(test) {
254254
casper.userAgent(ua.safari.mac);
255255

256256
casper.start(test_url).then(function(){
@@ -274,7 +274,7 @@ casper.test.begin("when using Safari on Mac", 6, function(test) {
274274
});
275275
});
276276

277-
casper.test.begin("when using Safari on iPad", 6, function(test) {
277+
casper.test.begin("when using Safari on iPad", 7, function(test) {
278278
casper.userAgent(ua.safari.ipad);
279279

280280
casper.start(test_url).then(function(){
@@ -298,7 +298,7 @@ casper.test.begin("when using Safari on iPad", 6, function(test) {
298298
});
299299
});
300300

301-
casper.test.begin("when using Safari on iPhone", 6, function(test) {
301+
casper.test.begin("when using Safari on iPhone", 7, function(test) {
302302
casper.userAgent(ua.safari.iphone);
303303

304304
casper.start(test_url).then(function(){
@@ -322,7 +322,7 @@ casper.test.begin("when using Safari on iPhone", 6, function(test) {
322322
});
323323
});
324324

325-
casper.test.begin("when using IE9", 6, function(test) {
325+
casper.test.begin("when using IE9", 7, function(test) {
326326
casper.userAgent(ua.ie.windows.v_9);
327327

328328
casper.start(test_url).then(function(){
@@ -347,7 +347,7 @@ casper.test.begin("when using IE9", 6, function(test) {
347347
});
348348
});
349349

350-
casper.test.begin("when using IE10", 6, function(test) {
350+
casper.test.begin("when using IE10", 7, function(test) {
351351
casper.userAgent(ua.ie.windows.v_10);
352352

353353
casper.start(test_url).then(function(){
@@ -372,7 +372,7 @@ casper.test.begin("when using IE10", 6, function(test) {
372372
});
373373
});
374374

375-
casper.test.begin("when using IE11", 6, function(test) {
375+
casper.test.begin("when using IE11", 7, function(test) {
376376
casper.userAgent(ua.ie.windows.v_11);
377377

378378
casper.start(test_url).then(function(){
@@ -397,7 +397,7 @@ casper.test.begin("when using IE11", 6, function(test) {
397397
});
398398
});
399399

400-
casper.test.begin("when using IE10 on a Windows Phone", 6, function(test) {
400+
casper.test.begin("when using IE10 on a Windows Phone", 7, function(test) {
401401
casper.userAgent(ua.ie.win_phone.v_10);
402402

403403
casper.start(test_url).then(function(){
@@ -422,7 +422,7 @@ casper.test.begin("when using IE10 on a Windows Phone", 6, function(test) {
422422
});
423423
});
424424

425-
casper.test.begin("when using Opera 15+ on Windows", 6, function(test) {
425+
casper.test.begin("when using Opera 15+ on Windows", 7, function(test) {
426426
casper.userAgent(ua.opera.v_15.windows);
427427

428428
casper.start(test_url).then(function(){
@@ -447,7 +447,7 @@ casper.test.begin("when using Opera 15+ on Windows", 6, function(test) {
447447
});
448448
});
449449

450-
casper.test.begin("when using Opera 15+ on Mac", 6, function(test) {
450+
casper.test.begin("when using Opera 15+ on Mac", 7, function(test) {
451451
casper.userAgent(ua.opera.v_15.mac);
452452

453453
casper.start(test_url).then(function(){
@@ -472,7 +472,7 @@ casper.test.begin("when using Opera 15+ on Mac", 6, function(test) {
472472
});
473473
});
474474

475-
casper.test.begin("when using Opera 10 on Windows", 6, function(test) {
475+
casper.test.begin("when using Opera 10 on Windows", 7, function(test) {
476476
casper.userAgent(ua.opera.v_10.windows);
477477

478478
casper.start(test_url).then(function(){
@@ -497,7 +497,7 @@ casper.test.begin("when using Opera 10 on Windows", 6, function(test) {
497497
});
498498
});
499499

500-
casper.test.begin("when using Opera 10 on Mac", 6, function(test) {
500+
casper.test.begin("when using Opera 10 on Mac", 7, function(test) {
501501
casper.userAgent(ua.opera.v_10.mac);
502502

503503
casper.start(test_url).then(function(){
@@ -522,7 +522,7 @@ casper.test.begin("when using Opera 10 on Mac", 6, function(test) {
522522
});
523523
});
524524

525-
casper.test.begin("when using Opera 12.11 on Windows", 6, function(test) {
525+
casper.test.begin("when using Opera 12.11 on Windows", 7, function(test) {
526526
casper.userAgent(ua.opera.v_12.windows);
527527

528528
casper.start(test_url).then(function(){
@@ -547,7 +547,7 @@ casper.test.begin("when using Opera 12.11 on Windows", 6, function(test) {
547547
});
548548
});
549549

550-
casper.test.begin("when using Opera 12.11 on Mac", 6, function(test) {
550+
casper.test.begin("when using Opera 12.11 on Mac", 7, function(test) {
551551
casper.userAgent(ua.opera.v_12.mac);
552552

553553
casper.start(test_url).then(function(){
@@ -572,7 +572,7 @@ casper.test.begin("when using Opera 12.11 on Mac", 6, function(test) {
572572
});
573573
});
574574

575-
casper.test.begin("when using Android 4.4 stock browser on Android", 5, function(test) {
575+
casper.test.begin("when using Android 4.4 stock browser on Android", 6, function(test) {
576576
casper.userAgent(ua.android.v_4_4.android);
577577

578578
casper.start(test_url).then(function(){

0 commit comments

Comments
 (0)