fixed pettanr.overlay

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index c0778fb..d0de577 100644 (file)
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -25,8 +25,9 @@
                <div id="inner-wrapper" class="base-content-width">\r
 \r
                        <!-- home -->\r
-                               <div id="entrance" class="console-page main" style="display:block;">\r
-                                       <%= yield %>\r
+                       <div id="entrance" class="console-page main" style="display:block;">\r
+                               <%= yield %>\r
+                               <h3>クイックアクセス</h3>\r
                                <p><a href="#" onclick="pettanr.view.show('editor');return false;">新しいコマを描く(いまだけ)</a></p>\r
                                <p><a href="#" onclick="pettanr.comicConsole._quickAccessShow();return false;">新しいコミックをつくる</a></p>\r
                                <p><a href="#" onclick="pettanr.uploadConsole._quickAccessShow();return false;">画像のアップロード</a></p>\r

diff --git a/public/assets/common.js b/public/assets/common.js
index 13120a3..1be7469 100644 (file)
--- a/public/assets/common.js
+++ b/public/assets/common.js
@@ -1060,9 +1060,11 @@ pettanr.overlay = ( function(){
                },\r
                show: function( _currentOverlay){\r
                        if( visible === true && currentOverlay === _currentOverlay) return;\r
+                       document.body.style.overflow = 'hidden';\r
                        jqConteiner.stop().css( {\r
                                filter:         '',\r
-                               opacity:        ''\r
+                               opacity:        '',\r
+                               top:            document.documentElement.scrollTop || document.body.scrollTop\r
                        }).fadeIn();\r
                        this.visible = visible = true;\r
                        currentOverlay = _currentOverlay;\r
@@ -1072,6 +1074,7 @@ pettanr.overlay = ( function(){
                hide: function(){\r
                        currentOverlay = null;\r
                        if( visible === false) return;\r
+                       document.body.style.overflow = '';\r
                        jqConteiner.stop().css( {\r
                                filter:         '',\r
                                opacity:        ''\r

diff --git a/public/assets/work.js b/public/assets/work.js
index 25d3256..b4bd72c 100644 (file)
--- a/public/assets/work.js
+++ b/public/assets/work.js
@@ -3729,7 +3729,7 @@ pettanr.comicConsole = ( function(){
 \r
 pettanr.uploadConsole = ( function(){\r
        var UPLOAD_CONSOLE = ( function(){\r
-               var jqWrap,\r
+               var jqWrap, windowW, windowH,\r
                        ID = 'uploadConsole',\r
                        TARGET_FRAME_NAME = 'targetFrame',\r
                        elmContainer = document.getElementById( 'uploader'),\r
@@ -3814,6 +3814,7 @@ pettanr.uploadConsole = ( function(){
                        elmIframe = _iframe;\r
                        elmForm.target = _iframe.name;\r
                        elmProgress.innerHTML = '';\r
+                       UPLOAD_CONSOLE.onWindowResize( windowW, windowH );\r
                }\r
                /*\r
                 * 
@@ -3855,6 +3856,8 @@ pettanr.uploadConsole = ( function(){
                                UPLOAD_CONSOLE.onWindowResize( w, h);\r
                        },\r
                        onWindowResize: function( _windowW, _windowH){\r
+                               windowW = _windowW;\r
+                               windowH = _windowH;\r
                                jqWrap.css(\r
                                        {\r
                                                left:   Math.floor( ( _windowW -jqWrap.width()) /2),\r
@@ -3907,7 +3910,7 @@ pettanr.uploadConsole = ( function(){
 \r
 pettanr.panelConsole = ( function(){\r
        var PANEL_CONSOLE = ( function(){\r
-               var jqWrap,\r
+               var jqWrap, windowW, windowH,\r
                        ID = 'panelConsole',\r
                        TARGET_FRAME_NAME = 'targetFrameCreateNewPanel',\r
                        elmContainer = document.getElementById( 'newpanel'),\r
@@ -3987,6 +3990,7 @@ pettanr.panelConsole = ( function(){
                        elmIframe = _iframe;\r
                        elmForm.target = _iframe.name;\r
                        elmProgress.innerHTML = '';\r
+                       PANEL_CONSOLE.onWindowResize( windowW, windowH );\r
                }\r
                /*\r
                 * \r
@@ -4028,6 +4032,8 @@ pettanr.panelConsole = ( function(){
                                PANEL_CONSOLE.onWindowResize( w, h );\r
                        },\r
                        onWindowResize: function( _windowW, _windowH){\r
+                               windowW = _windowW;\r
+                               windowH = _windowH;\r
                                jqWrap.css(\r
                                        {\r
                                                left:   Math.floor( ( _windowW -jqWrap.width()) /2),\r
@@ -4078,7 +4084,7 @@ pettanr.panelConsole = ( function(){
 \r
 pettanr.artistConsole = ( function(){\r
        var ARTIST_CONSOLE = ( function(){\r
-               var jqWrap,\r
+               var jqWrap, windowW, windowH,\r
                        ID = 'artistConsole',\r
                        TARGET_FRAME_NAME = 'targetFrameResisterArtist',\r
                        elmContainer = document.getElementById( 'register'),\r
@@ -4130,9 +4136,9 @@ pettanr.artistConsole = ( function(){
                                }\r
                                        function onLoad(){\r
                                                elmIframe.onload = null;\r
-                                               ( elmIframe.contentWindow || elmIframe.contentDocument.parentWindow ).close();\r
+                                               // ( elmIframe.contentWindow || elmIframe.contentDocument.parentWindow ).close();\r
                                                elmProgress.innerHTML = 'success!';\r
-                                               setTimeout( clickCancel , 1000);\r
+                                               // setTimeout( clickCancel , 1000);\r
                                                isUploading = false;\r
                                        }\r
                \r
@@ -4158,6 +4164,7 @@ pettanr.artistConsole = ( function(){
                        elmIframe = _iframe;\r
                        elmForm.target = _iframe.name;\r
                        elmProgress.innerHTML = '';\r
+                       ARTIST_CONSOLE.onWindowResize( windowW, windowH );\r
                }\r
                /*\r
                 * \r
@@ -4199,6 +4206,8 @@ pettanr.artistConsole = ( function(){
                                ARTIST_CONSOLE.onWindowResize( w, h );\r
                        },\r
                        onWindowResize: function( _windowW, _windowH){\r
+                               windowW = _windowW;\r
+                               windowH = _windowH;\r
                                jqWrap.css(\r
                                        {\r
                                                left:   Math.floor( ( _windowW -jqWrap.width()) /2),\r