From 9f252bcab153a30640a0410abdfc73f64496a5f5 Mon Sep 17 00:00:00 2001
From: itozyun <itozyun@gmail.com>
Date: Tue, 15 May 2012 23:20:20 +0900
Subject: [PATCH] client is version0.4.31, update add image button.

---
 public/assets/system.js | 12 ++++++------
 public/assets/work.js   | 52 +++++++++++++++++++++++++++----------------------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/public/assets/system.js b/public/assets/system.js
index cba80f31..45f770ad 100644
--- 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 3109892a..670a3bcf 100644
--- 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);
 
 		function addImage( e){
-			setTimeout( COMIC_ELEMENT_CONTROL.createImageElement, 0);
+			setTimeout( IMAGE_EXPLORER_WINDOW.open, 0);
+			instance.bodyBackOrForward( true );
 			e && e.preventDefault && e.preventDefault();
 			return false;
 		}
@@ -883,7 +884,13 @@ pettanr.editor = pettanr.view.registerApplication( function(){
 					delete this.onInit;
 				},
 				onOpen: function( _w, _h){
-					finder = finder || pettanr.finder.createFinder( pettanr.editor, document.getElementById( 'image-exproler-container'), pettanr.driver.createPictureTree());
+					finder = finder || pettanr.finder.createFinder(
+						pettanr.editor,
+						document.getElementById( 'image-exproler-container'),
+						pettanr.driver.createPictureTree(),
+						null, null,
+						COMIC_ELEMENT_CONTROL.onImageSelect
+					);
 					finder.resize( _w, _h );
 				},
 				onResize: function( _w, _h ){
@@ -2545,25 +2552,6 @@ pettanr.editor = pettanr.view.registerApplication( function(){
 		function restoreReplaceElement( arg){
 			replaceComicElement( arg[ 0], arg[ 1]);
 		}
-
-		function onImageSelect( data, isPanelPictureData ){
-			if( isPanelPictureData !== true ){
-				data = {
-					resource_picture:data,
-					x:               Math.floor( panelW /2 - data.width /2 ),
-					y:               Math.floor( panelH /2 - data.height /2 ),
-					z:               -1,
-					t:               PANEL_ELEMENT_ARRAY.length,
-					width:           data.width,
-					height:          data.height
-				}
-			}
-			var _panelElement = new ImageElementClass( data );
-			_panelElement.init && _panelElement.init();
-			appendComicElement( _panelElement );
-			_panelElement.animate( undefined, undefined, data.width, data.height );
-			SAVE( restoreComicElement, [ false, _panelElement], [ true, _panelElement], true );
-		}
 		function onTextInput( _panelElement ){
 			appendComicElement( _panelElement );
 			SAVE( restoreComicElement, [ false, _panelElement ], [ true, _panelElement ], true );
@@ -2669,10 +2657,28 @@ pettanr.editor = pettanr.view.registerApplication( function(){
 			},
 			createImageElement: function( data ){
 				if( Type.isObject( data ) === false ){
-					pettanr.premiumSatge.bootInOverlay( 1, onImageSelect );
+					pettanr.premiumSatge.bootInOverlay( 1, COMIC_ELEMENT_CONTROL.onImageSelect );
 				} else {
-					onImageSelect( data, true );
+					COMIC_ELEMENT_CONTROL.onImageSelect( data, true );
+				}
+			},
+			onImageSelect: function( data, isPanelPictureData ){
+				if( isPanelPictureData !== true ){
+					data = {
+						resource_picture:data,
+						x:               Math.floor( panelW /2 - data.width /2 ),
+						y:               Math.floor( panelH /2 - data.height /2 ),
+						z:               -1,
+						t:               PANEL_ELEMENT_ARRAY.length,
+						width:           data.width,
+						height:          data.height
+					}
 				}
+				var _panelElement = new ImageElementClass( data );
+				_panelElement.init && _panelElement.init();
+				appendComicElement( _panelElement );
+				_panelElement.animate( undefined, undefined, data.width, data.height );
+				SAVE( restoreComicElement, [ false, _panelElement], [ true, _panelElement], true );
 			},
 			createTextElement: function( data ){
 				var _panelElement;
-- 
2.11.0