diff --git a/plugins/filetools/lang/en.js b/plugins/filetools/lang/en.js index 725e858038a..a9d3e55d984 100644 --- a/plugins/filetools/lang/en.js +++ b/plugins/filetools/lang/en.js @@ -9,5 +9,5 @@ CKEDITOR.plugins.setLang( 'filetools', 'en', { httpError403: 'HTTP error occurred during file uploading (403: Forbidden).', httpError: 'HTTP error occurred during file uploading (error status: %1).', noUrlError: 'Upload URL is not defined.', - responseError: 'Incorrect server response format: %1' -} ); \ No newline at end of file + responseError: 'Incorrect server response.' +} ); diff --git a/plugins/filetools/plugin.js b/plugins/filetools/plugin.js index d5ebaabe0bf..dfca3146f68 100644 --- a/plugins/filetools/plugin.js +++ b/plugins/filetools/plugin.js @@ -178,12 +178,9 @@ } } catch ( err ) { // Response parsing error. - var responseError = fileLoader.lang.filetools.responseError; - if ( xhr.getResponseHeader( 'content-type' ).search( 'text/plain' ) !== -1 ) { - data.message = responseError.replace( '%1', xhr.responseText ); - } else { - data.message = responseError.replace( ': %1', '.' ); - } + data.message = fileLoader.lang.filetools.responseError; + window.console && window.console.log( xhr.responseText ); + evt.cancel(); } }, null, null, 999 ); diff --git a/tests/plugins/filetools/filetools.js b/tests/plugins/filetools/filetools.js index bdf0fba36b9..314cf783193 100644 --- a/tests/plugins/filetools/filetools.js +++ b/tests/plugins/filetools/filetools.js @@ -173,35 +173,29 @@ }, 'test fileUploadResponse event': function() { + var log = window.console && sinon.spy( window.console, 'log' ); + var message = 'Not a JSON'; - var contentType; + var error = 'Error.'; - //Mock + // Mock. var data = { fileLoader: { xhr: { - getResponseHeader: function() { - return contentType; - }, responseText: message }, + lang: { filetools: { - responseError: 'Error: %1' + responseError: error } } } }; - contentType = 'text/plain'; - - this.editor.fire( 'fileUploadResponse', data ); - assert.areEqual( data.message, 'Error: ' + message ); - - contentType = 'text/html'; - this.editor.fire( 'fileUploadResponse', data ); - assert.areEqual( data.message, 'Error.' ); + assert.areEqual( data.message, error ); + assert.isTrue( log ? log.calledWith( message ) : true ); } } ); } )();