Ticket #4195: 4195.patch

_source/plugins/styles/plugin.js

@@ -372 +372 @@
 
                                 // Check if the current node can be a child of the style element.
                                 if ( !nodeName || ( dtd[ nodeName ]
-                                        && ( currentNode.getPosition( lastNode ) | CKEDITOR.POSITION_PRECEDING | CKEDITOR.POSITION_IDENTICAL | CKEDITOR.POSITION_IS_CONTAINED ) == ( CKEDITOR.POSITION_PRECEDING + CKEDITOR.POSITION_IDENTICAL + CKEDITOR.POSITION_IS_CONTAINED )
+                                        && ( def.intact || ( currentNode.getPosition( lastNode ) | CKEDITOR.POSITION_PRECEDING | CKEDITOR.POSITION_IDENTICAL | CKEDITOR.POSITION_IS_CONTAINED ) == ( CKEDITOR.POSITION_PRECEDING + CKEDITOR.POSITION_IDENTICAL + CKEDITOR.POSITION_IS_CONTAINED ) )
                                         && ( !def.childRule || def.childRule( currentNode ) ) ) )
                                 {
                                         var currentParent = currentNode.getParent();
@@ -406 +406 @@
                                                         // to the range.
                                                         while ( !includedNode.$.nextSibling
                                                                 && ( parentNode = includedNode.getParent(), dtd[ parentNode.getName() ] )
-                                                                && ( parentNode.getPosition( firstNode ) | CKEDITOR.POSITION_FOLLOWING | CKEDITOR.POSITION_IDENTICAL | CKEDITOR.POSITION_IS_CONTAINED ) == ( CKEDITOR.POSITION_FOLLOWING + CKEDITOR.POSITION_IDENTICAL + CKEDITOR.POSITION_IS_CONTAINED )
+                                                                && ( def.intact || ( parentNode.getPosition( firstNode ) | CKEDITOR.POSITION_FOLLOWING | CKEDITOR.POSITION_IDENTICAL | CKEDITOR.POSITION_IS_CONTAINED ) == ( CKEDITOR.POSITION_FOLLOWING + CKEDITOR.POSITION_IDENTICAL + CKEDITOR.POSITION_IS_CONTAINED ) )
                                                                 && ( !def.childRule || def.childRule( parentNode ) ) )
                                                         {
                                                                 includedNode = parentNode;

_source/plugins/stylescombo/styles/default.js

@@ -54 +54 @@
         { name : 'Inserted Text'        , element : 'ins' },
 
         { name : 'Cited Work'           , element : 'cite' },
-        { name : 'Inline Quotation'     , element : 'q' },
 
+        // Quotations style must be applied as a single element instead of multiple style pieces.    
+        { name : 'Inline Quotation'     , element : 'q', intact : true },
+
         { name : 'Language: RTL'        , element : 'span', attributes : { 'dir' : 'rtl' } },
         { name : 'Language: LTR'        , element : 'span', attributes : { 'dir' : 'ltr' } },