Ticket #7530: 7530.patch

_source/plugins/selection/plugin.js

@@ -563 +563 @@
                                 this.isInvalid = true;
                         }
                 }
+                else if ( CKEDITOR.env.gecko )
+                        this.isInvalid = !document.$.defaultView;
 
                 return this;
         };
@@ -1365 +1367 @@
                                 }
 
                                 this.reset();
+
+                                // Just to trigger selection change event.
+                                this.document.fire( 'keyup', {} );
                         }
                 },
 

_source/plugins/styles/plugin.js

@@ -15 +15 @@
                         {
                                 editor.document.setCustomData( 'cke_includeReadonly', !editor.config.disableReadonlyStyling );
                         });
-        }
+
+                var defaultStyleDef = editor.config.defaultTextStyle,
+                        defaultStyle;
+
+                if ( defaultStyleDef )
+                {
+                        // Allow inline style overrides.
+                        defaultStyleDef.fullMatch = 1;
+                        defaultStyle = new CKEDITOR.style( defaultStyleDef );
+
+                        // Check default text style on any new selection position.
+                        editor.on( 'selectionChange', function( evt )
+                        {
+                                var sel = this.getSelection(), ranges = sel.getRanges(), range;
+                                if ( ranges.length == 1 )
+                                {
+                                        range = ranges[ 0 ];
+                                        if ( !defaultStyle.checkActive( evt.data.path ) )
+                                        {
+                                                var enlarged  = range.clone(), bm = range.createBookmark();
+                                                enlarged.enlarge( CKEDITOR.ENLARGE_BLOCK_CONTENTS );
+                                                defaultStyle.applyToRange( enlarged );
+                                                range.moveToBookmark( bm );
+                                                range.select();
+                                                // Cancel this selection change in favor of the new (correct).
+                                                evt.cancel();
+                                        }
+                                }
+                        }, editor, null, 2 );
+
+                        // Ensure document wide default style on load.
+                        editor.on( 'contentDom', function()
+                        {
+                                var range = new CKEDITOR.dom.range( this.document );
+                                range.selectNodeContents( this.document.getBody() );
+                                defaultStyle.applyToRange( range );
+                        })
+                }
+        }
 });
 
 /**
@@ -433 +471 @@
                         firstNode = boundaryNodes.startNode,
                         lastNode = boundaryNodes.endNode;
 
-                var currentNode = firstNode;
+                var currentNode = firstNode.getNextSourceNode( 1 );
 
                 var styleRange;
 
@@ -471 +509 @@
                                 var nodeIsReadonly = nodeName && ( currentNode.getAttribute( 'contentEditable' ) == 'false' );
                                 var nodeIsNoStyle = nodeName && currentNode.getAttribute( 'data-nostyle' );
 
-                                if ( nodeName && currentNode.data( 'cke-bookmark' ) )
-                                {
-                                        currentNode = currentNode.getNextSourceNode( true );
-                                        continue;
-                                }
-
                                 // Check if the current node can be a child of the style element.
                                 if ( !nodeName || ( dtd[ nodeName ]
                                         && !nodeIsNoStyle
@@ -1676 +1708 @@
  *  { name : 'Strong Emphasis', element : 'strong' },
  * { name : 'Emphasis', element : 'em' }, ... ];
  */
+
+/**
+  * Set a default (global) font style for all inputted text in the editor,
+ * which will be applied as inline style.
+ * <strong>Note:</strong> In order to allow a different user style to override the default,
+ *   this style definition has to be a multi-valued style, like font size, but not a single valued
+ *   style like bold.
+  * @name CKEDITOR.config.defaultTextStyle
+  * @type Object.
+  * @default null
+ *  @example
+ *      config.defaultTextStyle =
+ *      {
+ *              element         : 'span',
+ *              styles          : { 'font-size' : '16px', 'font-family' : 'Arial,Helvetica,Sans-serif' }
+ *      };
+ */
+