Version 0.6.38, fix for safari2-.

[pettanr/clientJs.git] / 0.6.x / js / core / 01_XUa.js

diff --git a/0.6.x/js/core/01_XUa.js b/0.6.x/js/core/01_XUa.js
index c0a34b4..7296b60 100644 (file)
--- a/0.6.x/js/core/01_XUa.js
+++ b/0.6.x/js/core/01_XUa.js
@@ -1,7 +1,7 @@
+\r
 /*\r
  * UA\r
  */\r
-\r
 X.UA = (function( n, undefined ){\r
        var acme = {},\r
                dua  = n.userAgent,\r
@@ -28,7 +28,20 @@ X.UA = (function( n, undefined ){
        i = Math.max(dav.indexOf("WebKit"), dav.indexOf("Safari"), 0);\r
        if( i && !acme.Chrome ){\r
                acme.Safari = parseFloat( dav.split("Version/")[1] );\r
-               if( !acme.Safari || parseFloat(dav.substr( i + 7 )) <= 419.3 ){\r
+               i = parseFloat(dav.substr( i + 7 ));\r
+               if( !acme.Safari && i < 100 ){\r
+                       acme.Safari = 1;\r
+               };\r
+               if( !acme.Safari && i < 125 ){\r
+                       acme.Safari = 1.1;\r
+               };\r
+               if( !acme.Safari && i < 312 ){\r
+                       acme.Safari = 1.2;\r
+               };\r
+               if( !acme.Safari && i < 412 ){\r
+                       acme.Safari = 1.3;\r
+               };\r
+               if( !acme.Safari && i <= 419.3 ){\r
                        acme.Safari = 2;\r
                };\r
        };\r
@@ -39,8 +52,13 @@ X.UA.Android  = navigator.userAgent.toLowerCase().indexOf( 'android' ) !== -1;
 X.UA.iOS      = navigator.userAgent.toLowerCase().indexOf( 'iphone' ) !== -1 ||\r
                                navigator.userAgent.toLowerCase().indexOf( 'ipad' ) !== -1 ||\r
                                navigator.userAgent.toLowerCase().indexOf( 'ipod' ) !== -1;\r
+X.UA.IEMobile = navigator.userAgent.toLowerCase().indexOf( 'iemobile' ) !== -1 ||\r
+                               ( X.UA.IE && navigator.userAgent.toLowerCase().indexOf( 'windows phone' ) !== -1 );\r
 X.UA.TouchPad = navigator.userAgent.toLowerCase().indexOf( 'hp-tablet' ) !== -1;\r
 \r
+//http://www.useragentstring.com/pages/Iris/\r
+X.UA.Iris     = navigator.userAgent.toLowerCase().indexOf( 'iris' ) !== -1;\r
+\r
 X.UA.EInk =\r
        // Kobo Mozilla/5.0 (Linux; U; Android 2.0; en-us;) AppleWebKit/533.1 (KHTML, like Gecko) Verson/4.0 Mobile Safari/533.1 (Kobo Touch)\r
        navigator.userAgent.indexOf( 'Kobo' ) !== -1 ||\r
@@ -50,3 +68,28 @@ X.UA.EInk =
        navigator.userAgent.indexOf( 'EBRD' ) !== -1;\r
 \r
 if( X.UA.IE && X.UA.IE < 10 ) X.UA.ActiveX = !!window[ 'ActiveXObject' ];\r
+\r
+X.inObject = X.UA.IE && X.UA.IE < 5 ?\r
+       (function( name, obj ){\r
+               var p;\r
+               if( obj[ name ] ) return true;\r
+               name += ''; // 数値も許可\r
+               for( p in obj ){\r
+                       if( p === name ) return true;\r
+               };\r
+               return false;\r
+       }) :\r
+       new Function( 'a,b', 'return a in b' );\r
+       \r
+\r
+// Safari 3.1 未満は開発コンソールがない！\r
+// http://shimax.cocolog-nifty.com/search/2006/09/safarijavascrip_c54d.html\r
+if( X.UA.Safari && X.UA.WebKit < 525.13 ){     \r
+       window.onerror = function( x, y, z ){\r
+               var n = String.fromCharCode( 10 );\r
+           alert('window.onerrorによるエラーの捕捉:' + n + x + n + y + 'の' + z + '行目付近です。');\r
+           return true;\r
+       };\r
+};\r
+\r
+\r