OSDN Git Service

Fix the bug of X.NodeAnime.
[pettanr/clientJs.git] / 0.6.x / js / 01_core / 02_XUA.js
index c96fd6c..acf31f4 100644 (file)
  * @type {object}\r
  */\r
 var X_UA = X[ 'UA' ] = {},\r
-       X_UA_classNameForHTML = 'js-enabled ';\r
+       X_UA_classNameForHTML = '';\r
 \r
 (function(){\r
        var dua  = navigator.userAgent,\r
                dav  = navigator.appVersion,\r
                tv   = parseFloat(dav),\r
                sys  = navigator.platform,\r
-               tridentToVer, i, j, v;\r
+               tridentToVer, i, j, v, androidBrowserPCMode;\r
                \r
        console.log( ' userAgent  : ' + dua );\r
        console.log( '-' );\r
@@ -30,7 +30,7 @@ var X_UA = X[ 'UA' ] = {},
        \r
        if( sys.indexOf( 'iP' ) === 0 ){\r
 \r
-               v = dua.split( 'OS ' )[ 1 ].split( '_' );\r
+               v = dav.split( 'OS ' )[ 1 ].split( '_' );\r
                i = window.devicePixelRatio === 1;\r
                /**\r
                 * @alias X.UA.iOSMajor\r
@@ -51,78 +51,81 @@ var X_UA = X[ 'UA' ] = {},
                 * @alias X.UA.iOS\r
                 * @type {number}\r
                 */\r
-               X_UA[ 'iOS' ]  = X_UA[ 'iOSMajor' ] + X_UA[ 'iOSMinor' ]  / 10;\r
+               X_UA[ 'iOS' ]  = X_UA[ 'iOSMajor' ] + X_UA[ 'iOSMinor' ] / 10;\r
 \r
-               if( screen.width === screen.height * 1.5 || screen.width * 1.5 === screen.height ){\r
-                       v = true; // 4:3 model\r
-               };\r
-               \r
-               if( sys === 'iPhone' ){\r
-                       /**\r
-                        * @alias X.UA.iPhone\r
-                        * @type {boolean}\r
-                        */\r
-                       X_UA[ 'iPhone' ]  = true;\r
-                       if( v ){\r
+               // 4:3 model\r
+               v = screen.width === screen.height * 1.5 || screen.width * 1.5 === screen.height;\r
+\r
+               switch( sys ){\r
+                       case 'iPhone' :\r
+                       case 'iPhone Simulator' :\r
                                /**\r
-                                * iPhone4s以下\r
-                                * @alias X.UA.iPhone_4s\r
+                                * @alias X.UA.iPhone\r
                                 * @type {boolean}\r
                                 */\r
-                               X_UA[ 'iPhone_4s' ]  = true;\r
-                               \r
-                               if( i ){\r
+                               X_UA[ 'iPhone' ]  = true;\r
+                               if( v ){\r
                                        /**\r
-                                        * iPhone3GS以下\r
-                                        * @alias X.UA.iPhone_3GS\r
+                                        * iPhone4s以下\r
+                                        * @alias X.UA.iPhone_4s\r
                                         * @type {boolean}\r
                                         */\r
-                                       X_UA[ 'iPhone_3GS' ]  = true;\r
-                               };                              \r
-                       };\r
-\r
-                       //alert( 'iPhone ' + ( X_UA[ 'iPhone_3GS' ]  ? '3GS以下' : X_UA[ 'iPhone_4s' ]  ? '4s以下' : '5以上' ) );\r
-               };\r
-               if( sys === 'iPad' ){\r
-                       /**\r
-                        * @alias X.UA.iPad\r
-                        * @type {boolean}\r
-                        */\r
-                       X_UA[ 'iPad' ]    = true;\r
-                       if( i ){\r
+                                       X_UA[ 'iPhone_4s' ]  = true;\r
+                                       \r
+                                       if( i ){\r
+                                               /**\r
+                                                * iPhone3GS以下\r
+                                                * @alias X.UA.iPhone_3GS\r
+                                                * @type {boolean}\r
+                                                */\r
+                                               X_UA[ 'iPhone_3GS' ]  = true;\r
+                                       };                              \r
+                               };\r
+                               break;\r
+                       \r
+                       case 'iPad' :\r
+                       case 'iPad Simulator' :\r
                                /**\r
-                                * iPad2以下または初代iPad mini 以下\r
-                                * @alias X.UA.iPad_2Mini1\r
+                                * @alias X.UA.iPad\r
                                 * @type {boolean}\r
                                 */\r
-                               X_UA[ 'iPad_2Mini1' ]  = true;\r
-                       };\r
-               };\r
-               if( sys === 'iPod' ){\r
-                       /**\r
-                        * @alias X.UA.iPod\r
-                        * @type {boolean}\r
-                        */\r
-                       X_UA[ 'iPod' ]    = true;\r
-\r
-                       if( v ){\r
+                               X_UA[ 'iPad' ]    = true;\r
+                               if( i ){\r
+                                       /**\r
+                                        * iPad2以下または初代iPad mini 以下\r
+                                        * @alias X.UA.iPad_2Mini1\r
+                                        * @type {boolean}\r
+                                        */\r
+                                       X_UA[ 'iPad_2Mini1' ]  = true;\r
+                               };\r
+                               break;\r
+                       \r
+                       case 'iPod' :\r
+                       case 'iPod Simulator' : // 必要??\r
                                /**\r
-                                * iPod4以下\r
-                                * @alias X.UA.iPod_4\r
+                                * @alias X.UA.iPod\r
                                 * @type {boolean}\r
                                 */\r
-                               X_UA[ 'iPod_4' ]  = true;\r
-                               \r
-                               if( i ){\r
+                               X_UA[ 'iPod' ]    = true;\r
+       \r
+                               if( v ){\r
                                        /**\r
-                                        * iPod3以下\r
-                                        * @alias X.UA.iPod_3\r
+                                        * iPod4以下\r
+                                        * @alias X.UA.iPod_4\r
                                         * @type {boolean}\r
                                         */\r
-                                       X_UA[ 'iPod_3' ]  = true;\r
-                               };                              \r
-                       };\r
-                       //alert( 'iPod touch ' + ( X_UA[ 'iPod_3' ]  ? '3以下' : X_UA[ 'iPod_4' ] ? '4以下' : '5以上' ) );\r
+                                       X_UA[ 'iPod_4' ]  = true;\r
+                                       \r
+                                       if( i ){\r
+                                               /**\r
+                                                * iPod3以下\r
+                                                * @alias X.UA.iPod_3\r
+                                                * @type {boolean}\r
+                                                */\r
+                                               X_UA[ 'iPod_3' ]  = true;\r
+                                       };                              \r
+                               };\r
+                               break;\r
                };\r
                \r
                console.log( '>> iOS : ' + X_UA[ 'iOS' ]  );\r
@@ -155,14 +158,14 @@ var X_UA = X[ 'UA' ] = {},
                                 * @type {boolean}\r
                                 */\r
                                X_UA[ sys ] = true;\r
-                               \r
-                               if( v = dav.split( 'Windows NT 10' )[ 1 ] ){\r
+\r
+                               if( v = dua.split( 'Windows NT 10' )[ 1 ] ){\r
                                        switch( v.substr( 0, 2 ) ){\r
                                                case '.0' : v = 10; break;\r
                                                default : v = '?';\r
                                        };\r
                                } else\r
-                               if( v = dav.split( 'Windows NT ' )[ 1 ] ){\r
+                               if( v = dua.split( 'Windows NT ' )[ 1 ] ){\r
                                        switch( v.substr( 0, 3 ) ){\r
                                                case '6.3' : v = 8.1; break;\r
                                                case '6.2' : v = 8; break;\r
@@ -173,9 +176,9 @@ var X_UA = X[ 'UA' ] = {},
                                                case '5.0' : v = v.indexOf( '5.01' ) ? 2000 : '2kSP1'; break;\r
                                                case '4.0' : v = 'NT'; break;\r
                                                default : v = '?';\r
-                                       };                      \r
+                                       };      \r
                                } else\r
-                               if( v = dav.split( 'Windows ' )[ 1 ] ){\r
+                               if( v = dua.split( 'Windows ' )[ 1 ] ){\r
                                        switch( v.substr( 0, 2 ) ){\r
                                                case '98' : v = v.indexOf( '98; Win 9x 4.90' ) ? '98|98SE' : 'ME'; break;\r
                                                case '95' : v = 95; break;\r
@@ -230,9 +233,8 @@ var X_UA = X[ 'UA' ] = {},
                 * @alias X.UA.Linux\r
                 * @type {boolean}\r
                 */\r
-               X_UA[ 'Linux' ]  = true;\r
-\r
-               if( v = dua.split( 'Android ' )[ 1 ] ){\r
+               if( ( v = dua.split( 'Android ' )[ 1 ] ) ||\r
+                       ( v = sys.split( 'Android ' )[ 1 ] ) ){ // PCモードの Android Firefox では platform に Android 0.0.0 が存在\r
                        v = v.split( '.' );\r
                        /**\r
                         * @alias X.UA.AndroidMajor\r
@@ -262,6 +264,36 @@ var X_UA = X[ 'UA' ] = {},
                         */\r
                        X_UA[ 'Android' ] = X_UA[ 'AndroidMajor' ] + X_UA[ 'AndroidMinor' ] / 10;\r
                        console.log( '>> Android : ' + X_UA[ 'Android' ]  );\r
+               } else\r
+               if( ( sys === 'Linux armv7l' || sys === 'Linux i686' ) && window.ontouchstart !== undefined && ( v = parseFloat( dua.split( 'WebKit\/' )[ 1 ] ) ) ){\r
+                       // https://ja.wikipedia.org/wiki/WebKit\r
+                       // http://www.au.kddi.com/developer/android/kishu/ua/\r
+                       // webkit version to Android version...\r
+                       androidBrowserPCMode = !window.chrome || v < 534.3; // 4.0 & 3.x には chrome がいる...\r
+                       \r
+                       if( !window[ 'Int8Array' ] ){\r
+                               v =\r
+                                       v < 529    ? 1.5 : // <= 528.5\r
+                                       v < 531    ? 2.0 : // 530 2.0~2.1\r
+                                                                          // 533 2.2~2.3\r
+                                       v < 534    ? ( window.HTMLAudioElement ? 2.3 : 2.2 ) : 0;\r
+                       } else {\r
+                               v =\r
+                                               !navigator[ 'connection' ] ? 4.4 :\r
+                                               Number.isFinite && ( window.history && window.history.pushState ) ? 4.2/* & 4.3 */ : // ここに 4.1, 4.0 も入ってくる...\r
+                                               Number.isFinite ? 4.1 : 4;\r
+                                       // 534 - 3.x~4.x , 534.13=3.x\r
+                                       // 534.30 = 4.0-4.1\r
+                                       // 535.19 = 4.1\r
+                                       // 537.36 = 4.4.2-5.x\r
+                       };\r
+\r
+                       if( v ){\r
+                               // PC版で見る、にチェックが付いている場合、ユーザーエージェント文字列にも platform にも Android の文字列が存在しない(標準ブラウザ&Chrome)\r
+                               // Audio でタッチが必要か?の判定にとても困る...\r
+                               // ua には Linux x86_64 になっている\r
+                               X_UA[ 'Android' ]    = v;\r
+                       };\r
                };\r
        };\r
        \r
@@ -279,12 +311,12 @@ var X_UA = X[ 'UA' ] = {},
                 * @alias X.UA.Opera7\r
                 * @type {boolean}\r
                 */\r
-               X_UA[ 'Opera7' ]      = v < 8;\r
+               X_UA[ 'Opera7' ] = v < 8;\r
                /**\r
                 * @alias X.UA.Opera78\r
                 * @type {boolean}\r
                 */\r
-               X_UA[ 'Opera78' ]     = v < 9;\r
+               X_UA[ 'Opera78' ] = v < 9;\r
                \r
                if( 0 < dua.indexOf( 'Opera Mini' ) )\r
                        /**\r
@@ -307,6 +339,16 @@ var X_UA = X[ 'UA' ] = {},
                         */\r
                        X_UA[ 'OperaTablet' ] = true;\r
                \r
+               // Android Opera12.10 UserAgent:Desktop\r
+               // この場合 android version 不明...\r
+               if( !X_UA[ 'OperaMini' ] && !X_UA[ 'OperaTablet' ] && !X_UA[ 'OperaMobile' ] && sys === 'Android' ){\r
+                       if( screen.width * screen.height < 320000 ){\r
+                               X_UA[ 'OperaMobile' ] = true;\r
+                       } else {\r
+                               X_UA[ 'OperaTablet' ] = true;\r
+                       };\r
+               };\r
+               \r
                if( 0 < dua.indexOf( 'Nintendo Wii' ) )\r
                        /**\r
                         * @alias X.UA.Wii\r
@@ -323,9 +365,26 @@ var X_UA = X[ 'UA' ] = {},
 \r
                console.log( '>> Opera : ' + v );\r
        } else\r
-       \r
+       if( v = parseFloat( dav.split( 'Edge/' )[ 1 ] ) ){\r
+               /**\r
+                * Microsoft Edge\r
+                * @alias X.UA.Edge\r
+                * @type {number}\r
+                */\r
+                       X_UA[ 'Edge' ]  = v;\r
+\r
+               if( dav.indexOf( 'Mobile' ) ){\r
+                       /**\r
+                        * Microsoft Edge for Windows 10 Mobile\r
+                        * @alias X.UA.EdgeMobile\r
+                        * @type {number}\r
+                        */\r
+                       X_UA[ 'EdgeMobile' ] = v;\r
+               };\r
+\r
+       }  else\r
        // Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko\r
-       if( ( v = dav.split( 'Trident/' )[ 1 ] ) || document.all ){\r
+       if( ( v = dav.split( 'Trident/' )[ 1 ] ) || document.all ){ // .all は Opera にもいるので Opera の判定が先\r
                if( v = parseFloat( v ) )\r
                /**\r
                 * IE11 の互換モードの navigator.appVersion にも Trident/7.0 が書かれているため互換モードか?判定ができるc \r
@@ -342,8 +401,7 @@ var X_UA = X[ 'UA' ] = {},
                        X_UA[ 'ActiveX' ] = true;\r
 \r
                v = parseFloat( dua.split( 'MSIE ' )[ 1 ] ) ||\r
-                       parseFloat( dua.split( 'rv:' )[ 1 ] ) ||\r
-                       parseFloat( dav.split( 'MSIE ' )[ 1 ] ) || 0;\r
+                       parseFloat( dua.split( 'rv:' )[ 1 ] ) || 0;\r
 \r
                tridentToVer = X_UA[ 'Trident' ] ? ( X_UA[ 'Trident' ] + 4 | 0 ) : v;\r
 \r
@@ -360,7 +418,7 @@ var X_UA = X[ 'UA' ] = {},
                 * @alias X.UA.IE\r
                 * @type {number}\r
                 */\r
-               X_UA[ 'IE' ]   = v = document.documentMode || tridentToVer;\r
+               X_UA[ 'IE' ] = v = document.documentMode || tridentToVer;\r
 \r
                if( v < 4.5 ){\r
                        /**\r
@@ -443,7 +501,7 @@ var X_UA = X[ 'UA' ] = {},
                        X_UA[ 'MacIE' ] = true;\r
                };\r
                \r
-               if( 0 < dua.toLowerCase().indexOf( 'iemobile' ) || X_UA[ 'WinCE' ] ){\r
+               if( 0 < dua.indexOf( 'IEMobile' ) || X_UA[ 'WinCE' ] ){\r
                        /**\r
                         * @alias X.UA.IEMobile\r
                         * @type {boolean}\r
@@ -451,7 +509,7 @@ var X_UA = X[ 'UA' ] = {},
                        X_UA[ 'IEMobile' ] = true;\r
                };\r
 \r
-               if( 0 < dua.toLowerCase().indexOf( 'windows phone' ) || 0 < dav.indexOf( 'ZuneWP' ) ){\r
+               if( 0 < dua.indexOf( 'Windows Phone' ) || 0 < dav.indexOf( 'ZuneWP' ) ){\r
                        /**\r
                         * @alias X.UA.WinPhone\r
                         * @type {boolean}\r
@@ -591,11 +649,11 @@ var X_UA = X[ 'UA' ] = {},
        } else\r
        \r
        // Android 標準ブラウザ AOSP と ChromeWeb View, Sブラウザがある\r
-       if( ( v = X_UA[ 'Android' ] ) && ( dua.indexOf( 'Chrome\/' ) < 0 || 0 < dua.indexOf( 'Version\/' ) ) ){ // Chrome/ を含まない または Version/ を含む\r
+       if( ( v = X_UA[ 'Android' ] ) && ( dua.indexOf( 'Chrome\/' ) < 0 || 0 < dua.indexOf( 'Version\/' ) || androidBrowserPCMode ) ){ // Chrome/ を含まない または Version/ を含む\r
                \r
                /* if( window.chrome ){  // Android3.1 のAOSPブラウザで .chrome がいた、、、\r
                } else */\r
-               if( dua.indexOf( 'Version\/' ) < 0 && 0 < dua.indexOf( 'Chrome\/' ) ){\r
+               if( dua.indexOf( 'Version\/' ) < 0 && 0 < dua.indexOf( 'Chrome\/' ) && !androidBrowserPCMode ){\r
                        /**\r
                         * Android 標準ブラウザ Chrome WebView ブラウザ\r
                         * @alias X.UA.ChromeWV\r
@@ -676,16 +734,16 @@ var X_UA = X[ 'UA' ] = {},
                                 */\r
                                X_UA[ 'Safari' ] = v;\r
                        } else\r
-                       if( i <= 528.16 ){\r
-                               X_UA[ 'Safari' ] = i <   73    ? 0.8 :\r
-                                                                  i <   85    ? 0.9 :\r
-                                                                  i <  100    ? 1 :\r
-                                                                  i <  125    ? 1.1 :\r
-                                                                  i <  312    ? 1.2 :\r
-                                                                  i <  412    ? 1.3 :\r
-                                                                  i <= 419.3  ? 2 :\r
-                                                                  i <= 525.13 ? 3 :\r
-                                                                  i <= 525.25 ? 3.1 : 3.2;\r
+                       if( v <= 528.16 ){\r
+                               X_UA[ 'Safari' ] = v <   73    ? 0.8 :\r
+                                                                  v <   85    ? 0.9 :\r
+                                                                  v <  100    ? 1 :\r
+                                                                  v <  125    ? 1.1 :\r
+                                                                  v <  312    ? 1.2 :\r
+                                                                  v <  412    ? 1.3 :\r
+                                                                  v <= 419.3  ? 2 :\r
+                                                                  v <= 525.13 ? 3 :\r
+                                                                  v <= 525.25 ? 3.1 : 3.2;\r
                        };\r
                };      \r
                \r
@@ -720,6 +778,7 @@ var X_UA = X[ 'UA' ] = {},
 \r
 (function(){\r
        var k, v;\r
+\r
        if( X_UA[ 'IE45' ] || X_UA[ 'IE4' ] ){\r
                if( X_UA[ 'Mac' ] ){\r
                        X_UA_classNameForHTML = 'Mac';\r
@@ -728,29 +787,30 @@ var X_UA = X[ 'UA' ] = {},
                        // TODO CE3 の ie4 と WM の ie4 の分岐\r
                        X_UA_classNameForHTML = 'WinCE';\r
                } else\r
-               if( X_UA[ 'Win' ] ){\r
+               if( X_UA[ 'Windows' ] ){\r
                        X_UA_classNameForHTML = 'Win';\r
                } else {\r
                        X_UA_classNameForHTML = 'Other';\r
                };              \r
                \r
-               X_UA_classNameForHTML += 'IE4';\r
+               X_UA_classNameForHTML += '_IE4';\r
                \r
                if( X_UA[ 'IE45' ] ){\r
                        X_UA_classNameForHTML += '5';\r
                };\r
 \r
                if( X_UA[ 'ActiveX' ] ){\r
-                       X_UA_classNameForHTML += 'ActiveX';\r
+                       X_UA_classNameForHTML += '_ActiveX';\r
                };\r
                \r
        } else {\r
                for( k in X_UA ){\r
                        v = X_UA[ k ];\r
                        if( v ){\r
-                               X_UA_classNameForHTML += k + ' ';\r
                                if( v !== true ){\r
                                        X_UA_classNameForHTML += k + v + ' ';\r
+                               } else {\r
+                                       X_UA_classNameForHTML += k + ' ';\r
                                };\r
                        };\r
                };              \r
@@ -822,102 +882,3 @@ X_UA_ATagWrapDiv = (function( e, h ){
 })();\r
 \r
 console.log( 'HTML5? ' + X_UA_ATagWrapDiv ); */\r
-\r
-var X_Script_VBS_ENABLED = X_UA[ 'Windows' ] && !X_UA[ 'WinCE' ] && !X_UA[ 'WinPhone' ] && X_UA[ 'IE' ] < 11,\r
-       // 構文のサポート instanceof, in(for-in ではない), try-catch. JS version 1.5以上\r
-       X_Script_gte15       = !( X_UA[ 'IE' ] < 5.5 ) && ( new Function( 'f,a', 'try{return f.apply({},a)}catch(e){}' ) );\r
-\r
-/**\r
- * js バージョン間の際を吸収\r
- * @namespace X.Script\r
- * @alias X.Script\r
- * @type {object}\r
- */\r
-X[ 'Script' ] = {\r
-       'tryCatch' : X_Script_try\r
-};\r
-\r
-if( X_Script_VBS_ENABLED ){\r
-       X_Script_gte15 || document.write( '<script type=text/vbscript>' +\r
-               [\r
-                       'Function vbs_testAXO(v)',\r
-                               'On Error Resume Next',\r
-                               'Set ax = CreateObject(v)',\r
-                               'If Err.Number Then',\r
-                                       'ax = 1',\r
-                               'End If',\r
-                               'Err.Clear',\r
-                               'vbs_testAXO = ax',\r
-                       'End Function' /*,\r
-                       \r
-                       'Function vbs_try(jsFunc,a1,a2,a3,a4)',\r
-                               'On Error Resume Next',\r
-                               'Set rs = jsFunc(a1,a2,a3,a4)',\r
-                               'If Err.Number != 0 Then',\r
-                                       'rs = 0',\r
-                               'End If',\r
-                               'Err.Clear',\r
-                               'vbs_try = rs',\r
-                       'End Function'\r
-                       \r
-                       // elementID .SRC = v\r
-                       'Function vbs_setValue(id,k,v)',\r
-                               'On Error Resume Next',\r
-                               'Set rs = 1',\r
-                               'Document.all[id][k]=v',\r
-                               'If Err.Number != 0 Then',\r
-                                       'rs = 0',\r
-                               'End If',\r
-                               'Err.Clear',\r
-                               'vbs_try = rs',\r
-                       'End Function'\r
-\r
-                       * \r
-                       * \r
-                       * */\r
-               ].join( '\n' ) + '</script>' );\r
-\r
-       // TODO Object のメンバを辿る vba\r
-       // byte Array を扱う vba\r
-};\r
-\r
-function X_Script_try( func, args ){\r
-       if( !X_Script_gte15 ){\r
-               //return func.apply( {}, args );\r
-               return;\r
-       };\r
-       return X_Script_gte15( func, args || [] );\r
-};\r
-\r
-function X_Script_createActiveXObjectSafty( name ){\r
-       if( !X_Script_gte15 ){\r
-               if( X_Script_VBS_ENABLED ){\r
-                       // console.log( window[ 'vbs_testAXO' ]( name ) + ' ' + name );\r
-                       return !window[ 'vbs_testAXO' ]( name ) && X_Script_createActiveXObject( name );\r
-               };\r
-               return X_Script_createActiveXObject( name );\r
-       };\r
-       \r
-       return X_Script_try( X_Script_createActiveXObject, [ name ] );\r
-};\r
-\r
-// TODO GeckoActiveX\r
-function X_Script_createActiveXObject( name ){\r
-       return new ActiveXObject( name );\r
-};\r
-\r
-/*\r
- * http://archiva.jp/web/html-css/ie6_background_flickr.html\r
- * hover時の背景画像ちらつきに対処する\r
- * この問題はIE6固有の問題であり、他のモダンブラウザやIE5等では発現しない。\r
- */\r
-if( X_UA[ 'IE6' ] && // error @ NN7.2\r
-       !X_Script_try( function(){ document.execCommand( 'BackgroundImageCache', false, true ); return 1; } ) ){\r
-               /**\r
-                * ie6 のみで実行する document.execCommand( 'BackgroundImageCache', false, true ) の失敗。\r
-                * bonus: hotfix for IE6 SP1 (bug KB823727)\r
-                * multipleIEs IE6 standalone 版では不可, IE5.5 は可,,,\r
-                * @alias X.UA.ieExeComError */\r
-               X_UA[ 'ieExeComError' ] = true;\r
-};\r
-\r