Index: _source/plugins/colordialog/dialogs/colordialog.js
===================================================================
--- _source/plugins/colordialog/dialogs/colordialog.js (revision 5749)
+++ _source/plugins/colordialog/dialogs/colordialog.js (working copy)
@@ -243,7 +243,7 @@
var numbering = function( id )
{
- return id + CKEDITOR.tools.getNextNumber();
+ return 'cke_' + id + CKEDITOR.tools.getNextNumber();
},
hicolorId = numbering( 'hicolor' ),
hicolorTextId = numbering( 'hicolortext' ),
@@ -273,8 +273,8 @@
[
{
type : 'html',
- html : '
' +
- '' + lang.options +'',
+ html : '' +
+ '' + lang.options +'',
onLoad : function()
{
var table = CKEDITOR.document.getById( this.domId );
Index: _source/plugins/dialog/plugin.js
===================================================================
--- _source/plugins/dialog/plugin.js (revision 5749)
+++ _source/plugins/dialog/plugin.js (working copy)
@@ -480,8 +480,10 @@
// 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,7 +883,7 @@
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( [
' 0 ? ' cke_last' : 'cke_first' ),
@@ -2051,7 +2053,7 @@
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;
Index: _source/plugins/dialogui/plugin.js
===================================================================
--- _source/plugins/dialogui/plugin.js (revision 5749)
+++ _source/plugins/dialogui/plugin.js (working copy)
@@ -147,7 +147,7 @@
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,7 +223,7 @@
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,7 +313,7 @@
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,11 +370,11 @@
{
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,13 +430,13 @@
{
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,7 +540,7 @@
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,13 +596,13 @@
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,7 +663,7 @@
/** @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();
Index: _source/plugins/smiley/dialogs/smiley.js
===================================================================
--- _source/plugins/smiley/dialogs/smiley.js (revision 5749)
+++ _source/plugins/smiley/dialogs/smiley.js (working copy)
@@ -131,7 +131,7 @@
});
// Build the HTML for the smiley images table.
- var labelId = 'smiley_emtions_label' + CKEDITOR.tools.getNextNumber();
+ var labelId = 'cke_smiley_emtions_label' + CKEDITOR.tools.getNextNumber();
var html =
[
'' +