app/assets/javascripts/ckeditor/config.js in ckeditor-4.0.6 vs app/assets/javascripts/ckeditor/config.js in ckeditor-4.0.7

- old
+ new

@@ -6,39 +6,39 @@ CKEDITOR.editorConfig = function( config ) { // Define changes to default configuration here. For example: // config.language = 'fr'; // config.uiColor = '#AADC6E'; - + /* Filebrowser routes */ // The location of an external file browser, that should be launched when "Browse Server" button is pressed. config.filebrowserBrowseUrl = "/ckeditor/attachment_files"; // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Flash dialog. config.filebrowserFlashBrowseUrl = "/ckeditor/attachment_files"; // The location of a script that handles file uploads in the Flash dialog. config.filebrowserFlashUploadUrl = "/ckeditor/attachment_files"; - + // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Link tab of Image dialog. config.filebrowserImageBrowseLinkUrl = "/ckeditor/pictures"; // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Image dialog. config.filebrowserImageBrowseUrl = "/ckeditor/pictures"; // The location of a script that handles file uploads in the Image dialog. config.filebrowserImageUploadUrl = "/ckeditor/pictures"; - + // The location of a script that handles file uploads. config.filebrowserUploadUrl = "/ckeditor/attachment_files"; - + // Rails CSRF token config.filebrowserParams = function(){ var csrf_token, csrf_param, meta, metas = document.getElementsByTagName('meta'), params = new Object(); - + for ( var i = 0 ; i < metas.length ; i++ ){ meta = metas[i]; switch(meta.name) { case "csrf-token": @@ -53,14 +53,14 @@ } if (csrf_param !== undefined && csrf_token !== undefined) { params[csrf_param] = csrf_token; } - + return params; }; - + config.addQueryString = function( url, params ){ var queryString = []; if ( !params ) { return url; @@ -69,21 +69,21 @@ queryString.push( i + "=" + encodeURIComponent( params[ i ] ) ); } return url + ( ( url.indexOf( "?" ) != -1 ) ? "&" : "?" ) + queryString.join( "&" ); }; - + // Integrate Rails CSRF token into file upload dialogs (link, image, attachment and flash) CKEDITOR.on( 'dialogDefinition', function( ev ){ // Take the dialog name and its definition from the event data. var dialogName = ev.data.name; var dialogDefinition = ev.data.definition; var content, upload; - + if (CKEDITOR.tools.indexOf(['link', 'image', 'attachment', 'flash'], dialogName) > -1) { content = (dialogDefinition.getContents('Upload') || dialogDefinition.getContents('upload')); upload = (content == null ? null : content.get('upload')); - + if (upload && upload.filebrowser && upload.filebrowser['params'] === undefined) { upload.filebrowser['params'] = config.filebrowserParams(); upload.action = config.addQueryString(upload.action, upload.filebrowser['params']); } }