Merge branch 't/10213' into major

ckeditor · Mar 14, 2013 · 8371034 · 8371034
2 parents a61e9fd + 5366ed1
commit 8371034
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/core/filter.js b/core/filter.js
@@ -1871,7 +1871,8 @@
  * Virtual class representing {@link CKEDITOR.filter#check} argument.
  *
  * This is a simplified version of the {@link CKEDITOR.filter.allowedContentRules} type.
- * It may contain only one element and its styles, classes, and attributes.
+ * It may contain only one element and its styles, classes, and attributes. Only the
+ * string format and a {@link CKEDITOR.style} instances are accepted.
  *
  * @since 4.1
  * @class CKEDITOR.filter.contentRule

diff --git a/plugins/justify/plugin.js b/plugins/justify/plugin.js
@@ -56,6 +56,10 @@
 			}
 
 			this.cssClassRegex = new RegExp( '(?:^|\\s+)(?:' + classes.join( '|' ) + ')(?=$|\\s)' );
+			this.requiredContent = 'p(' + this.cssClassName + ')';
+		}
+		else {
+			this.requiredContent = 'p{text-align}';
 		}
 
 		this.allowedContent = {
@@ -66,7 +70,6 @@
 				classes: this.cssClassName || null
 			}
 		};
-		this.requiredContent = 'p{text-align}';
 	}
 
 	function onDirChanged( e ) {