Ticket #5045: 5045_2.patch

_source/core/tools.js

@@ -349 +349 @@
                 },
 
                 /**
-                 * Gets a unique number for this CKEDITOR execution session. It returns
-                 * progressive numbers starting at 1.
+                 * Gets a unique number for a specified group name of this CKEDITOR execution session.
+                 * For each group, it returns progressive numbers starting at 1.
                  * @function
+                 * @param {String} ["default"] Group name of this session.
                  * @returns {Number} A unique number.
                  * @example
                  * alert( CKEDITOR.tools.<b>getNextNumber()</b> );  // "1" (e.g.)
                  * alert( CKEDITOR.tools.<b>getNextNumber()</b> );  // "2"
+                 * alert( CKEDITOR.tools.<b>getNextNumber( 'dialog' )</b> );  // "1"
+                 * alert( CKEDITOR.tools.<b>getNextNumber( 'panel' )</b> );  // "1"
                  */
                 getNextNumber : (function()
                 {
-                        var last = 0;
-                        return function()
+                        var dic = {};
+                        return function( group )
                         {
-                                return ++last;
+                                group = group || 'default';
+                                if ( typeof dic[ group ] != 'number' )
+                                        dic[ group ] = 0;
+
+                                return ++dic[ group ];
                         };
                 })(),
 

_source/skins/kama/skin.js

@@ -147 +147 @@
                                 {
                                         var cssContent,
                                                 uiStyle = getStylesheet( CKEDITOR.document ),
-                                                cssId = '.cke_editor_' + CKEDITOR.tools.escapeCssSelector( editor.name );
+                                                cssId = '.cke_editor_id_' + this.id;
 
                                         var cssSelectors =
                                                 [
                                                         cssId + " .cke_wrapper",
-                                                        cssId + "_dialog .cke_dialog_contents",
-                                                        cssId + "_dialog a.cke_dialog_tab",
-                                                        cssId + "_dialog .cke_dialog_footer"
+                                                        cssId + " .cke_dialog_contents",
+                                                        cssId + " a.cke_dialog_tab",
+                                                        cssId + " .cke_dialog_footer"
                                                 ].join( ',' );
                                         var cssProperties = "background-color: $color !important;";
 

_source/themes/default/theme.js

@@ -114 +114 @@
                                 '<span' +
                                         ' id="cke_', name, '"' +
                                         ' onmousedown="return false;"' +
-                                        ' class="', editor.skinClass, ' cke_editor_', name, '"' +
+                                        ' class="', editor.skinClass, ' cke_editor_', name, ' cke_editor_id_' + editor.id, '"' +
                                         ' dir="', editor.lang.dir, '"' +
                                         ' title="', ( CKEDITOR.env.gecko ? ' ' : '' ), '"' +
                                         ' lang="', editor.langCode, '"' +
@@ -166 +166 @@
                         var baseIdNumber = CKEDITOR.tools.getNextNumber();
 
                         var element = CKEDITOR.dom.element.createFromHtml( [
-                                        '<div class="cke_editor_' + editor.name.replace('.', '\\.') + '_dialog cke_skin_', editor.skinName,
+                                        '<div class="cke_editor_' + editor.name.replace('.', '\\.') + '_dialog cke_skin_', editor.skinName, ' cke_editor_id_' + editor.id,
                                                 '" dir="', editor.lang.dir, '"' +
                                                 ' lang="', editor.langCode, '"' +
                                                 ' role="dialog"' +

_source/core/editor.js

@@ -379 +379 @@
                         if ( this.name in CKEDITOR.instances )
                                 throw '[CKEDITOR.editor] The instance "' + this.name + '" already exists.';
 
+                        this.id = CKEDITOR.tools.getNextNumber( 'editor' );
+
                         /**
                          * The configurations for this editor instance. It inherits all
                          * settings defined in (@link CKEDITOR.config}, combined with settings