Ticket #4772: 4772.patch
File 4772.patch, 2.9 KB (added by , 13 years ago) |
---|
-
_source/plugins/styles/plugin.js
375 375 } 376 376 377 377 // Check if the current node can be a child of the style element. 378 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 ) ) ) 378 if ( !nodeName || ( dtd[ nodeName ] 379 && ( currentNode.getPosition( lastNode ) | CKEDITOR.POSITION_PRECEDING | CKEDITOR.POSITION_IDENTICAL | CKEDITOR.POSITION_IS_CONTAINED ) == ( CKEDITOR.POSITION_PRECEDING + CKEDITOR.POSITION_IDENTICAL + CKEDITOR.POSITION_IS_CONTAINED ) 380 && ( !def.childRule || def.childRule( currentNode ) ) ) ) 379 381 { 380 382 var currentParent = currentNode.getParent(); 381 383 382 384 // Check if the style element can be a child of the current 383 385 // node parent or if the element is not defined in the DTD. 384 if ( currentParent && ( ( currentParent.getDtd() || CKEDITOR.dtd.span )[ elementName ] || isUnknownElement ) ) 386 if ( currentParent 387 && ( ( currentParent.getDtd() || CKEDITOR.dtd.span )[ elementName ] || isUnknownElement ) 388 && ( !def.parentRule || def.parentRule( currentParent ) ) ) 385 389 { 386 390 // This node will be part of our range, so if it has not 387 391 // been started, place its start right before the node. … … 406 410 // to the range. 407 411 while ( !includedNode.$.nextSibling 408 412 && ( parentNode = includedNode.getParent(), dtd[ parentNode.getName() ] ) 409 && ( parentNode.getPosition( firstNode ) | CKEDITOR.POSITION_FOLLOWING | CKEDITOR.POSITION_IDENTICAL | CKEDITOR.POSITION_IS_CONTAINED ) == ( CKEDITOR.POSITION_FOLLOWING + CKEDITOR.POSITION_IDENTICAL + CKEDITOR.POSITION_IS_CONTAINED ) ) 413 && ( parentNode.getPosition( firstNode ) | CKEDITOR.POSITION_FOLLOWING | CKEDITOR.POSITION_IDENTICAL | CKEDITOR.POSITION_IS_CONTAINED ) == ( CKEDITOR.POSITION_FOLLOWING + CKEDITOR.POSITION_IDENTICAL + CKEDITOR.POSITION_IS_CONTAINED ) 414 && ( !def.childRule || def.childRule( parentNode ) ) ) 410 415 { 411 416 includedNode = parentNode; 412 417 } -
_source/plugins/colorbutton/plugin.js
194 194 { 195 195 element : 'span', 196 196 styles : { 'color' : '#(color)' }, 197 overrides : [ { element : 'font', attributes : { 'color' : null } } ] 197 overrides : [ { element : 'font', attributes : { 'color' : null } } ], 198 childRule : function( element ) 199 { 200 return element.getName() != 'a'; 201 } 198 202 }; 199 203 200 204 /**