Client is version 0.5.52, New balloon is working at Editor & Reader.

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

diff --git a/app/assets/javascripts/peta-common.js b/app/assets/javascripts/peta-common.js
index 49dc559..0458082 100644 (file)
--- a/app/assets/javascripts/peta-common.js
+++ b/app/assets/javascripts/peta-common.js
@@ -1,6 +1,6 @@
 /*\r
  * pettanR peta.common.js\r
- *   version 0.5.51\r
+ *   version 0.5.52\r
  * \r
  *   author:\r
  *     itozyun\r
@@ -959,9 +959,8 @@ pettanr.bind = ( function(){
                        if( !elements ) return;\r
                        for( i = 0, l = elements.length; i < l; ++i ){\r
                                data    = elements[ i ];\r
-                               realPic = data.picture;\r
-                               if( realPic ){\r
-                                       this.buildImage( elmPanel, data, realPic );\r
+                               if( !data.balloons ){\r
+                                       this.buildImage( elmPanel, data, data.picture );\r
                                } else {\r
                                        this.buildBalloon( elmPanel, data );\r
                                };\r
@@ -994,33 +993,43 @@ pettanr.bind = ( function(){
                        var elmBalloonWrap = document.createElement( 'div' ),\r
                                elmText        = document.createElement( 'p' ),\r
                                content        = '',\r
-                               speechesAttr   = data.speeches_attributes,\r
+                               balloons       = data.balloons,\r
+                               speeches       = data.speeches,\r
+                               balloonData,\r
                                balloon, p;\r
                        elmPanel.appendChild( elmBalloonWrap );\r
                        elmBalloonWrap.className = NAMESPACE_CLASSNAME + 'balloon';\r
-                       elmBalloonWrap.style.cssText = [\r
-                               'width:',   data.width, 'px;',\r
-                               'height:',  data.height, 'px;',\r
-                               'left:',    data.x, 'px;',\r
-                               'top:',     data.y, 'px;',\r
-                               'z-index:', data.z, ';'\r
-                       ].join( '' );\r
-\r
-                       //balloon = pettanr.balloon.createBalloon( data.width, data.height, data.tail );\r
-                       balloon = pettanr.newBalloon.create( data.id, data.width, data.height, data.tail );\r
-                       elmBalloonWrap.appendChild( balloon.elm );\r
                        \r
-                       elmBalloonWrap.appendChild( elmText );\r
-                       \r
-                       elmText.appendChild( document.createElement( 'span' ) );\r
-                       \r
-                       if( speechesAttr ){\r
-                               for( p in speechesAttr ){\r
-                                       content += speechesAttr[ p ] && speechesAttr[ p ].content ? speechesAttr[ p ].content : '';\r
+                       if( balloons ){\r
+                               for( p in balloons ){\r
+                                       balloonData = balloons[ p ];\r
+                                       break;\r
+                               };\r
+                               if( balloonData ){\r
+                                       elmBalloonWrap.style.cssText = [\r
+                                               'width:',   balloonData.width, 'px;',\r
+                                               'height:',  balloonData.height, 'px;',\r
+                                               'left:',    balloonData.x, 'px;',\r
+                                               'top:',     balloonData.y, 'px;',\r
+                                               'z-index:', data.z, ';'\r
+                                       ].join( '' );                                   \r
+                               };\r
+                               \r
+                               balloon = pettanr.newBalloon.create( data.balloon_template.id, balloonData.width, balloonData.height, data.settings );\r
+                               elmBalloonWrap.appendChild( balloon.elm );\r
+       \r
+                               elmBalloonWrap.appendChild( elmText );\r
+                               \r
+                               elmText.appendChild( document.createElement( 'span' ) );\r
+                               \r
+                               if( speeches ){\r
+                                       for( p in speeches ){\r
+                                               content += speeches[ p ] && speeches[ p ].content ? speeches[ p ].content : '';\r
+                                       };\r
                                };\r
+                               elmText.firstChild.appendChild( document.createTextNode( content ));\r
+                               this.balloonList.push( balloon );                               \r
                        };\r
-                       elmText.firstChild.appendChild( document.createTextNode( content ));\r
-                       this.balloonList.push( balloon );\r
                },\r
                clean : function(){\r
                        // clean elmTarget\r