Deuglified toolbar creation - now only first fired uiSpace will generate toolbar.

Author: Reinmar

core/creators/themedui.js

@@ -302,7 +302,7 @@ CKEDITOR.replaceClass = 'ckeditor';
 
 		// Get the HTML for the predefined spaces.
 		var topHtml = editor.fire( 'uiSpace', { space: 'top', html: '' } ).html;
-		var bottomHtml = editor.fireOnce( 'uiSpace', { space: 'bottom', html: '' } ).html;
+		var bottomHtml = editor.fire( 'uiSpace', { space: 'bottom', html: '' } ).html;
 
 		if ( !themedTpl ) {
 			themedTpl = CKEDITOR.addTemplate( 'maincontainer', '<{outerEl}' +

plugins/floatingspace/plugin.js

@@ -20,9 +20,11 @@
 
 	CKEDITOR.plugins.add( 'floatingspace', {
 		init: function( editor ) {
-			editor.on( 'contentDom', function() {
+			// Add listener with lower priority than that in themedui creator.
+			// Thereby floatingspace will be created only if themedui wasn't used.
+			editor.on( 'loaded', function() {
 				attach( editor );
-			});
+			}, null, null, 20 );
 		}
 	});
 

plugins/toolbar/plugin.js

@@ -149,6 +149,9 @@
 
 			editor.on( 'uiSpace', function( event ) {
 				if ( event.data.space == editor.config.toolbarLocation ) {
+					// Create toolbar only once.
+					event.removeListener();
+
 					editor.toolbox = new toolbox();
 
 					var labelId = CKEDITOR.tools.getNextId();