client is version0.4.31, update add image button.

diff --git a/public/assets/system.js b/public/assets/system.js
index cba80f3..45f770a 100644 (file)
--- a/public/assets/system.js
+++ b/public/assets/system.js
@@ -974,7 +974,7 @@ pettanr.finder = ( function(){
                }
        }
        
-       var FinderClass = function( ELM_CONTAINER, tree, header, footer ){
+       var FinderClass = function( ELM_CONTAINER, tree, header, footer, viewerOption ){
                var ICON_ARRAY = [],
                        BREAD_ARRAY = [],
                        elmContainer = ELM_ORIGIN_CONTAINER.cloneNode( true ),
@@ -1066,7 +1066,7 @@ pettanr.finder = ( function(){
                        _app.boot( _file );
                }
                function onViwer( _file, _app ){
-                       _app.bootInOverlay( _file );
+                       _app.bootInOverlay( _file, viewerOption );
                }
                function onAction( _file ){
 
@@ -1127,10 +1127,10 @@ pettanr.finder = ( function(){
                init: function(){
                        
                },
-               createFinder: function( _applicationReference, _elmTarget, _tree, _header, _footer ){
+               createFinder: function( _applicationReference, _elmTarget, _tree, _header, _footer, _viewerOption ){
                        if( pettanr.view.isApplicationReference( _applicationReference ) === false ) return;
                        
-                       var _finder = new FinderClass( _elmTarget, _tree, _header, _footer );
+                       var _finder = new FinderClass( _elmTarget, _tree, _header, _footer, _viewerOption );
                        FINDER_ARRAY.push( _finder );
                        return _finder;
                },
@@ -1153,8 +1153,8 @@ pettanr.finder = ( function(){
 
 
 pettanr.driver = ( function(){
-       var MyAuthorID = 'current_author' in window ? current_author.id : ( pettanr.DEBUG ? 1 : -1 ),
-               MyArtistID = 'current_artist' in window ? current_artist.id : ( pettanr.DEBUG ? 1 : -1 ),
+       var MyAuthorID = 'current_author' in window ? current_author.id : ( pettanr.CONST.SERVER_SUPPORT === false ? 1 : -1 ),
+               MyArtistID = 'current_artist' in window ? current_artist.id : ( pettanr.CONST.SERVER_SUPPORT === false ? 1 : -1 ),
                Driver = {
                        getSeqentialFiles: function( _file){
                                var _data = FileAPI.getFileData( _file),

diff --git a/public/assets/work.js b/public/assets/work.js
index 3109892..670a3bc 100644 (file)
--- a/public/assets/work.js
+++ b/public/assets/work.js
@@ -819,7 +819,8 @@ pettanr.editor = pettanr.view.registerApplication( function(){
                MENU_BAR_CONTROL.EDIT.createSelection( 'show Grid', 'ctrl + G', switchGrid, true, true, true);\r
 \r
                function addImage( e){\r
-                       setTimeout( COMIC_ELEMENT_CONTROL.createImageElement, 0);\r
+                       setTimeout( IMAGE_EXPLORER_WINDOW.open, 0);\r
+                       instance.bodyBackOrForward( true );\r
                        e && e.preventDefault && e.preventDefault();\r
                        return false;\r
                }\r
@@ -883,7 +884,13 @@ pettanr.editor = pettanr.view.registerApplication( function(){
                                        delete this.onInit;\r
                                },\r
                                onOpen: function( _w, _h){\r
-                                       finder = finder || pettanr.finder.createFinder( pettanr.editor, document.getElementById( 'image-exproler-container'), pettanr.driver.createPictureTree());\r
+                                       finder = finder || pettanr.finder.createFinder(\r
+                                               pettanr.editor,\r
+                                               document.getElementById( 'image-exproler-container'),\r
+                                               pettanr.driver.createPictureTree(),\r
+                                               null, null,\r
+                                               COMIC_ELEMENT_CONTROL.onImageSelect\r
+                                       );\r
                                        finder.resize( _w, _h );\r
                                },\r
                                onResize: function( _w, _h ){\r
@@ -2545,25 +2552,6 @@ pettanr.editor = pettanr.view.registerApplication( function(){
                function restoreReplaceElement( arg){\r
                        replaceComicElement( arg[ 0], arg[ 1]);\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
@@ -2669,10 +2657,28 @@ pettanr.editor = pettanr.view.registerApplication( function(){
                        },\r
                        createImageElement: function( data ){\r
                                if( Type.isObject( data ) === false ){\r
-                                       pettanr.premiumSatge.bootInOverlay( 1, onImageSelect );\r
+                                       pettanr.premiumSatge.bootInOverlay( 1, COMIC_ELEMENT_CONTROL.onImageSelect );\r
                                } else {\r
-                                       onImageSelect( data, true );\r
+                                       COMIC_ELEMENT_CONTROL.onImageSelect( data, true );\r
+                               }\r
+                       },\r
+                       onImageSelect: function( 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
                        createTextElement: function( data ){\r
                                var _panelElement;\r