OSDN Git Service

Merge branch 'v03_test' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v03_test
[pettanr/pettanr.git] / public / assets / common.js
index 41b7c91..a604d02 100644 (file)
@@ -1,6 +1,6 @@
 /*\r
  * pettanR common.js\r
- *   version 0.4.30\r
+ *   version 0.4.34\r
  * \r
  * author: itozyun\r
  */\r
@@ -108,7 +108,7 @@ var pettanr = ( function(){
                IS_DEBUG = Type.isBoolean( URL_PARAMS.debug ) ? URL_PARAMS.debug : IS_LOCAL === true,\r
                jqWindow , jqDocument , jqBody;\r
        return {\r
-               version: '0.4.28',\r
+               version: '0.4.33',\r
                init: function(){\r
                        jqWindow   = $( window );\r
                        jqDocument = $( document );\r
@@ -675,7 +675,17 @@ pettanr.CONST = ( function(){
                        var loc = document.location;\r
                        return [ loc.protocol, '\/\/', loc.host, '\/' ].join( '' );\r
                })(),\r
-               DEPTH = document.location.pathname.split( '\/' ).length;\r
+               RELATIVE = ( function(){\r
+                       var ret  = '',\r
+                               loc  = document.location,\r
+                               path = [ loc.protocol, '\/', loc.host, '\/', loc.pathname.split( '\\' ).join( '\/' ) ].join( '' ),\r
+                               l    = path.split( '\/' ).length - PETTANR_ROOT_PATH.split( '\/' ).length;\r
+                       for( var i=0; i<l; ++i ){\r
+                               ret += '..\/';\r
+                       }\r
+                       return ret;\r
+               })();\r
+               \r
        return {\r
                PETTANR_ROOT_PATH:                      PETTANR_ROOT_PATH,\r
                URL_ORIGINAL_PICTURES_JSON: ( SERVER_SUPPORT === false ? 'json\/' : PETTANR_ROOT_PATH ) + 'original_pictures.json',\r
@@ -683,14 +693,14 @@ pettanr.CONST = ( function(){
                URL_COMICS_JSON:                        ( SERVER_SUPPORT === false ? 'json\/' : PETTANR_ROOT_PATH ) + 'comics.json',\r
                URL_PANELS_JSON:                        ( SERVER_SUPPORT === false ? 'json\/' : PETTANR_ROOT_PATH ) + 'panels.json',\r
                NS_PETTANR_COMIC:                       'pettanr-comic',\r
-               RESOURCE_PICTURE_PATH:          ( SERVER_SUPPORT === false ? ( DEPTH === 1 ? '..\/' : '' ) : PETTANR_ROOT_PATH ) + 'resource_pictures\/',\r
+               RESOURCE_PICTURE_PATH:          ( SERVER_SUPPORT === false ? RELATIVE : PETTANR_ROOT_PATH ) + 'resource_pictures\/',\r
+               SYSTEM_PICTURE_PATH:            ( SERVER_SUPPORT === false ? RELATIVE : PETTANR_ROOT_PATH ) + 'system_pictures\/',\r
                CREATE_COMIC_JS:                        SERVER_SUPPORT === false ? 'js\/create_new_comic.js' : PETTANR_ROOT_PATH + 'comics\/new.js',\r
                CREATE_PANEL_JS:                        SERVER_SUPPORT === false ? 'js\/create_new_panel.js' : PETTANR_ROOT_PATH + 'panels\/new.js',\r
                UPLOAD_PICTURE_JS:                      SERVER_SUPPORT === false ? 'js\/upload_picture.js' : PETTANR_ROOT_PATH + 'original_pictures\/new.js',\r
                REGISTER_ARTIST_JS:                     SERVER_SUPPORT === false ? 'js\/register_artist.js' : PETTANR_ROOT_PATH + 'artists\/new.js',\r
                JQUERY_URL:                                     SERVER_SUPPORT === false ? 'javascripts\/jquery-1.6.2.min.js' : PETTANR_ROOT_PATH + 'assets\/jquery-162_min.js',\r
-               SERVER_SUPPORT:                         SERVER_SUPPORT,\r
-               DEPTH:                                          DEPTH\r
+               SERVER_SUPPORT:                         SERVER_SUPPORT\r
        }\r
 })();\r
 \r
@@ -1776,15 +1786,15 @@ pettanr.form = ( function(){
  * \r
  */\r
 pettanr.balloon = ( function() {\r
-       var MIN_BALLOON_WIDTH = 30,\r
+       var MIN_BALLOON_WIDTH  = 30,\r
                MIN_BALLOON_HEIGHT = 30,\r
-               TAIL_WIDTH = 6,\r
-               TAIL_HEIGHT = 10,\r
-               STROKE_WIDTH = 1.2,\r
-               PADDING_TOP = TAIL_HEIGHT,\r
-               PADDING_LEFT = TAIL_HEIGHT,\r
-               ACCURACY = 1, // 有効少数桁        \r
-               IS_VML = pettanr.ua.isIE === true && pettanr.ua.ieVersion < 9,\r
+               NUM_BALLOON_IMAGE  = 24,\r
+               TAIL_WIDTH         = 6,\r
+               TAIL_HEIGHT        = 10,\r
+               STROKE_WIDTH       = 1.2,\r
+               PADDING_TOP        = TAIL_HEIGHT,\r
+               PADDING_LEFT       = TAIL_HEIGHT,\r
+               IS_VML             = pettanr.ua.isIE === true && pettanr.ua.ieVersion < 9,\r
                ELM_BALLOON_ORIGIN = ( function(){\r
                        var ret;\r
                        try {\r
@@ -1810,15 +1820,23 @@ pettanr.balloon = ( function() {
                                return null;\r
                        }\r
                })(),\r
-               NUM_BALLOON_IMAGE = 24,\r
-               vectorEnabled = ELM_BALLOON_ORIGIN !== null && pettanr.URL_PARAMS.vector !== false;\r
-       if( IS_VML === true && pettanr.ua.VML === false ) vectorEnabled = false;\r
+               vectorEnabled = ELM_BALLOON_ORIGIN !== null &&\r
+                                               pettanr.URL_PARAMS.vector !== false &&\r
+                                               !( IS_VML === true && pettanr.ua.VML === false );\r
 \r
-       var cos = Math.cos, sin = Math.sin,\r
-               abs = Math.abs, pow = Math.pow,\r
-               round = Math.round,\r
-               floor = Math.floor,\r
-               TARGET = TAIL_WIDTH * TAIL_WIDTH,\r
+       var cos        = Math.cos,\r
+               sin        = Math.sin,\r
+               abs        = function(v){ return v >= 0 ? v : -1; },\r
+               pow        = Math.pow,\r
+               round      = Math.round,\r
+               floor      = Math.floor,\r
+               TARGET     = TAIL_WIDTH * TAIL_WIDTH,\r
+               isFinit    = Type.isFinite,\r
+               ACCURACY   = 1, // 有効少数桁      \r
+               cround     = function ( v, r ){\r
+                                               r = r || ACCURACY;\r
+                                               return round( v * pow( 10.0, r )) / pow( 10.0, r );\r
+                                       },\r
                DEG_TO_RAD = Math.PI / 180;\r
 \r
        var XBROWSER_BALLOON_CLASS = function( w, h, a ){\r
@@ -1828,24 +1846,12 @@ pettanr.balloon = ( function() {
                        instance = this,\r
                        l = ',';\r
                \r
-               draw( a, w, h );\r
-               \r
-               function draw( _a, _w, _h ){\r
-                       a  = _a !== undefined ? _a : a;\r
-                       _a = a;// - 90;\r
-                       w  = _w !== undefined ? _w - PADDING_TOP * 2 : w;\r
-                       h  = _h !== undefined ? _h - PADDING_LEFT * 2 : h;\r
-\r
-                       if( vectorEnabled === false){\r
-                               balloonElm.setAttribute( 'src', balloonUrlBuilder( _a ));\r
-                               return;\r
-                       }\r
-                       \r
-                       var rx = w /2,\r
-                               ry = h /2,\r
+               function draw( _a ){\r
+                       var rx      = w / 2,\r
+                               ry      = h / 2,\r
                                tailRad = _a * DEG_TO_RAD,\r
-                               tailX = rx +( rx +TAIL_HEIGHT ) * cos( tailRad ),\r
-                               tailY = ry +( ry +TAIL_HEIGHT ) * sin( tailRad ),\r
+                               tailX   = rx + ( rx + TAIL_HEIGHT ) * sin( tailRad ),\r
+                               tailY   = ry - ( ry + TAIL_HEIGHT ) * cos( tailRad ),\r
                                startX, startY, endX, endY;\r
                /*\r
                 * tailの太さをTAIL_WIDTHに一致させるため、角度を絞りつつ計算\r
@@ -1857,19 +1863,19 @@ pettanr.balloon = ( function() {
                        for( var i = 45; i > 0.01; i /= 2){\r
                                d = ( tailDeg + i ) /2;\r
                                startRad = ( _a + d ) * DEG_TO_RAD;\r
-                               endRad = ( _a - d ) * DEG_TO_RAD;\r
+                               endRad   = ( _a - d ) * DEG_TO_RAD;\r
                                \r
-                               _startX = rx +cos( startRad ) * rx;\r
-                               _startY = ry +sin( startRad ) * ry;\r
-                               _endX = rx +cos( endRad) * rx;\r
-                               _endY = ry +sin( endRad) * ry;  //円弧上のY位置=円中心Y+sin(角度×PI÷180)×円半径\r
+                               _startX  = rx + sin( startRad ) * rx;\r
+                               _startY  = ry - cos( startRad ) * ry;\r
+                               _endX    = rx + sin( endRad ) * rx;\r
+                               _endY    = ry - cos( endRad ) * ry;     //円弧上のY位置=円中心Y+sin(角度×PI÷180)×円半径\r
                                        \r
-                               if( pow( ( _startX - _endX), 2 ) + pow( ( _startY - _endY ), 2 ) < TARGET ){\r
+                               if( pow( ( _startX - _endX ), 2 ) + pow( ( _startY - _endY ), 2 ) < TARGET ){\r
                                        tailDeg += i;\r
-                                       startX = _startX;\r
-                                       startY = _startY;\r
-                                       endX = _endX;\r
-                                       endY = _endY;                                           \r
+                                       startX  = _startX;\r
+                                       startY  = _startY;\r
+                                       endX    = _endX;\r
+                                       endY    = _endY;\r
                                }\r
                        }\r
 \r
@@ -1879,10 +1885,6 @@ pettanr.balloon = ( function() {
                        if( IS_VML === true ){\r
                                var _tailX = tailX *10,\r
                                        _tailY = tailY *10,\r
-                                       __startX = startX *10,\r
-                                       __startY = startY *10,\r
-                                       __endX = endX *10,\r
-                                       __endY = endY *10,\r
                                        __w = w *10,\r
                                        __h = h *10;\r
                                \r
@@ -1891,8 +1893,8 @@ pettanr.balloon = ( function() {
                                shape.coordsize = [ __w, __h ].join( l );\r
                                shape.path = [\r
                                        ' ar ', 0, l, 0, l, __w, l, __h, l,\r
-                                       round( __endX ), l, round( __endY ), l,\r
-                                       round( __startX ), l, round( __startY ),\r
+                                       round( endX * 10 ), l, round( endY * 10 ), l,\r
+                                       round( startX * 10 ), l, round( startY * 10 ),\r
                                        ' l ', round( _tailX ), l, round( _tailY ),\r
                                        ' x e'\r
                                ].join( '');\r
@@ -1911,35 +1913,41 @@ pettanr.balloon = ( function() {
                                        'z'\r
                                ].join( ' '));\r
                        }\r
-                       function cround( v, r){\r
-                               r = r || ACCURACY;\r
-                               return round( v * pow( 10.0, r )) / pow( 10.0, r );\r
-                       }\r
                }\r
                \r
-               function balloonUrlBuilder( _a ){\r
-                       var d = 360 / NUM_BALLOON_IMAGE;\r
-                       _a = ( _a >= _a ? _a : _a + 360 ) + d / 2;\r
-                       return [ 'system_pictures\/_w', _a < 360 - d / 2 ? floor( _a / d ) : 0, '.gif' ].join( '' );\r
-               }\r
                this.elm = balloonElm;\r
-               this.resize = draw;\r
+               this.resize = function ( _a, _w, _h ){\r
+                       w  = isFinit( _w ) === true ? _w - PADDING_TOP * 2 : w;\r
+                       h  = isFinit( _h ) === true ? _h - PADDING_LEFT * 2 : h;\r
+                       // ie6 でリサイズが反応しない対策\r
+                       if( vectorEnabled === false && pettanr.ua.isIE === true && pettanr.ua.ieVersion < 7 ){\r
+                               var parent = balloonElm.parentNode;\r
+                               parent.removeChild( balloonElm );\r
+                               parent.insertBefore( balloonElm, parent.firstChild );\r
+                       }\r
+                       instance.angle( _a );\r
+               };\r
                this.angle = function( _a ){\r
-                       _a !== undefined && _a !== a &&\r
-                               vectorEnabled === false ? balloonUrlBuilder( _a ) : draw( _a );\r
+                       if( isFinit( _a ) === true ){\r
+                               a = _a;\r
+                               if( vectorEnabled === false ){\r
+                                       balloonElm.src = pettanr.balloon.getBalloonUrl( w, h, _a );\r
+                               } else {\r
+                                       draw( _a );\r
+                               }\r
+                       }\r
                        return a;\r
                }\r
                this.type = function( _type ){\r
                        //draw( _a);\r
                }\r
-               this.getURL = function(){\r
-                       return balloonUrlBuilder( a );\r
-               }\r
                this.destroy = function(){\r
                        delete instance.destroy;\r
                        balloonElm.parentNode && balloonElm.parentNode.removeChild( balloonElm );\r
                        balloonElm = path = shape = instance = null;\r
                }\r
+               \r
+               instance.resize( a, w, h );\r
        };\r
        \r
        IS_VML === false && vectorEnabled === true && ( function(){\r
@@ -1951,9 +1959,21 @@ pettanr.balloon = ( function() {
        })();\r
 \r
        return {\r
-           createBalloon: function( _w, _h, _a){\r
+           createBalloon: function( _w, _h, _a ){\r
                return new XBROWSER_BALLOON_CLASS( _w, _h, _a );\r
            },\r
+           isBalloonInstance: function( _ballon ){\r
+               \r
+           },\r
+           getBalloonUrl: function( _w, _h, _a ){\r
+                       var d = 360 / NUM_BALLOON_IMAGE;\r
+                       _a = _a + d / 2;\r
+                       return [\r
+                               pettanr.CONST.SYSTEM_PICTURE_PATH, '_w',\r
+                               _a < 360 - d / 2 ? floor( _a / d ) : 0,\r
+                               _w <= 400 || _h <= 400 ? '_b1' : '',\r
+                               '.gif' ].join( '' );\r
+           },\r
                TYPE_NONE:                              0,\r
                TYPE_SPEACH_BALLOON:    1,\r
                TYPE_THINKING:                  2,\r
@@ -2102,14 +2122,14 @@ pettanr.image = ( function(){
                }\r
        })();\r
        \r
-       var REG_PNG = /\.png?/i,\r
-               IS_CSS3 = 0,\r
-               IS_VML = 1,\r
-               IS_ACTIVEX = 2,\r
-               IS_CANVAS = 3,\r
-               IS_FLASH = 4,\r
-               IS_SILVERLIGHT = 5,\r
-               IS_SERVER = 6,\r
+       var REG_PNG           = /\.png?/i,\r
+               IS_CSS3           = 0,\r
+               IS_VML            = 1,\r
+               IS_ACTIVEX        = 2,\r
+               IS_CANVAS         = 3,\r
+               IS_FLASH          = 4,\r
+               IS_SILVERLIGHT    = 5,\r
+               IS_SERVER         = 6,\r
                IS_ACTIVEX_SERVER = 7,\r
                BACKEND = ( function(){\r
                        if( pettanr.DEBUG === true && pettanr.URL_PARAMS.rimg ){\r
@@ -2133,21 +2153,20 @@ pettanr.image = ( function(){
                        if( pettanr.ua.ACTIVEX === true ) return IS_ACTIVEX_SERVER;\r
                        return IS_SERVER;\r
                })(),\r
-               CLASS_NAME = 'reversible-image-container',\r
+               CLASS_NAME         = 'reversible-image-container',\r
                CLASS_NAME_LOADING = CLASS_NAME + ' loading',\r
-               CLASS_NAME_ERROR = CLASS_NAME +' error',\r
-               RETRY_DELAY = 5000,\r
-               NUM_RETRY = 3,\r
+               CLASS_NAME_ERROR   = CLASS_NAME +' error',\r
+               RETRY_DELAY        = 5000,\r
+               NUM_RETRY          = 3,\r
                ReversibleImageClass,\r
                ReversibleImageClassWithPingfix;\r
        \r
        var css3Image = function( url, w, h, onLoadCallback ){\r
-               var elmWrap = document.createElement( 'div' ),\r
-                       elmImg,\r
-                       loaded = false,\r
+               var elmWrap    = document.createElement( 'div' ),\r
+                       elmImg     = null,\r
                        retryTimer = null,\r
-                       fetch = FetchImageControl.load( url, onLoad, onError, 100, 10000 ),\r
-                       instance = this;\r
+                       fetch      = FetchImageControl.load( url, onLoad, onError, 100, 10000 ),\r
+                       instance   = this;\r
                elmWrap.className = CLASS_NAME_LOADING;\r
 \r
                function onLoad( _url, _actualW, _actualH ){\r
@@ -2161,7 +2180,6 @@ pettanr.image = ( function(){
                        elmWrap.className = CLASS_NAME;\r
                        onLoadCallback && onLoadCallback( _url, _actualW, _actualH );\r
                        onLoadCallback = fetch = null;\r
-                       loaded = true;\r
                        instance.resize( w, h );\r
                }\r
                function onError( _url ){\r
@@ -2179,13 +2197,13 @@ pettanr.image = ( function(){
                this.resize = function( _w, _h ){\r
                        w = _w !== undefined ? _w : w;\r
                        h = _h !== undefined ? _h : h;\r
-                       if( loaded === false ) return;\r
+                       if( elmImg === null ) return;\r
                        elmImg.className = w < 0 || h < 0 ? ( 'img-flip-' + ( w < 0 && h < 0 ? 'vh' : ( w < 0 ? 'h' : 'v'))) : '';\r
                }\r
                this.destroy = function(){\r
                        delete instance.destroy;\r
                        \r
-                       loaded === true && elmWrap.removeChild( elmImg );\r
+                       elmImg !== null && elmWrap.removeChild( elmImg );\r
                        retryTimer !== null && window.clearTimeout( retryTimer );\r
                        fetch !== null && fetch.stop();\r
                        elmWrap = elmImg = onLoadCallback = retryTimer = fetch = instance = null;\r
@@ -2196,24 +2214,22 @@ pettanr.image = ( function(){
        \r
        var vmlImage = function( url, w, h, onLoadCallback ){\r
                var elmWrap = document.createElement( 'div' ),\r
-                       vmlImg,\r
-                       loaded = false,\r
+                       vmlImg = null,\r
                        retryTimer = null,\r
                        fetch = FetchImageControl.load( url, onLoad, onError, 100, 10000 ),\r
                        instance = this;\r
                elmWrap.className = CLASS_NAME_LOADING;\r
-               function onLoad( _url, _actualW, _actualH){\r
+               function onLoad( _url, _actualW, _actualH ){\r
                        if( elmWrap === null ) return;\r
                        elmWrap.className = CLASS_NAME;\r
                        vmlImg = document.createElement( 'v:image' );\r
                        vmlImg.src = url;\r
                        onLoadCallback && onLoadCallback( _url, _actualW, _actualH );\r
                        onLoadCallback = fetch = null;\r
-                       loaded = true;\r
                        instance.resize( w, h );\r
                }\r
                function onError( _url ){\r
-                       if( elmWrap === null) return;\r
+                       if( elmWrap === null ) return;\r
                        elmWrap.className = CLASS_NAME_ERROR;\r
                        retryTimer = window.setTimeout( retry, RETRY_DELAY );\r
                        fetch = null;\r
@@ -2227,9 +2243,9 @@ pettanr.image = ( function(){
                this.resize = function( _w, _h ){\r
                        w = _w !== undefined ? _w : w;\r
                        h = _h !== undefined ? _h : h;\r
-                       if( loaded !== true ) return;\r
-                       vmlImg.style.width = w < 0 ? -w : w +'px';\r
-                       vmlImg.style.height = h < 0 ? -h : h +'px';\r
+                       if( vmlImg === null ) return;\r
+                       vmlImg.style.width  = ( w < 0 ? -w : w ) + 'px';\r
+                       vmlImg.style.height = ( h < 0 ? -h : h ) + 'px';\r
                        //if( flipH !== _flipH || flipV !== _flipV){\r
                                vmlImg.parentNode === elmWrap && elmWrap.removeChild( vmlImg );\r
                        //}\r
@@ -2239,21 +2255,19 @@ pettanr.image = ( function(){
                this.destroy = function(){\r
                        instance.destroy;\r
                        \r
-                       loaded === true && elmWrap.removeChild( vmlImg );\r
+                       vmlImg !== null && elmWrap.removeChild( vmlImg );\r
                        retryTimer !== null && window.clearTimeout( retryTimer );\r
                        fetch !== null && fetch.stop();\r
                        elmWrap = vmlImg = onLoadCallback = retryTimer = fetch = instance = null;\r
                }\r
        }\r
        \r
-       var serverImage = function( url, w, h, onLoadCallback ){\r
-               \r
-       }\r
+       var serverImage = css3Image; // function( url, w, h, onLoadCallback ){}\r
        \r
-       if( BACKEND === IS_CSS3 ) ReversibleImageClass = css3Image;\r
-       if( BACKEND === IS_VML ) ReversibleImageClass = vmlImage;\r
+       if( BACKEND === IS_CSS3 )    ReversibleImageClass = css3Image;\r
+       if( BACKEND === IS_VML )     ReversibleImageClass = vmlImage;\r
        if( BACKEND === IS_ACTIVEX ) ReversibleImageClass = activexImage;\r
-       if( BACKEND === IS_SERVER ) ReversibleImageClass = activexImage;\r
+       if( BACKEND === IS_SERVER )  ReversibleImageClass = activexImage;\r
        \r
        css3Image = vmlImage = activexImage = activexImage = null;\r
        \r