Ticket #8124: 8124.patch

_source/plugins/dialog/plugin.js

@@ -2939 +2939 @@
                         integerRegex = /^\d*$/,
                         numberRegex = /^\d*(?:\.\d+)?$/,
                         htmlLengthRegex = /^(((\d*(\.\d+))|(\d*))(px|\%)?)?$/,
-                        cssLengthRegex = /^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i;
+                        cssLengthRegex = /^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i,
+                        inlineStyleRegex = /^(\s*[\w-]+\s*:\s*[^:;]+(?:;|$))*$/;
 
                 CKEDITOR.VALIDATE_OR = 1;
                 CKEDITOR.VALIDATE_AND = 2;
@@ -3031 +3032 @@
                                 return this.functions( function( val ){ return htmlLengthRegex.test( CKEDITOR.tools.trim( val ) ); }, msg );
                         },
 
+                        'inlineStyle' : function( msg )
+                        {
+                                return this.functions( function( val ){ return inlineStyleRegex.test( CKEDITOR.tools.trim( val ) ); }, msg );
+                        },
+
                         equals : function( value, msg )
                         {
                                 return this.functions( function( val ){ return val == value; }, msg );

_source/lang/en.js

@@ -123 +123 @@
                 invalidWidth    : 'Width must be a number.',
                 invalidCssLength        : 'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',
                 invalidHtmlLength       : 'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',
+                invalidInlineStyle      : 'Value specified for the inline style must be one or multiple tuples with the form "name : value" which are separated by semi-colon.',
 
                 // Put the voice-only part of the label in the span.
                 unavailable             : '%1<span class="cke_accessibility">, unavailable</span>'

_source/plugins/dialogadvtab/plugin.js

@@ -132 +132 @@
                                                 label : lang.styles,
                                                 'default' : '',
 
+                                                validate : CKEDITOR.dialog.validate.inlineStyle( lang.invalidInlineStyle ),
                                                 onChange : function(){},
 
                                                 getStyle : function( name, defaultValue )