Changeset 1307 for branches


Ignore:
Timestamp:
04/12/11 12:13:14 (9 years ago)
Author:
gogo
Message:

Further work for MFM integration

Location:
branches/MootoolsFileManager-Update/plugins/MootoolsFileManager
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/MootoolsFileManager.FileManager.js

    r1300 r1307  
    8686    {     
    8787      this.FileManagerWidget = new FileManager({ 
    88         url:            this.editor.config.MootoolsFileManager.backend +'__function=file-manager&', 
     88        url:            this.editor.config.MootoolsFileManager.backend, 
    8989        assetBasePath:  Xinha.getPluginDir('MootoolsFileManager')+'/mootools-filemanager/Assets', 
    9090        language:       _editor_lang, 
     
    9292        upload:         this.phpcfg.allow_files_upload, 
    9393        destroy:        this.phpcfg.allow_files_delete, 
    94         createFolders:  this.phpcfg.allow_files_upload,    
    95         uploadAuthData: this.editor.config.MootoolsFileManager.backend_data, 
    96         onComplete:     function(path, file) { self.FileManagerReturn(path,file); }, 
     94        createFolders:  this.phpcfg.allow_files_create_dir,    
     95        rename:         this.phpcfg.allow_files_rename, 
     96        move_or_copy:   this.phpcfg.allow_files_rename, 
     97        download:       this.phpcfg.allow_files_download,    
     98                                                      
     99        propagateData:  Object.merge({'__function': 'file-manager'}, this.editor.config.MootoolsFileManager.backend_data), 
     100        propagateType:  'POST', 
     101       
     102        uploadAuthData: Object.merge({'__function': 'file-manager'}, this.editor.config.MootoolsFileManager.backend_data), 
     103                                                
     104        onComplete:     function(path, file, mgr) { self.FileManagerReturn(path,file); }, 
    97105        onHide:         function() { if(this.swf && this.swf.box) this.swf.box.style.display = 'none'; }, 
    98106        onShow:         function() { if(this.swf && this.swf.box) this.swf.box.style.display = ''; }, 
  • branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/MootoolsFileManager.ImageManager.js

    r1305 r1307  
    476476    // Check if this is the same image 
    477477    var warn = function() {       
    478       new Dialog('This image is a different size, would you like to use the new size?', { 
     478      new FileManager.Dialog('This image is a different size, would you like to use the new size?', { 
    479479        language: {         
    480480          confirm: 'Shrink/Grow To Fit',         
     
    504504    } 
    505505       
    506       if(!details.url) warn(); 
     506      if(!details.path) warn(); 
    507507      else if(!this.current_image) warn(); 
    508508      else 
     
    517517              } 
    518518          } 
    519           if(details.url != src) warn(); 
     519          if(details.path != src) warn(); 
    520520      } 
    521521     
  • branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/backend.php

    r1304 r1307  
    9898 
    9999  case 'image-manager': 
     100    if(!@$IMConfig['images_dir']) 
     101    { 
     102      // Session time out 
     103      echo '{"status" : 0, "error": "No images_dir, most likely your session has timed out."}';exit; 
     104    } 
     105     
    100106    // include('mootools-filemanager/Assets/Connector/FileManager.php'); 
    101107    include('XinhaFileManager.php'); 
     
    127133   
    128134  case 'file-manager': 
    129     include('mootools-filemanager/Assets/Connector/FileManager.php'); 
    130  
    131     $browser = new FileManager(array( 
     135    if(!@$IMConfig['files_dir']) 
     136    { 
     137      // Session time out 
     138      echo '{"status" : 0, "error": "No files_dir, most likely your session has timed out."}';exit; 
     139    } 
     140     
     141    include('XinhaFileManager.php'); 
     142     
     143    $browser = new XinhaFileManager(array( 
    132144      'files_dir'     => $IMConfig['files_dir'], 
    133145      'files_url'     => $IMConfig['files_url'], 
    134146       
    135147      'thumbs_dir'    => $IMConfig['thumbs_dir'], 
    136       'thumbs_url'    => $IMConfig['thumbs_dir'], 
     148      'thumbs_url'    => $IMConfig['thumbs_url'], 
    137149       
    138150      'assetBasePath' => $IMConfig['base_url'] .'/mootools-filemanager/Assets', 
Note: See TracChangeset for help on using the changeset viewer.