X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.5.x%2Fjavascripts%2Fpeta-apps.js;h=16cabfe634a836ebc16269affd39ed410626ead7;hb=2621070c032954702155d4a315535b8b1aafd616;hp=1d822e6feaaa4f7592edd5d7e6e648b999a21c0f;hpb=c684a38e0f7b7202c4d26afe429a98bbfa85a77f;p=pettanr%2FclientJs.git

diff --git a/0.5.x/javascripts/peta-apps.js b/0.5.x/javascripts/peta-apps.js
index 1d822e6..16cabfe 100644
--- a/0.5.x/javascripts/peta-apps.js
+++ b/0.5.x/javascripts/peta-apps.js
@@ -1,6 +1,6 @@
 /*
  * pettanR peta.apps.js
- *   version 0.5.47
+ *   version 0.5.49
  *   
  * author:
  *   itozyun
@@ -87,7 +87,17 @@
 						data = createFileData( json, LICENSE_GROUP_ARRAY, 'name,caption,url,classname' );
 						addChildData( FILE_DATA_LISENCE_GROUP, data );
 						break;
-						
+					
+					// Speech Balloon Templete
+					case FILE_DATA_BALLOON_ROOT :
+					case BALLOON_TEMPLETE_ARRAY :
+						json.type = FILE_TYPE.BALLOON_TEMPLETE;
+						// register pettanr.balloon
+						pettanr.newBalloon.register( json.settings );
+						data = createFileData( json, BALLOON_TEMPLETE_ARRAY, 'name,caption,classname,settings' );
+						addChildData( FILE_DATA_BALLOON_ROOT, data );
+						break;
+					
 					// Author
 					case FILE_DATA_AUTHOR_ROOT :
 					case AUTHOR_ARRAY          :
@@ -338,6 +348,8 @@
 						return [ data.name, '先生' ].join( '' );
 					case FILE_TYPE.ARTIST :
 						return [ data.name, '画伯' ].join( '' );
+					case FILE_TYPE.BALLOON_TEMPLETE :
+						return [ data.id, data.caption ].join( ':' );
 					case FILE_TYPE.FOLDER :
 				};
 				return data.name;
@@ -370,6 +382,8 @@
 						return { className: 'file-type-author' };
 					case FILE_TYPE.ARTIST :
 						return { className: 'file-type-artist' };
+					case FILE_TYPE.BALLOON_TEMPLETE :
+						return { className: 'file-type-balloon' };
 					case FILE_TYPE.FOLDER :
 						return { className: 'file-type-folder' };
 				};
@@ -400,6 +414,8 @@
 						return 'author id:' + data.id;
 					case FILE_TYPE.ARTIST :
 						return [ 'artist id:', data.id, ' Email:', data.email || 'empty' , ', HP:', data.homepage_url || 'empty' ].join( '' );
+					case FILE_TYPE.BALLOON_TEMPLETE :
+						return data.name + ', ' + data.settings;
 					case FILE_TYPE.FOLDER :
 						return 'pettanR folder';
 				};
@@ -488,14 +504,15 @@
 				STORY            : FileAPI.createFileTypeID(),
 				PANEL            : FileAPI.createFileTypeID(),
 				PANEL_ELEMENT    : FileAPI.createFileTypeID(),
-				BALLOON          : FileAPI.createFileTypeID(),				
+				BALLOON          : FileAPI.createFileTypeID(),
+				BALLOON_TEMPLETE : FileAPI.createFileTypeID(),	
 				ORIGINAL_PICTURE : FileAPI.createFileTypeID(),
 				RESOURCE_PICTURE : FileAPI.createFileTypeID(),
 				PICTURE          : FileAPI.createFileTypeID(),
 				AUTHOR           : FileAPI.createFileTypeID(),
 				ARTIST           : FileAPI.createFileTypeID(),
 				LICENSE          : FileAPI.createFileTypeID(),
-				LICENSE_GROUP    : FileAPI.createFileTypeID()
+				LICENSE_GROUP    : FileAPI.createFileTypeID(),
 			}
 		),
 		AUTHOR_ARRAY  = [],
@@ -616,9 +633,11 @@
 			children:	[]
 		},
 		FILE_DATA_BALLOON_ROOT = {
-			name:		'Balloon templetes',
+			name:		'Balloon Templetes',
 			type:		FILE_TYPE.FOLDER,
-			children:	[]
+			children:	[],
+			driver:		Driver,
+			json:		pettanr.CONST.SPEECH_BALOON_TEMPLETE
 		};
 	FILE_DATA_SERVICE_ROOT.children.push( FILE_DATA_COMICS_ROOT, FILE_DATA_RESOURCE_PICTURES_ROOT, FILE_DATA_ORIGINAL_PICTURES_ROOT, FILE_DATA_LISENCE_ROOT, FILE_DATA_BALLOON_ROOT );
 	FILE_DATA_COMICS_ROOT.children.push( FILE_DATA_MY_COMICS_ROOT, FILE_DATA_LATEST_COMICS, FILE_DATA_AUTHOR_ROOT, FILE_DATA_STORY_ROOT, FILE_DATA_PANELS_ROOT );
@@ -3680,7 +3699,7 @@ var Editor = gOS.registerApplication( function(){
 		this.$        = jqImageElementOrigin.clone( true );
 		this.data     = data;
 		this.z        = data.z;
-		this.timing   = data.t || PANEL_ELEMENT_ARRAY.length + 1;
+		this.timing   = data.t || PANEL_ELEMENT_ARRAY.length;
 		this.keepSize = false;
 		this.flipV    = data.height < 0 ? -1 : 1;
 		this.flipH    = data.width  < 0 ? -1 : 1;
@@ -3812,7 +3831,7 @@ var Editor = gOS.registerApplication( function(){
 		})();
 		this.balloon = pettanr.balloon.createBalloon( data.width, data.height, data.tail, this.type );
 		this.z       = data.z;
-		this.timing  = data.t || PANEL_ELEMENT_ARRAY.length + 1;
+		this.timing  = data.t || PANEL_ELEMENT_ARRAY.length;
 		
 		this.$.find( 'img' ).eq( 0 ).replaceWith( this.balloon.elm );
 		
@@ -4073,7 +4092,7 @@ var Editor = gOS.registerApplication( function(){
 						x       : Math.floor( panelW / 2 - data.width / 2 ),
 						y       : Math.floor( panelH / 2 - data.height / 2 ),
 						z       : -1,
-						t       : PANEL_ELEMENT_ARRAY.length + 1,
+						t       : 0,
 						width   : 1,
 						height  : 1
 					});
@@ -4097,7 +4116,7 @@ var Editor = gOS.registerApplication( function(){
 						x:					Math.floor( panelW / 2 - 100 + Math.random() * 10 ),
 						y:                  Math.floor( panelH / 2 - 100 + Math.random() * 10 ),
 						z:                  -1,
-						t:                  PANEL_ELEMENT_ARRAY.length + 1,
+						t:                  0,
 						width:              200,
 						height:             200,
 						speeches_attributes: {
@@ -5110,7 +5129,7 @@ var Model = ( function(){
 				'}'
 			].join( '');
 		};
-		function imageToJson( _imageElement, _timing ){
+		function imageToJson( _imageElement, t ){
 			var cr = pettanr.LINE_FEED_CODE_TEXTAREA;
 			return [
 				'{', cr,
@@ -5118,36 +5137,40 @@ var Model = ( function(){
 					'"x": ',          _imageElement.x, ',', cr,
 					'"y": ',          _imageElement.y, ',', cr,
 					'"z": ',          _imageElement.z + 1, ',', cr,
-					'"t": ',          _timing, ',', cr,
+					'"t": ',          t, ',', cr,
 					'"width": ',      _imageElement.flipH * _imageElement.w, ',', cr,
 					'"height": ',     _imageElement.flipV * _imageElement.h, cr,
 				'}'
 			].join( '');
 		};
 
-		function balloonToJson( _textElement, _timing ){
+		function balloonToJson( _textElement, t ){
 			var cr = pettanr.LINE_FEED_CODE_TEXTAREA;
 			return [
 				'{', cr,
-					'"balloon_template_id": ', 1, ',', cr,
-					'"system_picture_id": ',   1, ',', cr,
-					'"size": ',                1, ',', cr,
-					'"tail": ',                _textElement.a, ',', cr,
-					'"x": ',                   _textElement.x, ',', cr,
-					'"y": ',                   _textElement.y, ',', cr,
-					'"z": ',                   _textElement.z + 1, ',', cr,
-					'"t": ',                   timing, ',', cr,
-					'"width": ',               _textElement.w, ',', cr,
-					'"height": ',              _textElement.h, ',', cr,
-					'"speeches_attributes": {', cr,
-						'"newf', timing, '": {', cr,
-    						'"content": "', _textElement.content, '",', cr,
+					'"speech_balloon_template_id": ', 1, ',', cr,
+					'"classname": "Square",',
+					'"z": ',                _textElement.z + 1, ',', cr,
+					'"t": ',                t, ',', cr,
+					'"settings": "{\'tail\':' + _textElement.a + '}",',
+		            '"balloons_attributes": {', cr,
+		                '"newb', t, '": {', cr,
+							'"system_picture_id": ',  2, ',', cr,
+    						'"caption": "alt text",', cr,
 							'"x": ',        _textElement.x, ',', cr,
 							'"y": ',        _textElement.y, ',', cr,
-							'"t": ',        timing, ',', cr,
 							'"width": ',    _textElement.w, ',', cr,
 							'"height": ',   _textElement.h, cr,
 						'}', cr,
+					'},', cr,
+					'"speeches_attributes": {', cr,
+						'"news', t, '": {', cr,
+    						'"content": "', _textElement.content, '",', cr,
+							'"x": ',        Math.floor( _textElement.w * 0.16 ), ',', cr,
+							'"y": ',        Math.floor( _textElement.w * 0.16 ), ',', cr,
+							'"width": ',    Math.floor( _textElement.w * 0.66 ), ',', cr,
+							'"height": ',   Math.floor( _textElement.h * 0.66 ), cr,
+						'}', cr,
 					'}', cr,
 				'}'
 			].join( '');
@@ -5279,7 +5302,6 @@ var OutputConsole = gOS.registerApplication( function(){
 		comboboxFormat, inputOption,
 		buttonSubmit, buttonClose,
 		windowW, windowH,
-		timing   = 0,
 		comicID, panelID, panelTimming, panelW, panelH, borderSize, panelElementArray,
 		app      = this,
 		model    = null;