Changeset 286

Show
Ignore:
Timestamp:
2007-05-05 12:47:48 (3 years ago)
Author:
alfonsoml
Message:

First part of changes for #454, these are the changes to the .asp connector. Now the rest of the connectors won't work in this branch.

Location:
FCKeditor/branches/developers/alfonsoml
Files:
11 added
3 removed
3 modified

Legend:

Unmodified
Added
Removed

  • FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/browser.html

    r232 r286  
    135135                return 'default.icon' ; 
    136136} 
     137 
     138function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg ) 
     139{ 
     140        window.frames['frmUpload'].OnUploadCompleted( errorNumber, fileName ) ; 
     141} 
     142 
    137143                </script> 
    138144        </head> 

  • FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/frmupload.html

    r141 r286  
    5757        window.parent.frames['frmUploadWorker'].location = 'javascript:void(0)' ; 
    5858 
    59         // Reset the upload form (On IE we must do a little trick to avout problems). 
     59        // Reset the upload form (On IE we must do a little trick to avoid problems). 
    6060        if ( document.all ) 
    6161                document.getElementById('NewFile').outerHTML = '<input id="NewFile" name="NewFile" style="WIDTH: 100%" type="file">' ; 

  • FCKeditor/branches/developers/alfonsoml/fckconfig.js

    r232 r286  
    2828FCKConfig.DisableEnterKeyHandler = false ; 
    2929 
    30 FCKConfig.CustomConfigurationsPath = '/fckeditor.config.js' ; 
     30FCKConfig.CustomConfigurationsPath = '' ; 
     31FCKConfig.CustomConfigurationsPath = '/FCKplugins/fckeditor.config.js' ; 
    3132 
    3233FCKConfig.EditorAreaCSS = FCKConfig.BasePath + 'css/fck_editorarea.css' ; 
    … …  
    170171FCKConfig.BodyClass = '' ; 
    171172 
     173FCKConfig.DefaultLinkTarget = '' ; 
     174 
    172175// The option switches between trying to keep the html structure or do the changes so the content looks like it was in Word 
    173176FCKConfig.CleanWordKeepsStructure = false ; 
    … …  
    185188// @Packager.Remove.Start 
    186189// The development version (SVN) uses the PHP connector by default. 
    187 _FileBrowserLanguage    = 'php' ; 
    188 _QuickUploadLanguage    = 'php' ; 
     190_FileBrowserLanguage    = 'asp' ; 
     191_QuickUploadLanguage    = 'asp' ; 
    189192// @Packager.Remove.End 
    190193 
    … …  
    194197 
    195198FCKConfig.LinkBrowser = true ; 
    196 FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ; 
     199FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ; 
    197200FCKConfig.LinkBrowserWindowWidth        = FCKConfig.ScreenWidth * 0.7 ;         // 70% 
    198201FCKConfig.LinkBrowserWindowHeight       = FCKConfig.ScreenHeight * 0.7 ;        // 70% 
    199202 
    200203FCKConfig.ImageBrowser = true ; 
    201 FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ; 
     204FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ; 
    202205FCKConfig.ImageBrowserWindowWidth  = FCKConfig.ScreenWidth * 0.7 ;      // 70% ; 
    203206FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ;     // 70% ; 
    204207 
    205208FCKConfig.FlashBrowser = true ; 
    206 FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ; 
     209FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ; 
    207210FCKConfig.FlashBrowserWindowWidth  = FCKConfig.ScreenWidth * 0.7 ;      //70% ; 
    208211FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ;     //70% ; 
    209212 
    210213FCKConfig.LinkUpload = true ; 
    211 FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage ; 
     214FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage ; 
    212215FCKConfig.LinkUploadAllowedExtensions   = "" ;                  // empty for all 
    213216FCKConfig.LinkUploadDeniedExtensions    = ".(html|htm|php|php2|php3|php4|php5|phtml|pwml|inc|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|com|dll|vbs|js|reg|cgi|htaccess|asis)$" ;     // empty for no one 
    214217 
    215218FCKConfig.ImageUpload = true ; 
    216 FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Image' ; 
     219FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Image' ; 
    217220FCKConfig.ImageUploadAllowedExtensions  = ".(jpg|gif|jpeg|png|bmp)$" ;          // empty for all 
    218221FCKConfig.ImageUploadDeniedExtensions   = "" ;                                                  // empty for no one 
    219222 
    220223FCKConfig.FlashUpload = true ; 
    221 FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Flash' ; 
     224FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Flash' ; 
    222225FCKConfig.FlashUploadAllowedExtensions  = ".(swf|fla)$" ;               // empty for all 
    223226FCKConfig.FlashUploadDeniedExtensions   = "" ;                                  // empty for no one