From 1d235da0901f91f15c9331acfe91992743685be2 Mon Sep 17 00:00:00 2001 From: Gabriel Cebrian Date: Sun, 30 Mar 2014 18:09:29 -0700 Subject: [PATCH] Tabbed js code. Code now uses 2 Spaces instead of Tabs. Fixes #26 (at least on my machine) --- dist/jquery.browser.js | 191 ++++++++++++++++++------------------- test/src/jquery.browser.js | 191 ++++++++++++++++++------------------- 2 files changed, 190 insertions(+), 192 deletions(-) diff --git a/dist/jquery.browser.js b/dist/jquery.browser.js index c87f79c..01c2bee 100644 --- a/dist/jquery.browser.js +++ b/dist/jquery.browser.js @@ -14,100 +14,99 @@ */ (function( jQuery, window, undefined ) { -"use strict"; - -var matched, browser; - -jQuery.uaMatch = function( ua ) { - ua = ua.toLowerCase(); - - var match = /(opr)[\/]([\w.]+)/.exec( ua ) || - /(chrome)[ \/]([\w.]+)/.exec( ua ) || - /(version)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec( ua ) || - /(webkit)[ \/]([\w.]+)/.exec( ua ) || - /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) || - /(msie) ([\w.]+)/.exec( ua ) || - ua.indexOf("trident") >= 0 && /(rv)(?::| )([\w.]+)/.exec( ua ) || - ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) || - []; - - var platform_match = /(ipad)/.exec( ua ) || - /(iphone)/.exec( ua ) || - /(android)/.exec( ua ) || - /(windows phone)/.exec( ua ) || - /(win)/.exec( ua ) || - /(mac)/.exec( ua ) || - /(linux)/.exec( ua ) || - /(cros)/i.exec( ua ) || - []; - - return { - browser: match[ 3 ] || match[ 1 ] || "", - version: match[ 2 ] || "0", - platform: platform_match[ 0 ] || "" - }; -}; - -matched = jQuery.uaMatch( window.navigator.userAgent ); -browser = {}; - -if ( matched.browser ) { - browser[ matched.browser ] = true; - browser.version = matched.version; - browser.versionNumber = parseInt(matched.version); -} - -if ( matched.platform ) { - browser[ matched.platform ] = true; -} - -// These are all considered mobile platforms, meaning they run a mobile browser -if ( browser.android || browser.ipad || browser.iphone || browser[ "windows phone" ] ) { - browser.mobile = true; -} - -// These are all considered desktop platforms, meaning they run a desktop browser -if ( browser.cros || browser.mac || browser.linux || browser.win ) { - browser.desktop = true; -} - -// Chrome, Opera 15+ and Safari are webkit based browsers -if ( browser.chrome || browser.opr || browser.safari ) { - browser.webkit = true; -} - -// IE11 has a new token so we will assign it msie to avoid breaking changes -if ( browser.rv ) -{ - var ie = "msie"; - - matched.browser = ie; - browser[ie] = true; -} - -// Opera 15+ are identified as opr -if ( browser.opr ) -{ - var opera = "opera"; - - matched.browser = opera; - browser[opera] = true; -} - -// Stock Android browsers are marked as Safari on Android. -if ( browser.safari && browser.android ) -{ - var android = "android"; - - matched.browser = android; - browser[android] = true; -} - -// Assign the name and platform variable -browser.name = matched.browser; -browser.platform = matched.platform; - - -jQuery.browser = browser; - + "use strict"; + + var matched, browser; + + jQuery.uaMatch = function( ua ) { + ua = ua.toLowerCase(); + + var match = /(opr)[\/]([\w.]+)/.exec( ua ) || + /(chrome)[ \/]([\w.]+)/.exec( ua ) || + /(version)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec( ua ) || + /(webkit)[ \/]([\w.]+)/.exec( ua ) || + /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) || + /(msie) ([\w.]+)/.exec( ua ) || + ua.indexOf("trident") >= 0 && /(rv)(?::| )([\w.]+)/.exec( ua ) || + ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) || + []; + + var platform_match = /(ipad)/.exec( ua ) || + /(iphone)/.exec( ua ) || + /(android)/.exec( ua ) || + /(windows phone)/.exec( ua ) || + /(win)/.exec( ua ) || + /(mac)/.exec( ua ) || + /(linux)/.exec( ua ) || + /(cros)/i.exec( ua ) || + []; + + return { + browser: match[ 3 ] || match[ 1 ] || "", + version: match[ 2 ] || "0", + platform: platform_match[ 0 ] || "" + }; + }; + + matched = jQuery.uaMatch( window.navigator.userAgent ); + browser = {}; + + if ( matched.browser ) { + browser[ matched.browser ] = true; + browser.version = matched.version; + browser.versionNumber = parseInt(matched.version); + } + + if ( matched.platform ) { + browser[ matched.platform ] = true; + } + + // These are all considered mobile platforms, meaning they run a mobile browser + if ( browser.android || browser.ipad || browser.iphone || browser[ "windows phone" ] ) { + browser.mobile = true; + } + + // These are all considered desktop platforms, meaning they run a desktop browser + if ( browser.cros || browser.mac || browser.linux || browser.win ) { + browser.desktop = true; + } + + // Chrome, Opera 15+ and Safari are webkit based browsers + if ( browser.chrome || browser.opr || browser.safari ) { + browser.webkit = true; + } + + // IE11 has a new token so we will assign it msie to avoid breaking changes + if ( browser.rv ) + { + var ie = "msie"; + + matched.browser = ie; + browser[ie] = true; + } + + // Opera 15+ are identified as opr + if ( browser.opr ) + { + var opera = "opera"; + + matched.browser = opera; + browser[opera] = true; + } + + // Stock Android browsers are marked as Safari on Android. + if ( browser.safari && browser.android ) + { + var android = "android"; + + matched.browser = android; + browser[android] = true; + } + + // Assign the name and platform variable + browser.name = matched.browser; + browser.platform = matched.platform; + + + jQuery.browser = browser; })( jQuery, window ); \ No newline at end of file diff --git a/test/src/jquery.browser.js b/test/src/jquery.browser.js index c87f79c..01c2bee 100644 --- a/test/src/jquery.browser.js +++ b/test/src/jquery.browser.js @@ -14,100 +14,99 @@ */ (function( jQuery, window, undefined ) { -"use strict"; - -var matched, browser; - -jQuery.uaMatch = function( ua ) { - ua = ua.toLowerCase(); - - var match = /(opr)[\/]([\w.]+)/.exec( ua ) || - /(chrome)[ \/]([\w.]+)/.exec( ua ) || - /(version)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec( ua ) || - /(webkit)[ \/]([\w.]+)/.exec( ua ) || - /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) || - /(msie) ([\w.]+)/.exec( ua ) || - ua.indexOf("trident") >= 0 && /(rv)(?::| )([\w.]+)/.exec( ua ) || - ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) || - []; - - var platform_match = /(ipad)/.exec( ua ) || - /(iphone)/.exec( ua ) || - /(android)/.exec( ua ) || - /(windows phone)/.exec( ua ) || - /(win)/.exec( ua ) || - /(mac)/.exec( ua ) || - /(linux)/.exec( ua ) || - /(cros)/i.exec( ua ) || - []; - - return { - browser: match[ 3 ] || match[ 1 ] || "", - version: match[ 2 ] || "0", - platform: platform_match[ 0 ] || "" - }; -}; - -matched = jQuery.uaMatch( window.navigator.userAgent ); -browser = {}; - -if ( matched.browser ) { - browser[ matched.browser ] = true; - browser.version = matched.version; - browser.versionNumber = parseInt(matched.version); -} - -if ( matched.platform ) { - browser[ matched.platform ] = true; -} - -// These are all considered mobile platforms, meaning they run a mobile browser -if ( browser.android || browser.ipad || browser.iphone || browser[ "windows phone" ] ) { - browser.mobile = true; -} - -// These are all considered desktop platforms, meaning they run a desktop browser -if ( browser.cros || browser.mac || browser.linux || browser.win ) { - browser.desktop = true; -} - -// Chrome, Opera 15+ and Safari are webkit based browsers -if ( browser.chrome || browser.opr || browser.safari ) { - browser.webkit = true; -} - -// IE11 has a new token so we will assign it msie to avoid breaking changes -if ( browser.rv ) -{ - var ie = "msie"; - - matched.browser = ie; - browser[ie] = true; -} - -// Opera 15+ are identified as opr -if ( browser.opr ) -{ - var opera = "opera"; - - matched.browser = opera; - browser[opera] = true; -} - -// Stock Android browsers are marked as Safari on Android. -if ( browser.safari && browser.android ) -{ - var android = "android"; - - matched.browser = android; - browser[android] = true; -} - -// Assign the name and platform variable -browser.name = matched.browser; -browser.platform = matched.platform; - - -jQuery.browser = browser; - + "use strict"; + + var matched, browser; + + jQuery.uaMatch = function( ua ) { + ua = ua.toLowerCase(); + + var match = /(opr)[\/]([\w.]+)/.exec( ua ) || + /(chrome)[ \/]([\w.]+)/.exec( ua ) || + /(version)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec( ua ) || + /(webkit)[ \/]([\w.]+)/.exec( ua ) || + /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) || + /(msie) ([\w.]+)/.exec( ua ) || + ua.indexOf("trident") >= 0 && /(rv)(?::| )([\w.]+)/.exec( ua ) || + ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) || + []; + + var platform_match = /(ipad)/.exec( ua ) || + /(iphone)/.exec( ua ) || + /(android)/.exec( ua ) || + /(windows phone)/.exec( ua ) || + /(win)/.exec( ua ) || + /(mac)/.exec( ua ) || + /(linux)/.exec( ua ) || + /(cros)/i.exec( ua ) || + []; + + return { + browser: match[ 3 ] || match[ 1 ] || "", + version: match[ 2 ] || "0", + platform: platform_match[ 0 ] || "" + }; + }; + + matched = jQuery.uaMatch( window.navigator.userAgent ); + browser = {}; + + if ( matched.browser ) { + browser[ matched.browser ] = true; + browser.version = matched.version; + browser.versionNumber = parseInt(matched.version); + } + + if ( matched.platform ) { + browser[ matched.platform ] = true; + } + + // These are all considered mobile platforms, meaning they run a mobile browser + if ( browser.android || browser.ipad || browser.iphone || browser[ "windows phone" ] ) { + browser.mobile = true; + } + + // These are all considered desktop platforms, meaning they run a desktop browser + if ( browser.cros || browser.mac || browser.linux || browser.win ) { + browser.desktop = true; + } + + // Chrome, Opera 15+ and Safari are webkit based browsers + if ( browser.chrome || browser.opr || browser.safari ) { + browser.webkit = true; + } + + // IE11 has a new token so we will assign it msie to avoid breaking changes + if ( browser.rv ) + { + var ie = "msie"; + + matched.browser = ie; + browser[ie] = true; + } + + // Opera 15+ are identified as opr + if ( browser.opr ) + { + var opera = "opera"; + + matched.browser = opera; + browser[opera] = true; + } + + // Stock Android browsers are marked as Safari on Android. + if ( browser.safari && browser.android ) + { + var android = "android"; + + matched.browser = android; + browser[android] = true; + } + + // Assign the name and platform variable + browser.name = matched.browser; + browser.platform = matched.platform; + + + jQuery.browser = browser; })( jQuery, window ); \ No newline at end of file