Enable Upload Iamge plugin and prevent logging error in case of missing configuration

CHANGES.md

@@ -3,6 +3,10 @@
 
 ## CKEditor 4.8
 
+**Important Notes:**
+
+* [#1249](https://github.com/ckeditor/ckeditor-dev/issues/1249): Enabled the [Upload Image](https://ckeditor.com/cke4/addon/uploadimage) plugin by default in standard and full presets. Also it will no longer log an error in case of missing [`config.imageUploadUrl`](https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.config-cfg-imageUploadUrl) property.
+
 New Features:
 
 * [#662](https://github.com/ckeditor/ckeditor-dev/issues/662): Introduced image inlining for the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.

config.js

@@ -67,6 +67,7 @@ CKEDITOR.editorConfig = function( config ) {
 		'templates,' +
 		'toolbar,' +
 		'undo,' +
+		'uploadimage,' +
 		'wysiwygarea';
 	// %REMOVE_END%
 };

dev/builder/build-config.js

@@ -91,6 +91,7 @@ var CKBUILDER_CONFIG = {
 		templates: 1,
 		toolbar: 1,
 		undo: 1,
+		uploadimage: 1,
 		wysiwygarea: 1
 	}
 };

plugins/uploadimage/plugin.js

@@ -50,7 +50,6 @@
 				uploadUrl = fileTools.getUploadUrl( editor.config, 'image' );
 
 			if ( !uploadUrl ) {
-				CKEDITOR.error( 'uploadimage-config' );
 				return;
 			}
 

tests/plugins/uploadimage/manual/configerror.md

@@ -1,10 +1,10 @@
 @bender-ui: collapsed
-@bender-tags: 4.5.1, bug, trac13486, filetools
+@bender-tags: 4.5.1, bug, trac13486, 4.8.0, 1249, filetools
 @bender-ckeditor-plugins: uploadimage, wysiwygarea, toolbar, basicstyles
 
 Run this test with the console opened.
 
 Expected:
 
 * Editor should be fully functional except the `uploadimage` plugin.
-* No errors on IE8-9, an error logged in the console that `upload URL` was not set on other browsers.
+* No errors in the console on any browser.

tests/plugins/uploadimage/uploadimage.js

@@ -577,6 +577,20 @@
 			} );
 
 			wait();
+		},
+
+		'test no error if missing configuration': function() {
+			var spy = sinon.spy( CKEDITOR, 'error' );
+
+			bender.editorBot.create( {
+				name: 'configerror_test',
+				extraPlugins: 'uploadimage'
+			}, function( bot ) {
+				spy.restore();
+
+				assert.areSame( 0, spy.callCount, 'CKEDITOR.error call count' );
+				assert.isFalse( !!bot.editor.widgets.registered.uploadimage, 'uploadimage widget' );
+			} );
 		}
 	} );
 } )();