Now working for edit panel.

[pettanr/pettanr.git] / app / assets / javascripts / peta-apps.js

diff --git a/app/assets/javascripts/peta-apps.js b/app/assets/javascripts/peta-apps.js
index 0759a53..accb7d0 100644 (file)
--- a/app/assets/javascripts/peta-apps.js
+++ b/app/assets/javascripts/peta-apps.js
@@ -1,6 +1,6 @@
 /*
  * pettanR peta.apps.js
- *   version 0.5.53
+ *   version 0.5.55
  *   
  * author:
  *   itozyun
@@ -154,7 +154,7 @@
                                        // Panel Element
                                        case PANEL_ELEMENT_ARRAY :
                                                json.type = FILE_TYPE.PANEL_ELEMENT;
-                                               data = createFileData( json, PANEL_ELEMENT_ARRAY, 'caption,url,width,height,x,y,z,t,balloons,speeches,settings' ); // 画像の分
+                                               data = createFileData( json, PANEL_ELEMENT_ARRAY, 'caption,url,width,height,x,y,z,t,balloons,speeches,settings,classname' ); // 画像の分
                                                // 噴出しの分
                                                // 景色の分
                                                break;
@@ -3868,7 +3868,7 @@ var Editor = gOS.registerApplication( function(){
                this.templete = data.balloon_template_id || data.balloon_template.id;
                this.tempName = data.classname;
                this.content  = '';
-               
+
                var speaches = data.speeches;
                for( var k in speaches ){
                        this.content += speaches[ k ].content || '';
@@ -4171,7 +4171,7 @@ var Editor = gOS.registerApplication( function(){
                        },
                        onBalloonSelect : function( data ){
                                var _panelElement;
-                               if( data.classname ){
+                               if( !data.balloons ){
                                        data = {
                                                balloon_template_id : data.id,
                                                classname           : data.classname,
@@ -5003,7 +5003,7 @@ var PanelConsole = gOS.registerApplication( function(){
                if( model ){
                        model.publish( comboboxPublish.selectIndex() === 1 );
                        elmInput.value = model.getJsonPostString().replace( /\n/g, '' );
-                       inputData.value( elmInput.value );              
+                       inputData.value( elmInput.value );
                } else {
                        elmInput.value = inputData.value();
                };
@@ -5045,7 +5045,7 @@ var PanelConsole = gOS.registerApplication( function(){
        this.elmUploaderID   = 'newpanel';
        this.iframeWrapID    = 'panel-console-iframe-container';
        this.elmIframeName   = 'targetFrameNewPanel';
-       this.scriptSrc       = pettanr.CONST.CREATE_PANEL_JS;
+       //this.scriptSrc       = pettanr.CONST.CREATE_PANEL_JS;
        this.hideUploader    = false;
        FormApplicationHelper( this );
 
@@ -5061,6 +5061,7 @@ var PanelConsole = gOS.registerApplication( function(){
                        comboboxPublish.createOption( 'only me', '0', _model.publish() === false );
                        comboboxPublish.createOption( 'publish', '1', _model.publish() === true );
                        model = _model;
+                       this.scriptSrc = _model.panelID() === -1 ? pettanr.CONST.CREATE_PANEL_JS : pettanr.CONST.UPDATE_PANEL_JS + _model.panelID() + '\/edit.js';
                } else {
                        elm.parentNode.removeChild( elm );
                };
@@ -5347,6 +5348,9 @@ var Model = ( function(){
                        
                        return HTML_ARRAY.join( pettanr.LINE_FEED_CODE_TEXTAREA );
                };
+               this.panelID = function(){
+                       return panelID;
+               };
                this.publish = function( v ){
                        return publish = Type.isBoolean( v ) === true ? v : publish;
                };