Client is version 0.5.46, fixed picture.id

[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 0b1a931..8065af1 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.44
+ *   version 0.5.46
  *   
  * author:
  *   itozyun
@@ -447,6 +447,7 @@
                        this.viewerApplicationList = function( file ){
                                var data = FileAPI.getFileData( file ),
                                        type = data !== null ? data.type : null;
+                               if( data === FILE_DATA_MY_ORIGINAL_PICTURES_ROOT ) return [ PremiumSatge ];
                                switch( type ){
                                        case FILE_TYPE.COMIC :
                                        case FILE_TYPE.PANEL :
@@ -458,10 +459,7 @@
                                                break;
                                        case FILE_TYPE.ARTIST :
                                                return [ PremiumSatge ];
-                                       default :
-                                               if( data === FILE_DATA_MY_ORIGINAL_PICTURES_ROOT ){
-                                                       return [ PremiumSatge ];
-                                               };                                              
+                                       default :                                               
                                };
                                return [];
                        };
@@ -853,9 +851,9 @@ var PremiumSatge = gOS.registerApplication( function(){
        var ImageGroupIconClass = function( index, data ){
                var elmIconWrap     = elmIconOrigin.cloneNode( true ),
                        elmIconTitle    = Util.getElementsByClassName( elmIconWrap, 'image-group-item-title' )[ 0 ],
-                       originalPicture = data.original_picture,
+                       originalPicture = data.original_picture || data,
                        SRC             = [ BASE_PATH, data.id, '.', data.ext ].join( ''),
-                       LOW_SRC         = originalPicture.filesize && originalPicture.filesize > LIMIT_FILESIZE ? [ THUMB_PATH, data.id, '.', originalPicture.ext ].join( '') : null,
+                       LOW_SRC         = originalPicture.filesize && originalPicture.filesize > LIMIT_FILESIZE ? [ THUMB_PATH, data.id, '.', data.ext ].join( '' ) : null,
                        reversibleImage = null,
                        timer           = null,
                        onEnterFlag     = false,
@@ -3488,7 +3486,7 @@ var Editor = gOS.registerApplication( function(){
                };
                function change(){
                        if( currentElement === null ) return;
-                       PremiumSatge.boot( currentElement.artistID, currentElement.resourcePicture, currentElement );
+                       PremiumSatge.boot( currentElement.artistID, currentElement.realPicture, currentElement );
                };
 
                return {
@@ -3685,8 +3683,6 @@ var Editor = gOS.registerApplication( function(){
                this.flipV    = data.height < 0 ? -1 : 1;
                this.flipH    = data.width  < 0 ? -1 : 1;
                this.rPicture = data.picture;
-               //this.oPicture = this.rPicture.original_picture;
-               //this.artistID = this.oPicture.artist.id || -1;
                
                var self = this;
                function animeComplete(){
@@ -3712,7 +3708,7 @@ var Editor = gOS.registerApplication( function(){
                                this.flipV = updateV === true ? -this.flipV : this.flipV;
                                this.reversibleImage.resize( this.flipH * this.w, this.flipV * this.h );
                        },
-                       resourcePicture : function( _rPicture ){
+                       realPicture : function( _rPicture ){
                                if( _rPicture && _rPicture !== this.rPicture ){
                                        HISTORY_CONTROL.saveState( this._updateResourcePicture, this.rPicture, _rPicture, this );
                                        this._updateResourcePicture( _rPicture );
@@ -3757,7 +3753,7 @@ var Editor = gOS.registerApplication( function(){
                                this.actualH = this.oPicture.height;
                                
                                var _reversibleImage = pettanr.image.createReversibleImage( 
-                                               [ pettanr.CONST.RESOURCE_PICTURE_PATH, this.rPicture.id, '.', this.rPicture.ext ].join( '' ),
+                                               [ pettanr.CONST.PICTURE_PATH, this.rPicture.id, '.', this.rPicture.ext ].join( '' ),
                                                this.flipH * this.w, this.flipV * this.h
                                        );
                                if( this.reversibleImage !== null ){
@@ -4071,7 +4067,7 @@ var Editor = gOS.registerApplication( function(){
                                var _panelElement;
                                if( isPanelPictureData !== true ){
                                        _panelElement = new ImageElementClass( {
-                                               picture : data,
+                                               picture : data.picture,
                                                x       : Math.floor( panelW / 2 - data.width / 2 ),
                                                y       : Math.floor( panelH / 2 - data.height / 2 ),
                                                z       : -1,
@@ -5041,7 +5037,7 @@ var Model = ( function(){
                function getPanelElementByTiming(){
                        var i, l = panelElementArray.length;
                        while( timing < l * 2 ){
-                               for( i=0; i<l; ++i ){
+                               for( i = 0; i < l; ++i ){
                                        if( timing === panelElementArray[ i ].timing ){
                                                // console.log( timing + ' , ' + panelElementArray[ i ].timing );
                                                ++timing;
@@ -5053,9 +5049,10 @@ var Model = ( function(){
                        return null;
                };
                function panelElementToHtml( _panelElement, isAbsoluteUrl, isXHTML ){
-                       var url;
+                       var rPic, url;
                        if( _panelElement.type === 0 ){
-                               url = [ pettanr.CONST.RESOURCE_PICTURE_PATH, _panelElement.resourcePicture().id, '.', _panelElement.resourcePicture().ext ].join( '' );
+                               rPic = _panelElement.realPicture();
+                               url  = [ pettanr.CONST.RESOURCE_PICTURE_PATH, rPic.id, '.', rPic.ext ].join( '' );
                                return [
                                        '<img ',
                                                'src="',        isAbsoluteUrl !== true ? url : Util.getAbsolutePath( url ), '" ',
@@ -5094,12 +5091,13 @@ var Model = ( function(){
                        };
                };
                function getImageJsonGET( _imageElement ){
-                       var cr = pettanr.LINE_FEED_CODE_TEXTAREA;
+                       var cr = pettanr.LINE_FEED_CODE_TEXTAREA,
+                               rPic = _imageElement.realPicture();
                        return [
                                '{', cr,
                                        '"resource_picture": {', cr,
-                                               '"id": ',              _imageElement.resourcePicture().id, ',', cr,
-                                               '"ext": ',             '"',_imageElement.resourcePicture().ext, '"', cr,
+                                               '"id": ',              rPic.id, ',', cr,
+                                               '"ext": ',             '"', rPic.ext, '"', cr,
                                        '},', cr,
                                        '"x": ',                   _imageElement.x, ',', cr,
                                        '"y": ',                   _imageElement.y, ',', cr,
@@ -5114,7 +5112,7 @@ var Model = ( function(){
                        var cr = pettanr.LINE_FEED_CODE_TEXTAREA;
                        return [
                                '{', cr,
-                                       '"picture_id": ', _imageElement.resourcePicture().id, ',', cr,
+                                       '"picture_id": ', _imageElement.realPicture().id, ',', cr,
                                        '"x": ',          _imageElement.x, ',', cr,
                                        '"y": ',          _imageElement.y, ',', cr,
                                        '"z": ',          _imageElement.z + 1, ',', cr,