bug fix

diff --git a/0.4.x/javascripts/system.js b/0.4.x/javascripts/system.js
index f718bb5..fc638a0 100644 (file)
--- a/0.4.x/javascripts/system.js
+++ b/0.4.x/javascripts/system.js
@@ -1,6 +1,6 @@
 /*
  * pettanR system.js
- *   version 0.4.1
+ *   version 0.4.2
  *   
  * author:
  *   itozyun
@@ -67,7 +67,7 @@ pettanr.file = ( function(){
                UPDATE_POLICY_S____ = 0x10000,
                UPDATE_POLICY______ = 0x00000,
                FILEDATA_RESITER = [],
-               FILEDATA_HAS_rID_RESISTER = {},
+               FILEDATA_HAS_domainID_RESISTER = {},
                FILEDATA_ACCESS = [],
                FILE_OBJECT_POOL = [];
                
@@ -278,31 +278,31 @@ pettanr.file = ( function(){
                                _artistFolderData, _artistFolder,
                                _comicFolderData, _comicFolder,
                                _authorFolderData, _authorFolder,
-                               _reaourceID = buildResourceID( _data.json, _childType);
+                               _reaourceID = buildDomainID( _data.json, _childType);
 
                        for(var i=0; i<l; ++i){
                                _newData = buildFileData( _json[ i], _data.json, _data, _childType);
 
                                if( _reaourceID !== null){
-                                       _rFolderData = getFolderDataByResourceID( _reaourceID, _childType, _file);
+                                       _rFolderData = getDomainFolder( _reaourceID, _childType, _file);
                                        _rFolderData.children.push( _newData);
                                }
                                if( _newData.artist){
-                                       _artistFolderData = _artistFolderData || getFolderDataByResourceID( buildResourceID( _data.json, 'artist'), 'Artists', _file);
+                                       _artistFolderData = _artistFolderData || getDomainFolder( buildDomainID( _data.json, 'artist'), 'Artists', _file);
                                        _artistFolder = _artistFolder || new FileClass( SYSTEM_TREE, _file, _artistFolderData);
-                                       _rFolderData = getFolderDataByResourceID( buildResourceID( _artistFolderData.rID, '' +_newData.artist.id), _newData.artist.name, _artistFolder);
+                                       _rFolderData = getDomainFolder( buildDomainID( _artistFolderData.rID, '' +_newData.artist.id), _newData.artist.name, _artistFolder);
                                        _rFolderData.children.push( _newData);
                                }
                                if( _newData.comic){
-                                       _comicFolderData = _comicFolderData || getFolderDataByResourceID( buildResourceID( _data.json, 'comic'), 'Comics', _file);
+                                       _comicFolderData = _comicFolderData || getDomainFolder( buildDomainID( _data.json, 'comic'), 'Comics', _file);
                                        _comicFolder = _comicFolder || new FileClass( SYSTEM_TREE, _file, _comicFolderData);
-                                       _rFolderData = getFolderDataByResourceID( buildResourceID( _comicFolderData.rID, '' +_newData.comic.id), _newData.comic.title, _comicFolder);
+                                       _rFolderData = getDomainFolder( buildDomainID( _comicFolderData.rID, '' +_newData.comic.id), _newData.comic.title, _comicFolder);
                                        _rFolderData.children.push( _newData);
                                }       
                                if( _newData.author){
-                                       _authorFolderData = _authorFolderData || getFolderDataByResourceID( buildResourceID( _data.json, 'author'), 'Author', _file);
+                                       _authorFolderData = _authorFolderData || getDomainFolder( buildDomainID( _data.json, 'author'), 'Author', _file);
                                        _authorFolder = _authorFolder || new FileClass( SYSTEM_TREE, _file, _authorFolderData);
-                                       _rFolderData = getFolderDataByResourceID( buildResourceID( _authorFolderData.rID, '' +_newData.author.id), _newData.author.name, _authorFolder);
+                                       _rFolderData = getDomainFolder( buildDomainID( _authorFolderData.rID, '' +_newData.author.id), _newData.author.name, _authorFolder);
                                        _rFolderData.children.push( _newData);
                                }
                        }
@@ -330,8 +330,8 @@ pettanr.file = ( function(){
                        
                        return _data;
                }
-               function buildResourceID( _url, _type){
-                       if( _url === null) return null;
+               function buildDomainID( _url, _type){
+                       if( !_url) return null;
                        var _typeStr = null;
                        
                        if( typeof _type !== 'number'){
@@ -351,13 +351,13 @@ pettanr.file = ( function(){
                        return [ _url.replace(/https?:\/\/([^\/]*).*/, '$1'), _typeStr].join('_');
                }
        /**
-        * getFileByResourceID( _rID, opt_name, opt_folder)
+        * getFileByResourceID( _domainID, opt_name, opt_folder)
         * opt 指定で 新しいフォルダの作成
         * rID を持つ Object は {} にも格納．
         */
-               function getFolderDataByResourceID( _rID, opt_name, opt_folder){
-                       if( FILEDATA_HAS_rID_RESISTER[ _rID]){
-                               return FILEDATA_HAS_rID_RESISTER[ _rID];
+               function getDomainFolder( _domainID, opt_name, opt_folder){
+                       if( FILEDATA_HAS_domainID_RESISTER[ _domainID]){
+                               return FILEDATA_HAS_domainID_RESISTER[ _domainID];
                        }
                        if( !opt_name && !opt_folder) return;
                        
@@ -381,16 +381,16 @@ pettanr.file = ( function(){
                        var _newData = {
                                name:           _fileName,
                                type:           FILE_TYPE_IS_FOLDER,
-                               rID:            _rID,
+                               rID:            _domainID,
                                children:       []
                        };
                        FILEDATA_RESITER.push( _newData);
-                       FILEDATA_HAS_rID_RESISTER[ _rID] = _newData;
+                       FILEDATA_HAS_domainID_RESISTER[ _domainID] = _newData;
                        
                        if( opt_folder && opt_folder.isChildFile( _newData) === false){
                                var _access = getFileDataAccess( opt_folder),
                                        _data = _access !== null ? _access.DATA : null;
-                               _access === null && alert( _rID)
+                               _access === null && alert( _domainID)
                                if( _data !== null){
                                        _data.children.push( _newData);
                                }

diff --git a/0.4.x/javascripts/work.js b/0.4.x/javascripts/work.js
index a56e152..64e5513 100644 (file)
--- a/0.4.x/javascripts/work.js
+++ b/0.4.x/javascripts/work.js
@@ -1,6 +1,6 @@
 /*\r
  * pettanR work.js\r
- *   version 0.4.1\r
+ *   version 0.4.2\r
  *   \r
  * author:\r
  *   itozyun\r
@@ -2245,7 +2245,7 @@ pettanr.editor = ( function(){
                                        _momoryW = 0,\r
                                        _momoryH = 0;\r
                                /*\r
-                                * Opera 11+ often forget values, why ??
+                                * Opera 11+ often forget values, why ??\r
                                 */\r
                                while( _x === undefined || _y === undefined || _w === undefined || _h === undefined){\r
                                        _x = _x !== undefined ? _x : baseX +moveX *com.x;\r
@@ -3349,7 +3349,7 @@ pettanr.editor = ( function(){
                        IMAGE_GROUP_EXPROLER.init();\r
 \r
                /*\r
-                * centering
+                * centering\r
                 */\r
                        pettanr.key.addKeyDownEvent( pettanr.view.EDITOR, 96, false, true, centering);  // ctrl + 0\r
                        pettanr.key.addKeyDownEvent( pettanr.view.EDITOR, 48, false, true, centering);  // ctrl + 0\r