client is version0.4.28, fixed to clash at ie6&7 when shutdown overlay.

diff --git a/public/assets/common.js b/public/assets/common.js
index 88b1ef9..c1b19d6 100644 (file)
--- a/public/assets/common.js
+++ b/public/assets/common.js
@@ -1,6 +1,6 @@
 /*\r
  * pettanR common.js\r
- *   version 0.4.27\r
+ *   version 0.4.28\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.27',\r
+               version: '0.4.28',\r
                init: function(){\r
                        jqWindow = $( window);\r
                        jqDocument = $( document);\r
@@ -987,10 +987,10 @@ pettanr.overlay = ( function(){
 \r
        }\r
        function onFadeOutComplete(){\r
-               if( currentOverlay.rootElement && currentOverlay.rootElement.parentNode === ELM_CONTAINER ){\r
-                       ELM_CONTAINER.removeChild( currentOverlay.rootElement );\r
-               }\r
-               currentOverlay = null;\r
+               currentOverlay.close();\r
+               currentOverlay.rootElement.style.display = 'none';\r
+               currentOverlay.rootElement.style.visibility = 'hidden';\r
+               currentOverlay = null;  \r
        }\r
        return {\r
                init: function(){\r
@@ -1019,7 +1019,10 @@ pettanr.overlay = ( function(){
                                opacity:        '',\r
                                top:            document.documentElement.scrollTop || document.body.scrollTop\r
                        }).fadeIn( onFadeInComplete );\r
-\r
+                       \r
+                       currentOverlay.rootElement.style.display = '';\r
+                       currentOverlay.rootElement.style.visibility = 'visible';\r
+                       \r
                        ELM_CONTAINER.insertBefore( currentOverlay.rootElement, document.getElementById( 'overlay-close-button' ));\r
        \r
                        if( Type.isArray( bootParams ) === true ){\r
@@ -1032,11 +1035,11 @@ pettanr.overlay = ( function(){
                hide: function(){\r
                        if( visible === false) return;\r
                        document.body.style.overflow = '';\r
+                       \r
                        jqConteiner.stop().css( {\r
                                filter:         '',\r
                                opacity:        ''\r
                        }).fadeOut( onFadeOutComplete );\r
-                       currentOverlay.close();\r
                        this.visible = visible = false;\r
                        this.currentID = null;\r
                },\r

diff --git a/public/assets/system.js b/public/assets/system.js
index 448f1e8..46c3f1d 100644 (file)
--- a/public/assets/system.js
+++ b/public/assets/system.js
@@ -1,6 +1,6 @@
 /*
  * pettanR system.js
- *   version 0.4.27
+ *   version 0.4.28
  *   
  * author:
  *   itozyun
@@ -2015,11 +2015,12 @@ pettanr.textEditor = pettanr.view.registerApplication( function(){
        
        function clickOK(){
                textElement && textElement.text( jqTextarea.val() );
-               onUpdateFunction ? window.setTimeout( asyncCallback, 50 ) : pettanr.textEditor.shutdown();
+               window.setTimeout( asyncCallback, 0 );
        }
        
        function asyncCallback(){
-               onUpdateFunction( textElement );
+               onUpdateFunction && onUpdateFunction( textElement );
+               onUpdateFunction = textElement = null;
                pettanr.textEditor.shutdown();
        }
        
@@ -2082,7 +2083,6 @@ pettanr.textEditor = pettanr.view.registerApplication( function(){
        }
        this.onClose = function(){
                jqWrap.hide();
-               textElement = onUpdateFunction = null;
        }
 });
 

diff --git a/public/assets/work.js b/public/assets/work.js
index d3e3397..8565e27 100644 (file)
--- a/public/assets/work.js
+++ b/public/assets/work.js
@@ -1,6 +1,6 @@
 /*\r
  * pettanR work.js\r
- *   version 0.4.27\r
+ *   version 0.4.28\r
  *   \r
  * author:\r
  *   itozyun\r
@@ -2556,7 +2556,30 @@ pettanr.editor = pettanr.view.registerApplication( function(){
                function restoreReplaceElement( arg){\r
                        replaceComicElement( arg[ 0], arg[ 1]);\r
                }\r
-               \r
+\r
+               function onImageSelect( data, isPanelPictureData ){\r
+                       if( isPanelPictureData !== true ){\r
+                               data = {\r
+                                       resource_picture:data,\r
+                                       x:               Math.floor( panelW /2 - data.width /2 ),\r
+                                       y:               Math.floor( panelH /2 - data.height /2 ),\r
+                                       z:               -1,\r
+                                       t:               PANEL_ELEMENT_ARRAY.length,\r
+                                       width:           data.width,\r
+                                       height:          data.height\r
+                               }\r
+                       }\r
+                       var _panelElement = new ImageElementClass( data );\r
+                       _panelElement.init && _panelElement.init();\r
+                       appendComicElement( _panelElement );\r
+                       _panelElement.animate( undefined, undefined, data.width, data.height );\r
+                       SAVE( restoreComicElement, [ false, _panelElement], [ true, _panelElement], true );\r
+               }\r
+               function onTextInput( _panelElement ){\r
+                       appendComicElement( _panelElement );\r
+                       SAVE( restoreComicElement, [ false, _panelElement ], [ true, _panelElement ], true );\r
+               }\r
+       \r
                return {\r
                        init: function(){\r
                                log = $( '#operation-catcher-log');\r
@@ -2661,24 +2684,6 @@ pettanr.editor = pettanr.view.registerApplication( function(){
                                } else {\r
                                        onImageSelect( data, true );\r
                                }\r
-                               function onImageSelect( data, isPanelPictureData ){\r
-                                       if( isPanelPictureData !== true ){\r
-                                               data = {\r
-                                                       resource_picture:data,\r
-                                                       x:               Math.floor( panelW /2 - data.width /2 ),\r
-                                                       y:               Math.floor( panelH /2 - data.height /2 ),\r
-                                                       z:               -1,\r
-                                                       t:               PANEL_ELEMENT_ARRAY.length,\r
-                                                       width:           data.width,\r
-                                                       height:          data.height\r
-                                               }\r
-                                       }\r
-                                       var _panelElement = new ImageElementClass( data );\r
-                                       _panelElement.init && _panelElement.init();\r
-                                       appendComicElement( _panelElement );\r
-                                       _panelElement.animate( undefined, undefined, data.width, data.height );\r
-                                       SAVE( restoreComicElement, [ false, _panelElement], [ true, _panelElement], true );\r
-                               }\r
                        },\r
                        createTextElement: function( data ){\r
                                var _panelElement;\r
@@ -2707,14 +2712,10 @@ pettanr.editor = pettanr.view.registerApplication( function(){
                                        _panelElement.init();\r
                                        onTextInput( _panelElement );\r
                                }\r
-                               function onTextInput( _panelElement ){\r
-                                       appendComicElement( _panelElement );\r
-                                       SAVE( restoreComicElement, [ false, _panelElement ], [ true, _panelElement ], true );\r
-                               }\r
                        }\r
                }\r
        })();\r
-       \r
+\r
        /*\r
         * end of COMIC_ELEMENT_CONTROL\r
         */\r