fixed exportConsole

[pettanr/pettanr.git] / public / assets / common.js

diff --git a/public/assets/common.js b/public/assets/common.js
index da0a9e5..3711638 100644 (file)
--- a/public/assets/common.js
+++ b/public/assets/common.js
@@ -1109,7 +1109,7 @@ pettanr.key = ( function(){
                        overlayEnabled = pettanr.overlay.visible === true,\r
                        currentViewID = overlayEnabled === true ? pettanr.overlay.currentID : pettanr.view.currentID;\r
                if( type === 'keypress') type = 'keydown';\r
-               if( pettanr.form.keyEventRellay( e ) === false　){\r
+               if( pettanr.form.keyEventRellay( e ) === false ){\r
                        var shift = e.shiftKey,\r
                                ctrl = e.ctrlKey,\r
                                l = KEYEVENT_ARRAY.length,\r
@@ -1855,18 +1855,19 @@ pettanr.balloon = ( function() {
                draw( a, w, h );\r
                \r
                function draw( _a, _w, _h ){\r
-                       a = _a !== undefined ? _a : a;\r
-                       w = _w !== undefined ? _w - PADDING_TOP * 2 : w;\r
-                       h = _h !== undefined ? _h - PADDING_LEFT * 2 : 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
+                               balloonElm.setAttribute( 'src', balloonUrlBuilder( _a ));\r
                                return;\r
                        }\r
                        \r
                        var rx = w /2,\r
                                ry = h /2,\r
-                               tailRad = a * DEG_TO_RAD,\r
+                               tailRad = _a * DEG_TO_RAD,\r
                                tailX = rx +( rx +TAIL_HEIGHT ) * cos( tailRad ),\r
                                tailY = ry +( ry +TAIL_HEIGHT ) * sin( tailRad ),\r
                                startX, startY, endX, endY;\r
@@ -1879,8 +1880,8 @@ pettanr.balloon = ( function() {
                        \r
                        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
+                               startRad = ( _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
@@ -1942,7 +1943,7 @@ pettanr.balloon = ( function() {
                \r
                function balloonUrlBuilder( _a ){\r
                        var d = 360 / NUM_BALLOON_IMAGE;\r
-                       _a += 90 + d / 2;\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
@@ -2057,7 +2058,7 @@ pettanr.image = ( function(){
                                timer = window.setTimeout( asyncCallback, 10 );\r
                        }                       \r
                        function onLoad(){\r
-                               // if( finish === true ) return; // これがあると firefox3.6　で駄目、、、\r
+                               // if( finish === true ) return; // これがあると firefox3.6 で駄目、、、\r
                                // if( timer ) return; // これがあると safari3.2 で駄目、、、\r
                                finish = true;\r
                                timer !== null && window.clearTimeout( timer );\r