X-Git-Url: http://git.osdn.jp/view?p=pettanr%2FclientJs.git;a=blobdiff_plain;f=0.6.x%2Fjs%2F01_core%2F09_XURL.js;fp=0.6.x%2Fjs%2F01_core%2F09_XURL.js;h=1be41ad8cfb4a4fe9c3833e888a81d3bf5c066ee;hp=0eaccabe991c0173aa0373bdda1d3f4b2f8a6718;hb=2bea17ee282c2cf4ce0de6685db3ade602f6e60f;hpb=76ea1040608829b653422cf51b3490801d2ec1fa diff --git a/0.6.x/js/01_core/09_XURL.js b/0.6.x/js/01_core/09_XURL.js index 0eaccab..1be41ad 100644 --- a/0.6.x/js/01_core/09_XURL.js +++ b/0.6.x/js/01_core/09_XURL.js @@ -4,6 +4,7 @@ // ------------------------------------------------------------------------- // var X_URL_BASE_URL = ( function( parts ){ var last = 1 < parts.length && parts[ parts.length - 1 ]; + if( last !== false && ( last === '' || //末尾が/で終わるとき last.indexOf( '.' ) !== -1 ) ){ //末尾がファイル名で終わる時 --parts.length; @@ -11,6 +12,8 @@ var X_URL_BASE_URL = ( function( parts ){ return parts.join( '/' ); })( X_URL_cleanup( location.href ).split( '/' ) ), + X_URL_HOST = location.protocol + '//' + location.hostname, + X_URL_IS_FILE = location.protocol === 'file:', X_URL_IS_LOCAL = X_URL_IS_FILE || location.hostname === 'localhost' || location.hostname === '127.0.0.1', @@ -109,7 +112,7 @@ function X_URL_toAbsolutePath( path ){ */ function X_URL_isSameDomain( path ){ path = X_URL_cleanup( X_URL_toAbsolutePath( path ) ); - return path === X_URL_BASE_URL || path.indexOf( X_URL_BASE_URL + '/' ) === 0; + return path === X_URL_HOST || path.indexOf( X_URL_HOST + '/' ) === 0; }; /** * 同一プロトコルか?