Ticket #5531: 5531.patch

_source/plugins/dialog/plugin.js

@@ -480 +480 @@
                                         // If we aren't inside a tab, bail out.
                                         if ( target.hasClass( 'cke_dialog_tab' ) )
                                         {
+                                                // Get the ID of the tab, without the 'cke_' prefix and the unique number suffix.
                                                 var id = target.$.id;
-                                                this.selectPage( id.substr( 0, id.lastIndexOf( '_' ) ) );
+                                                this.selectPage( id.substring( 4, id.lastIndexOf( '_' ) ) );
+
                                                 if ( this._.tabBarMode )
                                                 {
                                                         this._.tabBarMode = false;
@@ -881 +883 @@
                         page.setAttribute( 'role', 'tabpanel' );
 
                         var env = CKEDITOR.env;
-                        var tabId = contents.id + '_' + CKEDITOR.tools.getNextNumber(),
+                        var tabId = 'cke_' + contents.id + '_' + CKEDITOR.tools.getNextNumber(),
                                  tab = CKEDITOR.dom.element.createFromHtml( [
                                         '<a class="cke_dialog_tab"',
                                                 ( this._.pageCount > 0 ? ' cke_last' : 'cke_first' ),
@@ -2051 +2053 @@
                                         styles = ( stylesArg && stylesArg.call ? stylesArg( elementDefinition ) : stylesArg ) || {},
                                         attributes = ( attributesArg && attributesArg.call ? attributesArg( elementDefinition ) : attributesArg ) || {},
                                         innerHTML = ( contentsArg && contentsArg.call ? contentsArg.call( this, dialog, elementDefinition ) : contentsArg ) || '',
-                                        domId = this.domId = attributes.id || CKEDITOR.tools.getNextNumber() + '_uiElement',
+                                        domId = this.domId = attributes.id || 'cke_' + CKEDITOR.tools.getNextNumber() + '_uiElement',
                                         id = this.id = elementDefinition.id,
                                         i;
 

_source/plugins/dialogui/plugin.js

@@ -147 +147 @@
                                         return;
 
                                 var _ = initPrivateObject.call( this, elementDefinition );
-                                _.labelId = CKEDITOR.tools.getNextNumber() + '_label';
+                                _.labelId = 'cke_' + CKEDITOR.tools.getNextNumber() + '_label';
                                 var children = this._.children = [];
                                 /** @ignore */
                                 var innerHTML = function()
@@ -223 +223 @@
                                         return;
 
                                 initPrivateObject.call( this, elementDefinition );
-                                var domId = this._.inputId = CKEDITOR.tools.getNextNumber() + '_textInput',
+                                var domId = this._.inputId = 'cke_' + CKEDITOR.tools.getNextNumber() + '_textInput',
                                         attributes = { 'class' : 'cke_dialog_ui_input_' + elementDefinition.type, id : domId, type : 'text' },
                                         i;
 
@@ -313 +313 @@
 
                                 initPrivateObject.call( this, elementDefinition );
                                 var me = this,
-                                        domId = this._.inputId = CKEDITOR.tools.getNextNumber() + '_textarea',
+                                        domId = this._.inputId = 'cke_' + CKEDITOR.tools.getNextNumber() + '_textarea',
                                         attributes = {};
 
                                 if ( elementDefinition.validate )
@@ -370 +370 @@
                                 {
                                         var myDefinition = CKEDITOR.tools.extend( {}, elementDefinition,
                                                         {
-                                                                id : elementDefinition.id ? elementDefinition.id + '_checkbox' : CKEDITOR.tools.getNextNumber() + '_checkbox'
+                                                                id : elementDefinition.id ? elementDefinition.id + '_checkbox' : 'cke_' + CKEDITOR.tools.getNextNumber() + '_checkbox'
                                                         }, true ),
                                                 html = [];
 
-                                        var labelId = CKEDITOR.tools.getNextNumber() + '_label';
+                                        var labelId = 'cke_' + CKEDITOR.tools.getNextNumber() + '_label';
                                         var attributes = { 'class' : 'cke_dialog_ui_checkbox_input', type : 'checkbox', 'aria-labelledby' : labelId };
                                         cleanInnerDefinition( myDefinition );
                                         if ( elementDefinition[ 'default' ] )
@@ -430 +430 @@
                                 {
                                         var inputHtmlList = [], html = [],
                                                 commonAttributes = { 'class' : 'cke_dialog_ui_radio_item', 'aria-labelledby' : this._.labelId },
-                                                commonName = elementDefinition.id ? elementDefinition.id + '_radio' : CKEDITOR.tools.getNextNumber() + '_radio';
+                                                commonName = elementDefinition.id ? elementDefinition.id + '_radio' : 'cke_' + CKEDITOR.tools.getNextNumber() + '_radio';
                                         for ( var i = 0 ; i < elementDefinition.items.length ; i++ )
                                         {
                                                 var item = elementDefinition.items[i],
                                                         title = item[2] !== undefined ? item[2] : item[0],
                                                         value = item[1] !== undefined ? item[1] : item[0],
-                                                        inputId = CKEDITOR.tools.getNextNumber() + '_radio_input',
+                                                        inputId = 'cke_' + CKEDITOR.tools.getNextNumber() + '_radio_input',
                                                         labelId = inputId + '_label',
                                                         inputDefinition = CKEDITOR.tools.extend( {}, elementDefinition,
                                                                         {
@@ -540 +540 @@
                                 var outerDefinition = CKEDITOR.tools.extend( {}, elementDefinition );
                                 delete outerDefinition.style;
 
-                                var labelId = CKEDITOR.tools.getNextNumber() + '_label';
+                                var labelId = 'cke_' + CKEDITOR.tools.getNextNumber() + '_label';
                                 CKEDITOR.ui.dialog.uiElement.call(
                                         this,
                                         dialog,
@@ -596 +596 @@
                                 if ( elementDefinition.validate )
                                         this.validate = elementDefinition.validate;
 
-                                _.inputId = CKEDITOR.tools.getNextNumber() + '_select';
+                                _.inputId = 'cke_' + CKEDITOR.tools.getNextNumber() + '_select';
                                 /** @ignore */
                                 var innerHTML = function()
                                 {
                                         var myDefinition = CKEDITOR.tools.extend( {}, elementDefinition,
                                                         {
-                                                                id : elementDefinition.id ? elementDefinition.id + '_select' : CKEDITOR.tools.getNextNumber() + '_select'
+                                                                id : elementDefinition.id ? elementDefinition.id + '_select' : 'cke_' + CKEDITOR.tools.getNextNumber() + '_select'
                                                         }, true ),
                                                 html = [],
                                                 innerHTML = [],
@@ -663 +663 @@
                                 /** @ignore */
                                 var innerHTML = function()
                                 {
-                                        _.frameId = CKEDITOR.tools.getNextNumber() + '_fileInput';
+                                        _.frameId = 'cke_' + CKEDITOR.tools.getNextNumber() + '_fileInput';
 
                                         // Support for custom document.domain in IE.
                                         var isCustomDomain = CKEDITOR.env.isCustomDomain();