app/assets/javascripts/ckeditor/config.js in ckeditor-4.1.5 vs app/assets/javascripts/ckeditor/config.js in ckeditor-4.1.6

- old
+ new

@@ -31,68 +31,9 @@ // The location of a script that handles file uploads. config.filebrowserUploadUrl = "/ckeditor/attachment_files"; config.allowedContent = true; - // 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": - csrf_token = meta.content; - break; - case "csrf-param": - csrf_param = meta.content; - break; - default: - continue; - } - } - - 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; - } else { - for ( var i in params ) - 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']); - } - } - }); - // Toolbar groups configuration. config.toolbar = [ { name: 'document', groups: [ 'mode', 'document', 'doctools' ], items: [ 'Source'] }, { name: 'clipboard', groups: [ 'clipboard', 'undo' ], items: [ 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ] }, // { name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ], items: [ 'Find', 'Replace', '-', 'SelectAll', '-', 'Scayt' ] },