Ticket #7387: 7387_2.patch

_source/core/dom/node.js

@@ -488 +488 @@
 
                 /**
                  * Gets the closest ancestor node of this node, specified by its node name.
-                 * @param {String} name The node name of the ancestor node to search.
+                 * @param {String} reference The node name of the ancestor node to search, or
+                 * an object with the names to search for (since 3.6)
                  * @param {Boolean} [includeSelf] Whether to include the current
                  * node in the search.
                  * @returns {CKEDITOR.dom.node} The located ancestor node or null if not found.
@@ -499 +500 @@
                  * ascendant = node.getAscendant( 'div' );      // ascendant == <div id="inner"&gt
                  * ascendant = node.getAscendant( 'b' );        // ascendant == null
                  * ascendant = node.getAscendant( 'b', true );  // ascendant == <b>
+                 * ascendant = node.getAscendant( { div: 1, p: 1} );      // Searchs for the first 'div' or 'p': ascendant == <div id="inner"&gt
                  */
-                getAscendant : function( name, includeSelf )
+                getAscendant : function( reference, includeSelf )
                 {
-                        var $ = this.$;
+                        var $ = this.$,
+                                name;
 
                         if ( !includeSelf )
                                 $ = $.parentNode;
 
                         while ( $ )
                         {
-                                if ( $.nodeName && $.nodeName.toLowerCase() == name )
+                                if ( $.nodeName && ( name = $.nodeName.toLowerCase(), ( typeof reference == 'string' ? name == reference : name in reference ) ) )
                                         return new CKEDITOR.dom.node( $ );
 
                                 $ = $.parentNode;

_source/plugins/styles/plugin.js

@@ -98 +98 @@
                         replaceVariables( styleDefinition.styles, variablesValues );
                 }
 
-                var element = this.element = ( styleDefinition.element || '*' ).toLowerCase();
+                var element = this.element = styleDefinition.element ?
+                                ( typeof styleDefinition.element == 'string' ? styleDefinition.element.toLowerCase() : styleDefinition.element )
+                                : '*';
 
                 this.type =
                         blockElements[ element ] ?
@@ -108 +110 @@
                         :
                                 CKEDITOR.STYLE_INLINE;
 
+                // If the 'element' property is an object with a set of possible element, it will be applied like an object style: only to existing elements
+                if ( typeof this.element == 'object' )
+                        this.type = CKEDITOR.STYLE_OBJECT;
+
                 this._ =
                 {
                         definition : styleDefinition
@@ -179 +185 @@
                                                           && ( element == elementPath.block || element == elementPath.blockLimit ) )
                                                         continue;
 
-                                                if( this.type == CKEDITOR.STYLE_OBJECT
-                                                         && !( element.getName() in objectElements ) )
+                                                if( this.type == CKEDITOR.STYLE_OBJECT )
+                                                {
+                                                        var name = element.getName();
+                                                        if ( !( typeof this.element == 'string' ? name == this.element : name in this.element ) )
                                                                 continue;
+                                                }
 
                                                 if ( this.checkElementRemovable( element, true ) )
                                                         return true;
@@ -217 +226 @@
                                 return false;
 
                         var def = this._.definition,
-                                attribs;
+                                attribs,
+                                name = element.getName();
 
                         // If the element name is the same as the style name.
-                        if ( element.getName() == this.element )
+                        if ( typeof this.element == 'string' ? name == this.element : name in this.element )
                         {
                                 // If no attributes are defined in the element.
                                 if ( !fullMatch && !element.hasAttributes() )