pettanR version0.4.15

[pettanr/clientJs.git] / 0.4.x / javascripts / work.js

diff --git a/0.4.x/javascripts/work.js b/0.4.x/javascripts/work.js
index 25d3256..291ee01 100644 (file)
--- a/0.4.x/javascripts/work.js
+++ b/0.4.x/javascripts/work.js
@@ -1,6 +1,6 @@
 /*\r
  * pettanR work.js\r
- *   version 0.4.12\r
+ *   version 0.4.15\r
  *   \r
  * author:\r
  *   itozyun\r
@@ -1404,7 +1404,7 @@ pettanr.editor = ( function(){
                                        finder.onOpen( _w, _h);\r
                                },\r
                                onResize: function( _w, _h){\r
-                                       finder.onWindowResize( _w, _h);\r
+                                       finder.resize( _w, _h);\r
                                }\r
                        },\r
                        'image-exproler', 'Album', 0, 215, 400, 350, false, true, true, 300, 300\r
@@ -3428,7 +3428,7 @@ pettanr.editor = ( function(){
                        \r
                        delete pettanr.editor.firstOpen;\r
                },\r
-               onOpen: function( _file){\r
+               onOpen: function( _w, _h, _file){\r
                        if( pettanr.file.isFileInstance( _file) === true){\r
                                // pettanr.file.isPettanFileInstance( _file) === true\r
                                // \r
@@ -3449,6 +3449,10 @@ pettanr.editor = ( function(){
                        MENU_BAR_CONTROL.open();\r
                        \r
                        pettanr.editor.firstOpen !== undefined && pettanr.editor.firstOpen();\r
+                       \r
+                       windowW = _w;\r
+                       windowH = _h;\r
+                       pettanr.editor.onWindowResize( _w, _h );\r
                },\r
                onClose: function(){\r
                        HISTORY_CONTROL.close();\r
@@ -3465,8 +3469,8 @@ pettanr.editor = ( function(){
                        MENU_BAR_CONTROL.open();\r
                },\r
                onWindowResize: function( _windowW, _windowH){\r
-                       windowW = _windowW;\r
-                       windowH = _windowH;\r
+                       windowW = _windowW || windowW;\r
+                       windowH = _windowH || windowH;\r
                        if( pettanr.editor.firstOpen) return;\r
                        /*\r
                         * ieは +'px'が不要みたい\r
@@ -3708,7 +3712,7 @@ pettanr.comicConsole = ( function(){
                        COMIC_CONSOLE.init();\r
                        delete pettanr.comicConsole.init;\r
                },\r
-               onOpen: function( _file){\r
+               onOpen: function( _w, _h, _file){\r
                        if( pettanr.driver.isPettanrFileInstance( _file ) === true && _file.getType() === pettanr.driver.FILE_TYPE.COMIC){\r
                                // _data = _file.read();\r
                        }\r
@@ -3729,7 +3733,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 +3818,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 +3860,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
@@ -3886,7 +3893,7 @@ pettanr.uploadConsole = ( function(){
                        UPLOAD_CONSOLE.init();\r
                        delete pettanr.comicConsole.init;\r
                },\r
-               onOpen: function( _file){\r
+               onOpen: function( _w, _h, _file){\r
                        if( pettanr.driver.isPettanrFileInstance( _file ) === true && _file.getType() === pettanr.driver.FILE_TYPE.COMIC){\r
                                // _data = _file.read();\r
                        }\r
@@ -3907,7 +3914,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 +3994,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 +4036,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
@@ -4059,7 +4069,7 @@ pettanr.panelConsole = ( function(){
                        PANEL_CONSOLE.init();\r
                        delete pettanr.comicConsole.init;\r
                },\r
-               onOpen: function(){\r
+               onOpen: function( _w, _h, _file ){\r
                        \r
                },\r
                onClose: function(){\r
@@ -4078,9 +4088,9 @@ 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
+                       TARGET_FRAME_NAME = 'targetFrameRegisterArtist',\r
                        elmContainer = document.getElementById( 'register'),\r
                        elmProgress = document.getElementById( 'artist-console-progress'),\r
                        timer = null,\r
@@ -4158,6 +4168,7 @@ pettanr.artistConsole = ( function(){
                        elmIframe = _iframe;\r
                        elmForm.target = _iframe.name;\r
                        elmProgress.innerHTML = '';\r
+                       ARTIST_CONSOLE.onWindowResize( windowW, windowH );\r
                }\r
                /*\r
                 * \r
@@ -4184,7 +4195,7 @@ pettanr.artistConsole = ( function(){
                                 */                             \r
                                elmScript = document.createElement( 'script');\r
                                elmScript.type = 'text\/javascript';\r
-                               elmScript.src = pettanr.CONST.RESISTER_ARTIST_JS;\r
+                               elmScript.src = pettanr.CONST.REGISTER_ARTIST_JS;\r
                                document.body.appendChild( elmScript);\r
                                \r
                                jqWrap.show();\r
@@ -4198,7 +4209,9 @@ pettanr.artistConsole = ( function(){
                                \r
                                ARTIST_CONSOLE.onWindowResize( w, h );\r
                        },\r
-                       onWindowResize: function( _windowW, _windowH){\r
+                       onWindowResize: function( _windowW, _windowH ){\r
+                               windowW = _windowW;\r
+                               windowH = _windowH;\r
                                jqWrap.css(\r
                                        {\r
                                                left:   Math.floor( ( _windowW -jqWrap.width()) /2),\r
@@ -4230,7 +4243,7 @@ pettanr.artistConsole = ( function(){
                        ARTIST_CONSOLE.init();\r
                        delete pettanr.comicConsole.init;\r
                },\r
-               onOpen: function(){\r
+               onOpen: function( _w, _h, _option ){\r
                        \r
                },\r
                onClose: function(){\r