Fixed config.fillEmptyBlocks in effect.

ckeditor · Oct 16, 2012 · ea07419 · ea07419
1 parent 2e8dd8d
commit ea07419
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/core/editor.js b/core/editor.js
@@ -129,9 +129,6 @@
 		 */
 		this.focusManager = new CKEDITOR.focusManager( this );
 
-		// Documented in dataprocessor.js.
-		this.dataProcessor = new CKEDITOR.htmlDataProcessor( this );
-
 		/**
 		 * Controls keystrokes typing in this editor instance.
 		 *
@@ -318,6 +315,13 @@
 		// Fire the "configLoaded" event.
 		editor.fireOnce( 'configLoaded' );
 
+		initComponents( editor );
+	}
+
+	// Various other core components that read editor configuration.
+	function initComponents( editor ) {
+		// Documented in dataprocessor.js.
+		editor.dataProcessor = new CKEDITOR.htmlDataProcessor( editor );
 		loadSkin( editor );
 	}
 

diff --git a/core/htmldataprocessor.js b/core/htmldataprocessor.js
@@ -35,7 +35,7 @@
 		defaultHtmlBlockFilterRules.root = getBlockExtension( true, false );
 
 		for ( i in blockLikeTags )
-			defaultHtmlBlockFilterRules.elements[ i ] = getBlockExtension( true, editor.config.fillEmptyBlocks );
+			defaultHtmlBlockFilterRules.elements[ i ] = getBlockExtension( true, editor.config.fillEmptyBlocks !== false );
 
 		htmlFilter.addRules( defaultHtmlBlockFilterRules );
 	};
@@ -586,4 +586,3 @@
  * @cfg {Boolean} [fillEmptyBlocks=true]
  * @member CKEDITOR.config
  */
-CKEDITOR.config.fillEmptyBlocks = true;