\r
(function()\r
{\r
+ var cssLength = CKEDITOR.tools.cssLength;\r
function isTabVisible( tabId )\r
{\r
return !!this._.tabs[ tabId ][ 0 ].$.offsetHeight;\r
return null;\r
}\r
\r
+\r
+ function clearOrRecoverTextInputValue( container, isRecover )\r
+ {\r
+ var inputs = container.$.getElementsByTagName( 'input' );\r
+ for ( var i = 0, length = inputs.length; i < length ; i++ )\r
+ {\r
+ var item = new CKEDITOR.dom.element( inputs[ i ] );\r
+\r
+ if ( item.getAttribute( 'type' ).toLowerCase() == 'text' )\r
+ {\r
+ if ( isRecover )\r
+ {\r
+ item.setAttribute( 'value', item.getCustomData( 'fake_value' ) || '' );\r
+ item.removeCustomData( 'fake_value' );\r
+ }\r
+ else\r
+ {\r
+ item.setCustomData( 'fake_value', item.getAttribute( 'value' ) );\r
+ item.setAttribute( 'value', '' );\r
+ }\r
+ }\r
+ }\r
+ }\r
+\r
/**\r
* This is the base class for runtime dialog objects. An instance of this\r
* class represents a single named dialog for a single editor instance.\r
{\r
this.on( 'ok', function( evt )\r
{\r
+ // Dialog confirm might probably introduce content changes (#5415).\r
+ editor.fire( 'saveSnapshot' );\r
+ setTimeout( function () { editor.fire( 'saveSnapshot' ); }, 0 );\r
if ( definition.onOk.call( this, evt ) === false )\r
evt.data.hide = false;\r
});\r
setupFocus();\r
\r
if ( editor.config.dialog_startupFocusTab\r
- && me._.tabIdList.length > 1 )\r
+ && me._.pageCount > 1 )\r
{\r
me._.tabBarMode = true;\r
me._.tabs[ me._.currentTabId ][ 0 ].focus();\r
\r
// Insert the tabs and contents.\r
for ( var i = 0 ; i < definition.contents.length ; i++ )\r
- this.addPage( definition.contents[i] );\r
+ {\r
+ var page = definition.contents[i];\r
+ page && this.addPage( page );\r
+ }\r
\r
- this.parts['tabs'].on( 'click', function( evt )\r
+ this.parts[ 'tabs' ].on( 'click', function( evt )\r
{\r
var target = evt.data.getTarget();\r
// If we aren't inside a tab, bail out.\r
if ( target.hasClass( 'cke_dialog_tab' ) )\r
{\r
+ // Get the ID of the tab, without the 'cke_' prefix and the unique number suffix.\r
var id = target.$.id;\r
- this.selectPage( id.substr( 0, id.lastIndexOf( '_' ) ) );\r
+ this.selectPage( id.substring( 4, id.lastIndexOf( '_' ) ) );\r
+\r
if ( this._.tabBarMode )\r
{\r
this._.tabBarMode = false;\r
// First, set the dialog to an appropriate size.\r
this.resize( definition.minWidth, definition.minHeight );\r
\r
- // Select the first tab by default.\r
- this.selectPage( this.definition.contents[0].id );\r
-\r
// Reset all inputs back to their default value.\r
this.reset();\r
\r
+ // Select the first tab by default.\r
+ this.selectPage( this.definition.contents[0].id );\r
+\r
// Set z-index.\r
if ( CKEDITOR.dialog._.currentZIndex === null )\r
CKEDITOR.dialog._.currentZIndex = this._.editor.config.baseFloatZIndex;\r
for ( var i in this._.contents )\r
{\r
for ( var j in this._.contents[i] )\r
- fn( this._.contents[i][j]);\r
+ fn( this._.contents[i][j] );\r
}\r
return this;\r
},\r
*/\r
reset : (function()\r
{\r
- var fn = function( widget ){ if ( widget.reset ) widget.reset(); };\r
+ var fn = function( widget ){ if ( widget.reset ) widget.reset( 1 ); };\r
return function(){ this.foreach( fn ); return this; };\r
})(),\r
\r
page.setAttribute( 'role', 'tabpanel' );\r
\r
var env = CKEDITOR.env;\r
- var tabId = contents.id + '_' + CKEDITOR.tools.getNextNumber(),\r
+ var tabId = 'cke_' + contents.id + '_' + CKEDITOR.tools.getNextNumber(),\r
tab = CKEDITOR.dom.element.createFromHtml( [\r
'<a class="cke_dialog_tab"',\r
( this._.pageCount > 0 ? ' cke_last' : 'cke_first' ),\r
*/\r
selectPage : function( id )\r
{\r
+ if ( this._.currentTabId == id )\r
+ return;\r
+\r
+ // Returning true means that the event has been canceled\r
+ if ( this.fire( 'selectPage', { page : id, currentPage : this._.currentTabId } ) === true )\r
+ return;\r
+\r
// Hide the non-selected tabs and pages.\r
for ( var i in this._.tabs )\r
{\r
page.setAttribute( 'aria-hidden', i != id );\r
}\r
\r
- var selected = this._.tabs[id];\r
- selected[0].addClass( 'cke_dialog_tab_selected' );\r
- selected[1].show();\r
+ var selected = this._.tabs[ id ];\r
+ selected[ 0 ].addClass( 'cke_dialog_tab_selected' );\r
+\r
+ // [IE] an invisible input[type='text'] will enlarge it's width\r
+ // if it's value is long when it shows, so we clear it's value\r
+ // before it shows and then recover it (#5649)\r
+ if ( CKEDITOR.env.ie6Compat || CKEDITOR.env.ie7Compat )\r
+ {\r
+ clearOrRecoverTextInputValue( selected[ 1 ] );\r
+ selected[ 1 ].show();\r
+ setTimeout( function()\r
+ {\r
+ clearOrRecoverTextInputValue( selected[ 1 ], 1 );\r
+ }, 0 );\r
+ }\r
+ else\r
+ selected[ 1 ].show();\r
+\r
this._.currentTabId = id;\r
this._.currentTabIndex = CKEDITOR.tools.indexOf( this._.tabIdList, id );\r
},\r
hidePage : function( id )\r
{\r
var tab = this._.tabs[id] && this._.tabs[id][0];\r
- if ( !tab || this._.pageCount == 1 )\r
+ if ( !tab || this._.pageCount == 1 || !tab.isVisible() )\r
return;\r
// Switch to other tab first when we're hiding the active tab.\r
else if ( id == this._.currentTabId )\r
// Transform the contents entries in contentObjects.\r
var contents = dialogDefinition.contents;\r
for ( var i = 0, content ; ( content = contents[i] ) ; i++ )\r
- contents[ i ] = new contentObject( dialog, content );\r
+ contents[ i ] = content && new contentObject( dialog, content );\r
\r
CKEDITOR.tools.extend( this, dialogDefinition );\r
};\r
function showCover( editor )\r
{\r
var win = CKEDITOR.document.getWindow();\r
- var backgroundColorStyle = editor.config.dialog_backgroundCoverColor || 'white',\r
- backgroundCoverOpacity = editor.config.dialog_backgroundCoverOpacity,\r
- baseFloatZIndex = editor.config.baseFloatZIndex,\r
+ var config = editor.config,\r
+ backgroundColorStyle = config.dialog_backgroundCoverColor || 'white',\r
+ backgroundCoverOpacity = config.dialog_backgroundCoverOpacity,\r
+ baseFloatZIndex = config.baseFloatZIndex,\r
coverKey = CKEDITOR.tools.genKey(\r
backgroundColorStyle,\r
backgroundCoverOpacity,\r
styles = ( stylesArg && stylesArg.call ? stylesArg( elementDefinition ) : stylesArg ) || {},\r
attributes = ( attributesArg && attributesArg.call ? attributesArg( elementDefinition ) : attributesArg ) || {},\r
innerHTML = ( contentsArg && contentsArg.call ? contentsArg.call( this, dialog, elementDefinition ) : contentsArg ) || '',\r
- domId = this.domId = attributes.id || CKEDITOR.tools.getNextNumber() + '_uiElement',\r
+ domId = this.domId = attributes.id || CKEDITOR.tools.getNextId() + '_uiElement',\r
id = this.id = elementDefinition.id,\r
i;\r
\r
if ( widths )\r
{\r
if ( widths[i] )\r
- styles.push( 'width:' + CKEDITOR.tools.cssLength( widths[i] ) );\r
+ styles.push( 'width:' + cssLength( widths[i] ) );\r
}\r
else\r
styles.push( 'width:' + Math.floor( 100 / childHtmlList.length ) + '%' );\r
if ( height )\r
- styles.push( 'height:' + CKEDITOR.tools.cssLength( height ) );\r
+ styles.push( 'height:' + cssLength( height ) );\r
if ( elementDefinition && elementDefinition.padding != undefined )\r
- styles.push( 'padding:' + CKEDITOR.tools.cssLength( elementDefinition.padding ) );\r
+ styles.push( 'padding:' + cssLength( elementDefinition.padding ) );\r
if ( styles.length > 0 )\r
html.push( 'style="' + styles.join('; ') + '" ' );\r
html.push( '>', childHtmlList[i], '</td>' );\r
*/\r
vbox : function( dialog, childObjList, childHtmlList, htmlList, elementDefinition )\r
{\r
- if (arguments.length < 3 )\r
+ if ( arguments.length < 3 )\r
return;\r
\r
this._ || ( this._ = {} );\r
html.push( 'style="' );\r
if ( elementDefinition && elementDefinition.expand )\r
html.push( 'height:100%;' );\r
- html.push( 'width:' + CKEDITOR.tools.cssLength( width || '100%' ), ';' );\r
+ html.push( 'width:' + cssLength( width || '100%' ), ';' );\r
html.push( '"' );\r
html.push( 'align="', CKEDITOR.tools.htmlEncode(\r
( elementDefinition && elementDefinition.align ) || ( dialog.getParentEditor().lang.dir == 'ltr' ? 'left' : 'right' ) ), '" ' );\r
var styles = [];\r
html.push( '<tr><td role="presentation" ' );\r
if ( width )\r
- styles.push( 'width:' + CKEDITOR.tools.cssLength( width || '100%' ) );\r
+ styles.push( 'width:' + cssLength( width || '100%' ) );\r
if ( heights )\r
- styles.push( 'height:' + CKEDITOR.tools.cssLength( heights[i] ) );\r
+ styles.push( 'height:' + cssLength( heights[i] ) );\r
else if ( elementDefinition && elementDefinition.expand )\r
styles.push( 'height:' + Math.floor( 100 / childHtmlList.length ) + '%' );\r
if ( elementDefinition && elementDefinition.padding != undefined )\r
- styles.push( 'padding:' + CKEDITOR.tools.cssLength( elementDefinition.padding ) );\r
+ styles.push( 'padding:' + cssLength( elementDefinition.padding ) );\r
if ( styles.length > 0 )\r
html.push( 'style="', styles.join( '; ' ), '" ' );\r
html.push( ' class="cke_dialog_ui_vbox_child">', childHtmlList[i], '</td></tr>' );\r
/**\r
* Sets the value of this dialog UI object.\r
* @param {Object} value The new value.\r
+ * @param {Boolean} noChangeEvent Internal commit, to supress 'change' event on this element.\r
* @returns {CKEDITOR.dialog.uiElement} The current UI element.\r
* @example\r
* uiElement.setValue( 'Dingo' );\r
*/\r
- setValue : function( value )\r
+ setValue : function( value, noChangeEvent )\r
{\r
this.getInputElement().setValue( value );\r
- this.fire( 'change', { value : value } );\r
+ !noChangeEvent && this.fire( 'change', { value : value } );\r
return this;\r
},\r
\r
* @param {CKEDITOR.editor} editor The editor instance that will use the\r
* dialog.\r
*/\r
+\r
+/**\r
+ * Fired when a tab is going to be selected in a dialog\r
+ * @name dialog#selectPage\r
+ * @event\r
+ * @param String page The id of the page that it's gonna be selected.\r
+ * @param String currentPage The id of the current page.\r
+ */\r