Index: /CKEditor/branches/prototype/_samples/api_dialog.html =================================================================== --- /CKEditor/branches/prototype/_samples/api_dialog.html (revision 2990) +++ /CKEditor/branches/prototype/_samples/api_dialog.html (revision 2990) @@ -0,0 +1,153 @@ + + + + + Replace Textarea by Code - CKEditor Sample + + + + + +
+

+ This sample shows how to use the dialog API to customize dialogs whithout changing + the original editor code. The following customizations are being done::

+
    +
  1. Add dialog pages ("My Tab" in the Link dialog).
    2. +
  2. Remove a dialog tab ("Target" tab from the Link dialog).
    3. +
  3. Add dialog fields ("My Custom Field" into the Link dialog).
    4. +
  4. Remove dialog fields ("Link Type" and "Browser Server" the Link dialog).
    5. +
  5. Set default values for dialog fields (for the "URL" field in the + Link dialog).
    6. +
  6. Create a custom dialog ("My Dialog" button).
    7. +
+ + +
+ + Index: /CKEditor/branches/prototype/_samples/api_dialog/my_dialog.js =================================================================== --- /CKEditor/branches/prototype/_samples/api_dialog/my_dialog.js (revision 2990) +++ /CKEditor/branches/prototype/_samples/api_dialog/my_dialog.js (revision 2990) @@ -0,0 +1,28 @@ +/* +Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +For licensing, see LICENSE.html or http://ckeditor.com/license +*/ + +CKEDITOR.dialog.add( 'myDialog', function( editor ) +{ + return { + title : 'My Dialog', + minWidth : 400, + minHeight : 200, + contents : [ + { + id : 'tab1', + label : 'First Tab', + title : 'First Tab', + elements : + [ + { + id : 'input1', + type : 'text', + label : 'Input 1' + } + ] + } + ] + }; +} ); Index: /CKEditor/branches/prototype/_source/core/editor.js =================================================================== --- /CKEditor/branches/prototype/_source/core/editor.js (revision 2989) +++ /CKEditor/branches/prototype/_source/core/editor.js (revision 2990) @@ -191,4 +191,5 @@ // Load the editor skin. + editor.fire( 'pluginsLoaded' ); loadSkin( editor ); }); Index: /CKEditor/branches/prototype/_source/plugins/dialog/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/dialog/plugin.js (revision 2989) +++ /CKEditor/branches/prototype/_source/plugins/dialog/plugin.js (revision 2990) @@ -37,43 +37,48 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3; - -/** - * This is the base class for runtime dialog objects. - * @param {Object} editor The editor which created the dialog. - * @param {String} dialogName The dialog's registered name. - * @constructor - * @example - * var dialogObj = new CKEDITOR.dialog( editor, 'smiley' ); - */ -CKEDITOR.dialog = function( editor, dialogName ) +(function() { - if ( arguments.length < 2 ) - return; - - // Load the dialog definition. - var definition = CKEDITOR.dialog._.dialogDefinitions[dialogName]; - if ( typeof( definition ) != 'function' ) - { - console.log( 'Error: The dialog "' + dialogName + '" is not defined.' ); - return; - } - definition = CKEDITOR.tools.extend( {}, CKEDITOR.dialog._.defaultDialogDefinition( editor ), definition( editor ), true ); - if ( !( definition.title && definition.contents ) ) - { - console.log( 'Error: The dialog "' + dialogName + '" is missing its title or contents.' ); - return; - } - if ( definition.contents.length < 1 ) - { - console.log( 'Error: The dialog "' + dialogName + '" has no contents.' ); - return; - } - definition = new CKEDITOR.dialog._.definitionObject( this, definition ); - definition = editor.fire( 'dialogDefinition', { name : dialogName, definition : definition }, editor ).definition; - - // Initialize some basic parameters. - CKEDITOR.tools.extend( ( this._ || ( this._ = {} ) ), { + /** + * This is the base class for runtime dialog objects. An instance of this + * class represents a single named dialog for a single editor instance. + * @param {Object} editor The editor which created the dialog. + * @param {String} dialogName The dialog's registered name. + * @constructor + * @example + * var dialogObj = new CKEDITOR.dialog( editor, 'smiley' ); + */ + CKEDITOR.dialog = function( editor, dialogName ) + { + // Load the dialog definition. + var definition = CKEDITOR.dialog._.dialogDefinitions[ dialogName ]; + if ( !definition ) + { + console.log( 'Error: The dialog "' + dialogName + '" is not defined.' ); + return; + } + + // Completes the definition with the default values. + definition = CKEDITOR.tools.extend( definition( editor ), defaultDialogDefinition ); + + // Create a complex definition object, extending it with the API + // functions. + definition = new definitionObject( this, definition ); + + // Fire the "dialogDefinition" event, making it possible to customize + // the dialog definition. + definition = CKEDITOR.fire( 'dialogDefinition', + { + name : dialogName, + definition : definition + } + , editor ).definition; + + var themeBuilt = editor.theme.buildDialog( editor ); + + // Initialize some basic parameters. + this._ = + { editor : editor, - element : editor.theme.buildDialog( editor ), + element : themeBuilt.element, name : dialogName, definition : definition, @@ -81,129 +86,153 @@ contents : {}, buttons : {}, - accessKeyMap : {} - }, true ); - - // Initialize the parts map. - var element = this._.element.getFirst(), - i, me = this; - - /** - * An associative map of elements in the dialog. It has the following members: - * - * @type Object - * @field - */ - this.parts = { - 'tl' : [0,0], - 'tl_resize' : [0,0,0], - 't' : [0,1], - 't_resize' : [0,1,0], - 'tr' : [0,2], - 'tr_resize' : [0,2,0], - 'l' : [1,0], - 'l_resize' : [1,0,0], - 'c' : [1,1], - 'r' : [1,2], - 'r_resize' : [1,2,0], - 'bl' : [2,0], - 'bl_resize' : [2,0,0], - 'b' : [2,1], - 'b_resize' : [2,1,0], - 'br' : [2,2], - 'br_resize' : [2,2,0], - 'title' : [1,1,0], - 'close' : [1,1,0,0], - 'tabs' : [1,1,1,0,0], - 'tabs_table' : [1,1,1], - 'contents' : [1,1,2], - 'footer' : [1,1,3] - }; - for ( i in this.parts ) - this.parts[i] = element.getChild( this.parts[i] ); - - // Initialize the tab and page map. - CKEDITOR.tools.extend( this._, - { + accessKeyMap : {}, + + // Initialize the tab and page map. tabs : {}, pageCount : 0, lastTab : null - }, true ); - - // Make the dialog an event hub. - CKEDITOR.event.implementOn( this ); - - // Initialize load, show, hide, ok and cancel events. - if ( definition.onLoad ) - this.on( 'load', definition.onLoad, this, null, CKEDITOR.tools.getNextNumber() ); - if ( definition.onShow ) - this.on( 'show', definition.onShow, this, null, CKEDITOR.tools.getNextNumber() ); - if ( definition.onHide ) - this.on( 'hide', definition.onHide, this, null, CKEDITOR.tools.getNextNumber() ); - if ( definition.onOk ) - this.on( 'ok', function( evt ) + }; + + /** + * An associative map of elements in the dialog. It has the following members: + * + * @type Object + * @field + */ + this.parts = { + 'tl' : [0,0], + 'tl_resize' : [0,0,0], + 't' : [0,1], + 't_resize' : [0,1,0], + 'tr' : [0,2], + 'tr_resize' : [0,2,0], + 'l' : [1,0], + 'l_resize' : [1,0,0], + 'c' : [1,1], + 'r' : [1,2], + 'r_resize' : [1,2,0], + 'bl' : [2,0], + 'bl_resize' : [2,0,0], + 'b' : [2,1], + 'b_resize' : [2,1,0], + 'br' : [2,2], + 'br_resize' : [2,2,0], + 'title' : [1,1,0], + 'close' : [1,1,0,0], + 'tabs' : [1,1,1,0,0], + 'tabs_table' : [1,1,1], + 'contents' : [1,1,2], + 'footer' : [1,1,3] + }; + + // Initialize the parts map. + var element = this._.element.getFirst(); + for ( var i in this.parts ) + this.parts[i] = element.getChild( this.parts[i] ); + + // Call the CKEDITOR.event constructor to initialize this instance. + CKEDITOR.event.call( this ); + + // Initialize load, show, hide, ok and cancel events. + if ( definition.onLoad ) + this.on( 'load', definition.onLoad ); + + if ( definition.onShow ) + this.on( 'show', definition.onShow ); + + if ( definition.onHide ) + this.on( 'hide', definition.onHide ); + + if ( definition.onOk ) + { + this.on( 'ok', function( evt ) { if ( definition.onOk.call( this, evt ) === false ) evt.data.hide = false; - }, this, null, 1 ); - if ( definition.onCancel ) - this.on( 'cancel', function( evt ) + }); + } + + if ( definition.onCancel ) + { + this.on( 'cancel', function( evt ) { if ( definition.onCancel.call( this, evt ) === false ) evt.data.hide = false; - }, this, null, 1 ); - - /** @ignore */ - var iterContents = function( func ) - { - var breakFlag = false; - for ( var i in me._.contents ) - { - for ( var j in me._.contents[i] ) - { - breakFlag = func.call( this, me._.contents[i][j] ); - if ( breakFlag ) - break; + }); + } + + var me = this; + + // Iterates over all items inside all content in the dialog, calling a + // function for each of them. + var iterContents = function( func ) + { + var contents = me._.contents, + stop = false; + + for ( var i in contents ) + { + for ( var j in contents[i] ) + { + stop = func.call( this, contents[i][j] ); + if ( stop ) + return; + } } - if ( breakFlag ) - break; - } - } - - this.on( 'ok', function( evt ) + }; + + this.on( 'ok', function( evt ) { iterContents( function( item ) { - if ( item.validate && !item.validate( this ) ) + if ( item.validate ) { - evt.data.hide = false; - evt.stop(); - return true; + var isValid = item.validate( this ); + + if ( typeof isValid == 'string' ) + { + alert( isValid ); + isValid = false; + } + + if ( isValid === false ) + { + if ( item.select ) + item.select(); + else + item.focus(); + + evt.data.hide = false; + evt.stop(); + return true; + } } }); }, this, null, 0 ); - this.on( 'cancel', function( evt ) + + this.on( 'cancel', function( evt ) { iterContents( function( item ) @@ -218,1031 +247,812 @@ }, this, null, 0 ); - this.parts.close.on( 'click', function( evt ) - { - if ( this.fire( 'cancel', { hide : true } ).hide !== false ) - this.hide(); - }, this ); - - // IE6 BUG: Text fields and text areas are only half-rendered the first time the dialog appears in IE6 (#2661). - // This is still needed after [2708] and [2709] because text fields in hidden TR tags are still broken. - if ( CKEDITOR.env.ie6Compat ) - { - this.on( 'load', function( evt ) - { - var outer = this.getElement(), - inner = outer.getFirst(); - inner.remove(); - inner.appendTo( outer ); + this.parts.close.on( 'click', function( evt ) + { + if ( this.fire( 'cancel', { hide : true } ).hide !== false ) + this.hide(); }, this ); - } - - CKEDITOR.dialog._.initDragAndDrop( this ); - CKEDITOR.dialog._.initResizeHandles( this ); - - // Insert the title. - ( new CKEDITOR.dom.text( definition.title, CKEDITOR.document ) ).appendTo( this.parts.title ); - - // Insert the tabs and contents. - for ( i = 0 ; i < definition.contents.length ; i++ ) - this.addPage( definition.contents[i] ); - - var tabRegex = /cke_dialog_tab(\s|$|_)/, - tabOuterRegex = /cke_dialog_tab(\s|$)/; - this.parts['tabs'].on( 'click', function( evt ) - { - var target = evt.data.getTarget(), firstNode = target, id, page; - - // If we aren't inside a tab, bail out. - if ( !tabRegex.test( target.$.className ) ) + + // IE6 BUG: Text fields and text areas are only half-rendered the first time the dialog appears in IE6 (#2661). + // This is still needed after [2708] and [2709] because text fields in hidden TR tags are still broken. + if ( CKEDITOR.env.ie6Compat ) + { + this.on( 'load', function( evt ) + { + var outer = this.getElement(), + inner = outer.getFirst(); + inner.remove(); + inner.appendTo( outer ); + }, this ); + } + + initDragAndDrop( this ); + initResizeHandles( this ); + + // Insert the title. + ( new CKEDITOR.dom.text( definition.title, CKEDITOR.document ) ).appendTo( this.parts.title ); + + // Insert the tabs and contents. + for ( i = 0 ; i < definition.contents.length ; i++ ) + this.addPage( definition.contents[i] ); + + var tabRegex = /cke_dialog_tab(\s|$|_)/, + tabOuterRegex = /cke_dialog_tab(\s|$)/; + this.parts['tabs'].on( 'click', function( evt ) + { + var target = evt.data.getTarget(), firstNode = target, id, page; + + // If we aren't inside a tab, bail out. + if ( !tabRegex.test( target.$.className ) ) + return; + + // Find the outer container of the tab. + while ( target.getName() != 'td' || !tabOuterRegex.test( target.$.className ) ) + { + target = target.getParent(); + } + id = target.$.id.substr( 0, target.$.id.lastIndexOf( '_' ) ); + this.selectPage( id ); + }, this ); + + // Insert buttons. + var buttonsHtml = [], + buttons = CKEDITOR.dialog._.uiElementBuilders.hbox.build( this, + { + type : 'hbox', + className : 'cke_dialog_footer_buttons', + widths : [], + children : definition.buttons + }, buttonsHtml ).getChild(); + this.parts.footer.setHtml( buttonsHtml.join( '' ) ); + + for ( var i = 0 ; i < buttons.length ; i++ ) + this._.buttons[ buttons[i].id ] = buttons[i]; + + // Insert dummy text box for grabbing focus away from the editing area. + this._.dummyText = CKEDITOR.dom.element.createFromHtml( '' ); + this._.dummyText.appendTo( element ); + + CKEDITOR.skins.load( editor.config.skin, 'dialog' ); + }; + + CKEDITOR.dialog.prototype = + { + /** + * Resizes the dialog. + * @param {Number} width The width of the dialog in pixels. + * @param {Number} height The height of the dialog in pixels. + * @function + * @example + * dialogObj.resize( 800, 640 ); + */ + resize : (function() + { + return function( width, height ) + { + if ( this._.size && this._.size.width == width && this._.size.height == height ) return; - // Find the outer container of the tab. - while ( target.getName() != 'td' || !tabOuterRegex.test( target.$.className ) ) - { - target = target.getParent(); + CKEDITOR.dialog.fire( 'resize', + { + dialog : this, + skin : this._.editor.config.skin, + width : width, + height : height + }, this._.editor ); + + this._.size = { width : width, height : height }; + }; + })(), + + /** + * Gets the current size of the dialog in pixels. + * @returns {Object} An object with "width" and "height" properties. + * @example + * var width = dialogObj.getSize().width; + */ + getSize : function() + { + return CKEDITOR.tools.extend( {}, this._.size ); + }, + + /** + * Moves the dialog to an (x, y) coordinate relative to the window. + * @function + * @param {Number} x The target x-coordinate. + * @param {Number} y The target y-coordinate. + * @example + * dialogObj.move( 10, 40 ); + */ + move : (function() + { + var isFixed; + return function( x, y ) + { + // The dialog may be fixed positioned or absolute positioned. Ask the + // browser what is the current situation first. + if ( isFixed === undefined ) + isFixed = this._.element.getFirst().getComputedStyle( 'position' ) == 'fixed'; + + if ( isFixed && this._.position && this._.position.x == x && this._.position.y == y ) + return; + + // Save the current position. + this._.position = { x : x, y : y }; + + // If not fixed positioned, add scroll position to the coordinates. + if ( !isFixed ) + { + var scrollPosition = CKEDITOR.document.getWindow().getScrollPosition(); + x += scrollPosition.x; + y += scrollPosition.y; } - id = target.$.id.substr( 0, target.$.id.lastIndexOf( '_' ) ); - this.selectPage( id ); - }, this ); - - // Insert buttons. - var buttonsHtml = [], - buttons = CKEDITOR.dialog._.uiElementBuilders.hbox.build( this, - { - type : 'hbox', - className : 'cke_dialog_footer_buttons', - widths : [], - children : definition.buttons - }, buttonsHtml ).getChild(); - this.parts.footer.setHtml( buttonsHtml.join( '' ) ); - - for ( var i = 0 ; i < buttons.length ; i++ ) - this._.buttons[ buttons[i].id ] = buttons[i]; - - // Insert dummy text box for grabbing focus away from the editing area. - this._.dummyText = CKEDITOR.dom.element.createFromHtml( '' ); - this._.dummyText.appendTo( element ); - - CKEDITOR.skins.load( editor.config.skin, 'dialog' ); -}; - -CKEDITOR.dialog.prototype = -{ - /** - * Resizes the dialog. - * @param {Number} width The width of the dialog in pixels. - * @param {Number} height The height of the dialog in pixels. - * @function - * @example - * dialogObj.resize( 800, 640 ); - */ - resize : (function() - { - return function( width, height ) - { - if ( this._.size && this._.size.width == width && this._.size.height == height ) + + this._.element.getFirst().setStyles( + { + 'left' : x + 'px', + 'top' : y + 'px' + }); + } + })(), + + /** + * Gets the dialog's position in the window. + * @returns {Object} An object with "x" and "y" properties. + * @example + * var dialogX = dialogObj.getPosition().x; + */ + getPosition : function(){ return CKEDITOR.tools.extend( {}, this._.position ); }, + + /** + * Shows the dialog box. + * @example + * dialogObj.show(); + */ + show : function() + { + // Insert the dialog's element to the root document. + var element = this._.element; + var definition = this._.definition; + if ( !( element.getParent() && element.getParent().equals( CKEDITOR.document.getBody() ) ) ) + element.appendTo( CKEDITOR.document.getBody() ); + else return; - CKEDITOR.dialog.fire( 'resize', - { - dialog : this, - skin : this._.editor.config.skin, - width : width, - height : height - }, this._.editor ); - - this._.size = { width : width, height : height }; - }; - })(), - - /** - * Gets the current size of the dialog in pixels. - * @returns {Object} An object with "width" and "height" properties. - * @example - * var width = dialogObj.getSize().width; - */ - getSize : function() - { - return CKEDITOR.tools.extend( {}, this._.size ); - }, - - /** - * Moves the dialog to an (x, y) coordinate relative to the window. - * @function - * @param {Number} x The target x-coordinate. - * @param {Number} y The target y-coordinate. - * @example - * dialogObj.move( 10, 40 ); - */ - move : (function() - { - var isFixed; - return function( x, y ) - { - // The dialog may be fixed positioned or absolute positioned. Ask the - // browser what is the current situation first. - if ( isFixed === undefined ) - isFixed = this._.element.getFirst().getComputedStyle( 'position' ) == 'fixed'; - - if ( isFixed && this._.position && this._.position.x == x && this._.position.y == y ) + // First, set the dialog to an appropriate size. + this.resize( definition.minWidth, definition.minHeight ); + + // Rearrange the dialog to the middle of the window. + var viewSize = CKEDITOR.document.getWindow().getViewPaneSize(); + this.move( ( viewSize.width - this._.size.width ) / 2, ( viewSize.height - this._.size.height ) / 2 ); + + // Select the first tab by default. + this.selectPage( this._.definition.contents[0].id ); + + // Reset all inputs back to their default value. + this.reset(); + + // Set z-index. + if ( CKEDITOR.dialog._.currentZIndex === null ) + CKEDITOR.dialog._.currentZIndex = this._.editor.config.baseFloatZIndex; + this._.element.getFirst().setStyle( 'z-index', CKEDITOR.dialog._.currentZIndex += 10 ); + + // Maintain the dialog ordering and dialog cover. + // Also register key handlers if first dialog. + if ( CKEDITOR.dialog._.currentTop == null ) + { + CKEDITOR.dialog._.currentTop = this; + this._.parentDialog = null; + addCover( this._.editor ); + + CKEDITOR.document.on( 'keydown', accessKeyDownHandler ); + CKEDITOR.document.on( 'keyup', accessKeyUpHandler ); + } + else + { + this._.parentDialog = CKEDITOR.dialog._.currentTop; + var parentElement = this._.parentDialog.getElement().getFirst(); + parentElement.$.style.zIndex -= Math.floor( this._.editor.config.baseFloatZIndex / 2 ); + CKEDITOR.dialog._.currentTop = this; + } + + // Register the Esc hotkeys. + registerAccessKey( this, this, '\x1b', null, function() + { + this.getButton( 'cancel' ) && this.getButton( 'cancel' ).click(); + } ); + + // Save editor selection and grab the focus. + if ( !this._.parentDialog ) + this.saveSelection(); + this._.dummyText.focus(); + this._.dummyText.$.select(); + + // Execute onLoad for the first show. + this.fireOnce( 'load', {} ); + this.fire( 'show', {} ); + }, + + /** + * Executes a function for each UI element. + * @param {Function} fn Function to execute for each UI element. + * @returns {CKEDITOR.dialog} The current dialog object. + */ + foreach : function( fn ) + { + for ( var i in this._.contents ) + for ( var j in this._.contents[i] ) + fn( this._.contents[i][j]); + return this; + }, + + /** + * Resets all input values in the dialog. + * @example + * dialogObj.reset(); + * @returns {CKEDITOR.dialog} The current dialog object. + */ + reset : (function() + { + var fn = function( widget ){ if ( widget.reset ) widget.reset(); }; + return function(){ this.foreach( fn ); return this; }; + })(), + + /** + * Pushes the current values of all inputs in the dialog into the default stack. + * @example + * dialogObj.pushDefault(); + * @returns {CKEDITOR.dialog} The current dialog object. + */ + pushDefault : (function() + { + var fn = function( widget ){ if ( widget.pushDefault ) widget.pushDefault(); }; + return function(){ this.foreach( fn ); return this; }; + })(), + + /** + * Pops the current default values of all inputs in the dialog. + * @example + * dialogObj.popDefault(); + * @returns {CKEDITOR.dialog} The current dialog object. + */ + popDefault : (function() + { + var fn = function( widget ){ if ( widget.popDefault ) widget.popDefault(); }; + return function(){ this.foreach( fn ); return this; }; + })(), + + setupContent : function() + { + var args = arguments; + this.foreach( function( widget ) + { + if ( widget.setup ) + widget.setup.apply( widget, args ); + }); + }, + + commitContent : function() + { + var args = arguments; + this.foreach( function( widget ) + { + if ( widget.commit ) + widget.commit.apply( widget, args ); + }); + }, + + /** + * Hides the dialog box. + * @example + * dialogObj.hide(); + */ + hide : function() + { + // Remove the dialog's element from the root document. + var element = this._.element; + if ( !element.getParent() ) return; - - // Save the current position. - this._.position = { x : x, y : y }; - - // If not fixed positioned, add scroll position to the coordinates. - if ( !isFixed ) - { - var scrollPosition = CKEDITOR.document.getWindow().getScrollPosition(); - x += scrollPosition.x; - y += scrollPosition.y; + element.remove(); + + // Unregister all access keys associated with this dialog. + unregisterAccessKey( this ); + + // Maintain dialog ordering and remove cover if needed. + if ( this._.parentDialog == null ) + removeCover(); + else + { + var parentElement = this._.parentDialog.getElement().getFirst(); + parentElement.setStyle( 'z-index', parseInt( parentElement.$.style.zIndex ) + Math.floor( this._.editor.config.baseFloatZIndex / 2 ) ); } - - this._.element.getFirst().setStyles( - { - 'left' : x + 'px', - 'top' : y + 'px' - }); + CKEDITOR.dialog._.currentTop = this._.parentDialog; + + // Deduct or clear the z-index. + if ( this._.parentDialog == null ) + { + CKEDITOR.dialog._.currentZIndex = null; + + // Remove access key handlers. + CKEDITOR.document.removeListener( 'keydown', accessKeyDownHandler ); + CKEDITOR.document.removeListener( 'keyup', accessKeyUpHandler ); + + // Restore focus and (if not already restored) selection in the editing area. + this.restoreSelection(); + this._.editor.focus(); + } + else + CKEDITOR.dialog._.currentZIndex -= 10; + + this.fire( 'hide', {} ); + }, + + /** + * Adds a tabbed page into the dialog. + * @param {Object} contents Content definition. + * @example + */ + addPage : function( contents ) + { + var pageHtml = [], + titleHtml = contents.title ? 'title="' + CKEDITOR.tools.htmlEncode( contents.title ) + '" ' : '', + elements = contents.elements, + vbox = CKEDITOR.dialog._.uiElementBuilders.vbox.build( this, + { + type : 'vbox', + className : 'cke_dialog_page_contents', + children : contents.elements, + expand : !!contents.expand + }, pageHtml ); + + // Create the HTML for the tab and the content block. + var page = CKEDITOR.dom.element.createFromHtml( pageHtml.join( '' ) ); + var tab = CKEDITOR.dom.element.createFromHtml( [ + '
', + '', + '', + '', + '', + '
', + CKEDITOR.tools.htmlEncode( contents.label.replace( / /g, '\xa0' ) ), + '
' + ].join( '' ) ); + tab = tab.getChild( [0,0,0] ); + + // First and last tab styles classes. + if ( this._.lastTab ) + this._.lastTab.removeClass( 'last' ); + tab.addClass( this._.pageCount > 0 ? 'last' : 'first' ); + + // If only a single page exist, a different style is used in the central pane. + if ( this._.pageCount == 0 ) + this.parts.c.addClass( 'single_page' ); + else + this.parts.c.removeClass( 'single_page' ); + + // Take records for the tabs and elements created. + this._.tabs[ contents.id ] = [ tab, page ]; + this._.pageCount++; + this._.lastTab = tab; + var contentMap = this._.contents[ contents.id ] = {}, + cursor, + children = vbox.getChild(); + while ( ( cursor = children.shift() ) ) + { + contentMap[ cursor.id ] = cursor; + if ( typeof( cursor.getChild ) == 'function' ) + children.push.apply( children, cursor.getChild() ); + } + + // Attach the DOM nodes. + tab.unselectable(); + page.appendTo( this.parts.contents ); + tab.insertBefore( this.parts.tabs.getChild( this.parts.tabs.getChildCount() - 1 ) ); + tab.setAttribute( 'id', contents.id + '_' + CKEDITOR.tools.getNextNumber() ); + page.setAttribute( 'name', contents.id ); + + // Add access key handlers if access key is defined. + if ( contents.accessKey ) + { + registerAccessKey( this, this, 'CTRL+' + contents.accessKey, + tabAccessKeyDown, tabAccessKeyUp ); + this._.accessKeyMap[ 'CTRL+' + contents.accessKey ] = contents.id; + } + }, + + /** + * Activates a tab page in the dialog by its id. + * @param {String} id The id of the dialog tab to be activated. + * @example + * dialogObj.selectPage( 'tab_1' ); + */ + selectPage : function( id ) + { + // Hide the non-selected tabs and pages. + for ( var i in this._.tabs ) + { + var tab = this._.tabs[i][0], + page = this._.tabs[i][1]; + if ( i != id ) + { + tab.removeClass( 'cke_dialog_tab_selected' ); + page.hide(); + } + } + + var selected = this._.tabs[id]; + selected[0].addClass( 'cke_dialog_tab_selected' ); + selected[1].show(); + var me = this; + }, + + /** + * Hides a page's tab away from the dialog. + * @param {String} id The page's Id. + * @example + * dialog.hidePage( 'tab_3' ); + */ + hidePage : function( id ) + { + var tab = this._.tabs[id] && this._.tabs[id][0]; + if ( !tab ) + return; + tab.hide(); + }, + + /** + * Unhides a page's tab. + * @param {String} id The page's Id. + * @example + * dialog.showPage( 'tab_2' ); + */ + showPage : function( id ) + { + var tab = this._.tabs[id] && this._.tabs[id][0]; + if ( !tab ) + return; + tab.show(); + }, + + /** + * Gets the root DOM element of the dialog. + * @returns {CKEDITOR.dom.element} The <span> element containing this dialog. + * @example + * var dialogElement = dialogObj.getElement().getFirst(); + * dialogElement.setStyle( 'padding', '5px' ); + */ + getElement : function() + { + return this._.element; + }, + + /** + * Gets a dialog UI element object from a dialog page. + * @param {String} pageId id of dialog page. + * @param {String} elementId id of UI element. + * @example + * @returns {CKEDITOR.ui.dialog.uiElement} The dialog UI element. + */ + getContentElement : function( pageId, elementId ) + { + return this._.contents[pageId][elementId]; + }, + + /** + * Gets the value of a dialog UI element. + * @param {String} pageId id of dialog page. + * @param {String} elementId id of UI element. + * @example + * @returns {Object} The value of the UI element. + */ + getValueOf : function( pageId, elementId ) + { + return this.getContentElement( pageId, elementId ).getValue(); + }, + + /** + * Sets the value of a dialog UI element. + * @param {String} pageId id of the dialog page. + * @param {String} elementId id of the UI element. + * @param {Object} value The new value of the UI element. + * @example + */ + setValueOf : function( pageId, elementId, value ) + { + return this.getContentElement( pageId, elementId ).setValue( value ); + }, + + /** + * Gets the UI element of a button in the dialog's button row. + * @param {String} id The id of the button. + * @example + * @returns {CKEDITOR.ui.dialog.button} The button object. + */ + getButton : function( id ) + { + return this._.buttons[ id ]; + }, + + /** + * Simulates a click to a dialog button in the dialog's button row. + * @param {String} id The id of the button. + * @example + * @returns The return value of the dialog's "click" event. + */ + click : function( id ) + { + return this._.buttons[ id ].click(); + }, + + /** + * Disables a dialog button. + * @param {String} id The id of the button. + * @example + */ + disableButton : function( id ) + { + return this._.buttons[ id ].disable(); + }, + + /** + * Enables a dialog button. + * @param {String} id The id of the button. + * @example + */ + enableButton : function( id ) + { + return this._.buttons[ id ].enable(); + }, + + /** + * Gets the number of pages in the dialog. + * @returns {Number} Page count. + */ + getPageCount : function() + { + return this._.pageCount; + }, + + /** + * Gets the editor instance which opened this dialog. + * @returns {CKEDITOR.editor} Parent editor instances. + */ + getParentEditor : function() + { + return this._.editor; + }, + + /** + * Saves the current selection position in the editor. + * This function is automatically called when a non-nested dialog is opened, + * but it may also be called by event handlers in dialog definition. + * @example + */ + saveSelection : function() + { + if ( this._.editor.mode ) + { + var selection = new CKEDITOR.dom.selection( this._.editor.document ); + this._.selectedRanges = selection.getRanges(); + } + }, + + /** + * Clears the saved selection in the dialog object. + * This function should be called if the dialog's code has already changed the + * current selection position because the dialog closed. (e.g. at onOk()) + * @example + */ + clearSavedSelection : function() + { + delete this._.selectedRanges; + }, + + /** + * Restores the editor's selection from the previously saved position in this + * dialog. + * This function is automatically called when a non-nested dialog is closed, + * but it may also be called by event handlers in dialog definition. + * @example + */ + restoreSelection : function() + { + if ( this._.editor.mode && this._.selectedRanges ) + ( new CKEDITOR.dom.selection( this._.editor.document ) ).selectRanges( this._.selectedRanges ); } - })(), - - /** - * Gets the dialog's position in the window. - * @returns {Object} An object with "x" and "y" properties. - * @example - * var dialogX = dialogObj.getPosition().x; - */ - getPosition : function(){ return CKEDITOR.tools.extend( {}, this._.position ); }, - - /** - * Shows the dialog box. - * @example - * dialogObj.show(); - */ - show : function() - { - // Insert the dialog's element to the root document. - var element = this._.element; - var definition = this._.definition; - if ( !( element.getParent() && element.getParent().equals( CKEDITOR.document.getBody() ) ) ) - element.appendTo( CKEDITOR.document.getBody() ); - else - return; - - // First, set the dialog to an appropriate size. - this.resize( definition.minWidth, definition.minHeight ); - - // Rearrange the dialog to the middle of the window. - var viewSize = CKEDITOR.document.getWindow().getViewPaneSize(); - this.move( ( viewSize.width - this._.size.width ) / 2, ( viewSize.height - this._.size.height ) / 2 ); - - // Select the first tab by default. - this.selectPage( this._.definition.contents[0].id ); - - // Reset all inputs back to their default value. - this.reset(); - - // Set z-index. - if ( CKEDITOR.dialog._.currentZIndex === null ) - CKEDITOR.dialog._.currentZIndex = this._.editor.config.baseFloatZIndex; - this._.element.getFirst().setStyle( 'z-index', CKEDITOR.dialog._.currentZIndex += 10 ); - - // Maintain the dialog ordering and dialog cover. - // Also register key handlers if first dialog. - if ( CKEDITOR.dialog._.currentTop == null ) - { - CKEDITOR.dialog._.currentTop = this; - this._.parentDialog = null; - CKEDITOR.dialog._.addCover( this._.editor ); - - CKEDITOR.document.on( 'keydown', CKEDITOR.dialog._.accessKeyDownHandler ); - CKEDITOR.document.on( 'keyup', CKEDITOR.dialog._.accessKeyUpHandler ); - } - else - { - this._.parentDialog = CKEDITOR.dialog._.currentTop; - var parentElement = this._.parentDialog.getElement().getFirst(); - parentElement.$.style.zIndex -= Math.floor( this._.editor.config.baseFloatZIndex / 2 ); - CKEDITOR.dialog._.currentTop = this; - } - - // Register the Esc hotkeys. - CKEDITOR.dialog._.registerAccessKey( this, this, '\x1b', null, function() - { - this.getButton( 'cancel' ) && this.getButton( 'cancel' ).click(); - } ); - - // Save editor selection and grab the focus. - if ( !this._.parentDialog ) - this.saveSelection(); - this._.dummyText.focus(); - this._.dummyText.$.select(); - - // Execute onLoad for the first show. - this.fireOnce( 'load', {} ); - this.fire( 'show', {} ); - }, - - /** - * Executes a function for each UI element. - * @param {Function} fn Function to execute for each UI element. - * @returns {CKEDITOR.dialog} The current dialog object. - */ - foreach : function( fn ) - { - for ( var i in this._.contents ) - for ( var j in this._.contents[i] ) - fn( this._.contents[i][j]); - return this; - }, - - /** - * Resets all input values in the dialog. - * @example - * dialogObj.reset(); - * @returns {CKEDITOR.dialog} The current dialog object. - */ - reset : (function() - { - var fn = function( widget ){ if ( widget.reset ) widget.reset(); }; - return function(){ this.foreach( fn ); return this; }; - })(), - - /** - * Pushes the current values of all inputs in the dialog into the default stack. - * @example - * dialogObj.pushDefault(); - * @returns {CKEDITOR.dialog} The current dialog object. - */ - pushDefault : (function() - { - var fn = function( widget ){ if ( widget.pushDefault ) widget.pushDefault(); }; - return function(){ this.foreach( fn ); return this; }; - })(), - - /** - * Pops the current default values of all inputs in the dialog. - * @example - * dialogObj.popDefault(); - * @returns {CKEDITOR.dialog} The current dialog object. - */ - popDefault : (function() - { - var fn = function( widget ){ if ( widget.popDefault ) widget.popDefault(); }; - return function(){ this.foreach( fn ); return this; }; - })(), - - /** - * Hides the dialog box. - * @example - * dialogObj.hide(); - */ - hide : function() - { - // Remove the dialog's element from the root document. - var element = this._.element; - if ( !element.getParent() ) - return; - element.remove(); - - // Unregister all access keys associated with this dialog. - CKEDITOR.dialog._.unregisterAccessKey( this ); - - // Maintain dialog ordering and remove cover if needed. - if ( this._.parentDialog == null ) - CKEDITOR.dialog._.removeCover(); - else - { - var parentElement = this._.parentDialog.getElement().getFirst(); - parentElement.setStyle( 'z-index', parseInt( parentElement.$.style.zIndex ) + Math.floor( this._.editor.config.baseFloatZIndex / 2 ) ); - } - CKEDITOR.dialog._.currentTop = this._.parentDialog; - - // Deduct or clear the z-index. - if ( this._.parentDialog == null ) - { - CKEDITOR.dialog._.currentZIndex = null; - - // Remove access key handlers. - CKEDITOR.document.removeListener( 'keydown', CKEDITOR.dialog._.accessKeyDownHandler ); - CKEDITOR.document.removeListener( 'keyup', CKEDITOR.dialog._.accessKeyUpHandler ); - - // Restore focus and (if not already restored) selection in the editing area. - this.restoreSelection(); - this._.editor.focus(); - } - else - CKEDITOR.dialog._.currentZIndex -= 10; - - this.fire( 'hide', {} ); - }, - - /** - * Adds a tabbed page into the dialog. - * @param {Object} contents Content definition. - * @example - */ - addPage : function( contents ) - { - var pageHtml = [], - page, - tab, - titleHtml = contents.title ? 'title="' + CKEDITOR.tools.htmlEncode( contents.title ) + '" ' : '', - elements = contents.elements, - vbox = CKEDITOR.dialog._.uiElementBuilders.vbox.build( this, - { - type : 'vbox', - className : 'cke_dialog_page_contents', - children : contents.elements, - expand : !!contents.expand - }, pageHtml ); - - // Create the HTML for the tab and the content block. - page = CKEDITOR.dom.element.createFromHtml( pageHtml.join( '' ) ); - tab = CKEDITOR.dom.element.createFromHtml( [ - '
', - '', - '', - '', - '', - '
', - CKEDITOR.tools.htmlEncode( contents.label.replace( / /g, '\xa0' ) ), - '
' - ].join( '' ) ); - tab = tab.getChild( [0,0,0] ); - - // First and last tab styles classes. - if ( this._.lastTab ) - this._.lastTab.removeClass( 'last' ); - tab.addClass( this._.pageCount > 0 ? 'last' : 'first' ); - - // If only a single page exist, a different style is used in the central pane. - if ( this._.pageCount == 0 ) - this.parts.c.addClass( 'single_page' ); - else - this.parts.c.removeClass( 'single_page' ); - - // Take records for the tabs and elements created. - this._.tabs[ contents.id ] = [ tab, page ]; - this._.pageCount++; - this._.lastTab = tab; - var contentMap = this._.contents[ contents.id ] = {}, - cursor, - children = vbox.getChild(); - while ( ( cursor = children.shift() ) ) - { - contentMap[ cursor.id ] = cursor; - if ( typeof( cursor.getChild ) == 'function' ) - children.push.apply( children, cursor.getChild() ); - } - - // Attach the DOM nodes. - tab.unselectable(); - page.appendTo( this.parts.contents ); - tab.insertBefore( this.parts.tabs.getChild( this.parts.tabs.getChildCount() - 1 ) ); - tab.setAttribute( 'id', contents.id + '_' + CKEDITOR.tools.getNextNumber() ); - page.setAttribute( 'name', contents.id ); - - // Add access key handlers if access key is defined. - if ( contents.accessKey ) - { - CKEDITOR.dialog._.registerAccessKey( this, this, 'CTRL+' + contents.accessKey, - CKEDITOR.dialog._.tabAccessKeyDown, CKEDITOR.dialog._.tabAccessKeyUp ); - this._.accessKeyMap[ 'CTRL+' + contents.accessKey ] = contents.id; - } - }, - - /** - * Activates a tab page in the dialog by its id. - * @param {String} id The id of the dialog tab to be activated. - * @example - * dialogObj.selectPage( 'tab_1' ); - */ - selectPage : function( id ) - { - // Hide the non-selected tabs and pages. - for ( var i in this._.tabs ) - { - var tab = this._.tabs[i][0], - page = this._.tabs[i][1]; - if ( i != id ) - { - tab.removeClass( 'cke_dialog_tab_selected' ); - page.hide(); + }; + + CKEDITOR.tools.extend( CKEDITOR.dialog, + /** + * @lends CKEDITOR.dialog + */ + { + /** + * Registers a dialog. + * @param {String} name The dialog's name. + * @param {Function|String} dialogDefinition + * A function returning the dialog's definition, or the URL to the .js file holding the function. + * The function should accept an argument "editor" which is the current editor instance, and + * return an object conforming to {@link CKEDITOR.dialog.dialogDefinition}. + * @example + * @see CKEDITOR.dialog.dialogDefinition + */ + add : function( name, dialogDefinition ) + { + this._.dialogDefinitions[name] = dialogDefinition; + }, + + exists : function( name ) + { + return !!this._.dialogDefinitions[ name ]; + }, + + /** + * The default OK button for dialogs. Fires the "ok" event and closes the dialog if the event succeeds. + * @static + * @field + * @example + * @type Function + */ + okButton : (function() + { + var retval = function( editor, override ) + { + override = override || {}; + return CKEDITOR.tools.extend( { + id : 'ok', + type : 'button', + label : editor.lang.common.ok, + style : 'width: 60px', + onClick : function( evt ) + { + var dialog = evt.data.dialog; + if ( dialog.fire( 'ok', { hide : true } ).hide !== false ) + dialog.hide(); + } + }, override, true ); + }; + retval.type = 'button'; + retval.override = function( override ) + { + return CKEDITOR.tools.extend( function( editor ){ return retval( editor, override ); }, + { type : 'button' }, true ); + }; + return retval; + })(), + + /** + * The default cancel button for dialogs. Fires the "cancel" event and closes the dialog if no UI element value changed. + * @static + * @field + * @example + * @type Function + */ + cancelButton : (function() + { + var retval = function( editor, override ) + { + override = override || {}; + return CKEDITOR.tools.extend( { + id : 'cancel', + type : 'button', + label : editor.lang.common.cancel, + style : 'width: 60px', + onClick : function( evt ) + { + var dialog = evt.data.dialog; + if ( dialog.fire( 'cancel', { hide : true } ).hide !== false ) + dialog.hide(); + } + }, override, true ); + }; + retval.type = 'button'; + retval.override = function( override ) + { + return CKEDITOR.tools.extend( function( editor ){ return retval( editor, override ); }, + { type : 'button' }, true ); + }; + return retval; + })(), + + /** + * Registers a dialog UI element. + * @param {String} typeName The name of the UI element. + * @param {Function} builder The function to build the UI element. + * @example + */ + addUIElement : function( typeName, builder ) + { + this._.uiElementBuilders[typeName] = builder; + }, + + /** + * Sets the width of margins of dialogs, which is used for the dialog moving and resizing logic. + * The margin here means the area between the dialog's container
and the visual boundary of the dialog. + * Typically this area is used for dialog shadows. + * This function is typically called in a skin's JavaScript files. + * @param {Number} top The top margin in pixels. + * @param {Number} right The right margin in pixels. + * @param {Number} bottom The bottom margin in pixels. + * @param {Number} left The left margin in pixels. + * @example + */ + setMargins : function( top, right, bottom, left ) + { + this._.margins = [ top, right, bottom, left ]; + } + }); + + CKEDITOR.dialog._ = + { + uiElementBuilders : {}, + + dialogDefinitions : {}, + + currentTop : null, + + currentZIndex : null, + + margins : [0, 0, 0, 0] + }; + + // "Inherit" (copy actually) from CKEDITOR.event. + CKEDITOR.event.implementOn( CKEDITOR.dialog ); + CKEDITOR.event.implementOn( CKEDITOR.dialog.prototype ); + + var defaultDialogDefinition = + { + resizable : CKEDITOR.DIALOG_RESIZE_NONE, + minWidth : 600, + minHeight : 400, + buttons : [ CKEDITOR.dialog.okButton, CKEDITOR.dialog.cancelButton ] + }; + + // Tool function used to return an item from an array based on its id + // property. + var getById = function( array, id, recurse ) + { + for ( var i = 0, item ; ( item = array[ i ] ) ; i++ ) + { + if ( item.id == id ) + return item; + if ( recurse && item[ recurse ] ) + { + var retval = getById( item[ recurse ], id, recurse ) ; + if ( retval ) + return retval; } } - - var selected = this._.tabs[id]; - selected[0].addClass( 'cke_dialog_tab_selected' ); - selected[1].show(); - var me = this; - }, - - /** - * Hides a page's tab away from the dialog. - * @param {String} id The page's Id. - * @example - * dialog.hidePage( 'tab_3' ); - */ - hidePage : function( id ) - { - var tab = this._.tabs[id] && this._.tabs[id][0]; - if ( !tab ) - return; - tab.hide(); - }, - - /** - * Unhides a page's tab. - * @param {String} id The page's Id. - * @example - * dialog.showPage( 'tab_2' ); - */ - showPage : function( id ) - { - var tab = this._.tabs[id] && this._.tabs[id][0]; - if ( !tab ) - return; - tab.show(); - }, - - /** - * Gets the root DOM element of the dialog. - * @returns {CKEDITOR.dom.element} The <span> element containing this dialog. - * @example - * var dialogElement = dialogObj.getElement().getFirst(); - * dialogElement.setStyle( 'padding', '5px' ); - */ - getElement : function() - { - return this._.element; - }, - - /** - * Gets a dialog UI element object from a dialog page. - * @param {String} pageId id of dialog page. - * @param {String} elementId id of UI element. - * @example - * @returns {CKEDITOR.ui.dialog.uiElement} The dialog UI element. - */ - getContentElement : function( pageId, elementId ) - { - return this._.contents[pageId][elementId]; - }, - - /** - * Gets the value of a dialog UI element. - * @param {String} pageId id of dialog page. - * @param {String} elementId id of UI element. - * @example - * @returns {Object} The value of the UI element. - */ - getValueOf : function( pageId, elementId ) - { - return this.getContentElement( pageId, elementId ).getValue(); - }, - - /** - * Sets the value of a dialog UI element. - * @param {String} pageId id of the dialog page. - * @param {String} elementId id of the UI element. - * @param {Object} value The new value of the UI element. - * @example - */ - setValueOf : function( pageId, elementId, value ) - { - return this.getContentElement( pageId, elementId ).setValue( value ); - }, - - /** - * Gets the UI element of a button in the dialog's button row. - * @param {String} id The id of the button. - * @example - * @returns {CKEDITOR.ui.dialog.button} The button object. - */ - getButton : function( id ) - { - return this._.buttons[ id ]; - }, - - /** - * Simulates a click to a dialog button in the dialog's button row. - * @param {String} id The id of the button. - * @example - * @returns The return value of the dialog's "click" event. - */ - click : function( id ) - { - return this._.buttons[ id ].click(); - }, - - /** - * Disables a dialog button. - * @param {String} id The id of the button. - * @example - */ - disableButton : function( id ) - { - return this._.buttons[ id ].disable(); - }, - - /** - * Enables a dialog button. - * @param {String} id The id of the button. - * @example - */ - enableButton : function( id ) - { - return this._.buttons[ id ].enable(); - }, - - /** - * Gets the number of pages in the dialog. - * @returns {Number} Page count. - */ - getPageCount : function() - { - return this._.pageCount; - }, - - /** - * Gets the editor instance which opened this dialog. - * @returns {CKEDITOR.editor} Parent editor instances. - */ - getParentEditor : function() - { - return this._.editor; - }, - - /** - * Saves the current selection position in the editor. - * This function is automatically called when a non-nested dialog is opened, - * but it may also be called by event handlers in dialog definition. - * @example - */ - saveSelection : function() - { - if ( this._.editor.mode ) - { - var selection = new CKEDITOR.dom.selection( this._.editor.document ); - this._.selectedRanges = selection.getRanges(); + return null; + }; + + // Tool function used to add an item into an array. + var addById = function( array, newItem, nextSiblingId ) + { + if ( nextSiblingId ) + { + for ( var i = 0, item ; ( item = array[ i ] ) ; i++ ) + { + if ( item.id == nextSiblingId ) + { + array.splice( i, 0, newItem ); + return newItem; + } + } } - }, - - /** - * Clears the saved selection in the dialog object. - * This function should be called if the dialog's code has already changed the - * current selection position because the dialog closed. (e.g. at onOk()) - * @example - */ - clearSavedSelection : function() - { - delete this._.selectedRanges; - }, - - /** - * Restores the editor's selection from the previously saved position in this - * dialog. - * This function is automatically called when a non-nested dialog is closed, - * but it may also be called by event handlers in dialog definition. - * @example - */ - restoreSelection : function() - { - if ( this._.editor.mode && this._.selectedRanges ) - ( new CKEDITOR.dom.selection( this._.editor.document ) ).selectRanges( this._.selectedRanges ); - } -}; - -CKEDITOR.tools.extend( CKEDITOR.dialog, - /** - * @lends CKEDITOR.dialog - */ - { - /** - * Registers a dialog. - * @param {String} name The dialog's name. - * @param {Function|String} dialogDefinition - * A function returning the dialog's definition, or the URL to the .js file holding the function. - * The function should accept an argument "editor" which is the current editor instance, and - * return an object conforming to {@link CKEDITOR.dialog.dialogDefinition}. - * @example - * @see CKEDITOR.dialog.dialogDefinition - */ - add : function( name, dialogDefinition ) - { - this._.dialogDefinitions[name] = dialogDefinition; - }, - - /** - * The default OK button for dialogs. Fires the "ok" event and closes the dialog if the event succeeds. - * @static - * @field - * @example - * @type Function - */ - okButton : (function() - { - var retval = function( editor, override ) - { - override = override || {}; - return CKEDITOR.tools.extend( { - id : 'ok', - type : 'button', - label : editor.lang.common.ok, - style : 'width: 60px', - onClick : function( evt ) - { - var dialog = evt.data.dialog; - if ( dialog.fire( 'ok', { hide : true } ).hide !== false ) - dialog.hide(); - } - }, override, true ); - }; - retval.type = 'button'; - retval.override = function( override ) - { - return CKEDITOR.tools.extend( function( editor ){ return retval( editor, override ); }, - { type : 'button' }, true ); - }; - return retval; - })(), - - /** - * The default cancel button for dialogs. Fires the "cancel" event and closes the dialog if no UI element value changed. - * @static - * @field - * @example - * @type Function - */ - cancelButton : (function() - { - var retval = function( editor, override ) - { - override = override || {}; - return CKEDITOR.tools.extend( { - id : 'cancel', - type : 'button', - label : editor.lang.common.cancel, - style : 'width: 60px', - onClick : function( evt ) - { - var dialog = evt.data.dialog; - if ( dialog.fire( 'cancel', { hide : true } ).hide !== false ) - dialog.hide(); - } - }, override, true ); - }; - retval.type = 'button'; - retval.override = function( override ) - { - return CKEDITOR.tools.extend( function( editor ){ return retval( editor, override ); }, - { type : 'button' }, true ); - }; - return retval; - })(), - - /** - * Registers a dialog UI element. - * @param {String} typeName The name of the UI element. - * @param {Function} builder The function to build the UI element. - * @example - */ - addUIElement : function( typeName, builder ) - { - this._.uiElementBuilders[typeName] = builder; - }, - - /** - * Sets the width of margins of dialogs, which is used for the dialog moving and resizing logic. - * The margin here means the area between the dialog's container
and the visual boundary of the dialog. - * Typically this area is used for dialog shadows. - * This function is typically called in a skin's JavaScript files. - * @param {Number} top The top margin in pixels. - * @param {Number} right The right margin in pixels. - * @param {Number} bottom The bottom margin in pixels. - * @param {Number} left The left margin in pixels. - * @example - */ - setMargins : function( top, right, bottom, left ) - { - this._.margins = [ top, right, bottom, left ]; + + array.push( newItem ); + return newItem; + }; + + // Tool function used to remove an item from an array based on its id. + removeById = function( array, id ) + { + for ( var i = 0 ; i < array.length ; i++ ) + { + if ( array[ i ].id == id ) + return array.splice( i, 1 ); } - }); - -CKEDITOR.dialog._ = -{ - defaultDialogDefinition : function( editor ) - { - return { - resizable : CKEDITOR.DIALOG_RESIZE_NONE, - minWidth : 600, - minHeight : 400, - buttons : [ CKEDITOR.dialog.okButton, CKEDITOR.dialog.cancelButton ] - } - }, - - uiElementBuilders : {}, - - dialogDefinitions : - { - testOnly : '_source/dialogs/testOnly/dialog.js' - }, - - addCover : function( editor ) - { - var html = [ - '
' - ], - win = CKEDITOR.document.getWindow(); - if ( CKEDITOR.env.ie6Compat ) - { - html.push( '' ); - } - html.push( '
' ); - var element = CKEDITOR.dom.element.createFromHtml( html.join( '' ) ), - resizeFunc = function() - { - var size = win.getViewPaneSize(); - element.setStyles( - { - width : size.width + 'px', - height : size.height + 'px' - }); - }, - scrollFunc = function() - { - var pos = win.getScrollPosition(), - cursor = CKEDITOR.dialog._.currentTop; - element.setStyles( - { - left : pos.x + 'px', - top : pos.y + 'px' - }); - - do - { - var dialogPos = cursor.getPosition(); - cursor.move( dialogPos.x, dialogPos.y ); - } while( cursor = cursor._.parentDialog ); - }; - CKEDITOR.dialog._.resizeCover = resizeFunc; - win.on( 'resize', resizeFunc ); - resizeFunc(); - if ( CKEDITOR.env.ie6Compat ) - { - // IE BUG: win.$.onscroll assignment doesn't work.. it must be window.onscroll. - // So we need to invent a really funny way to make it work. - var myScrollHandler = function() - { - scrollFunc(); - arguments.callee.prevScrollHandler.apply( this, arguments ); - }; - win.$.setTimeout( function() - { - myScrollHandler.prevScrollHandler = window.onscroll || function(){}; - window.onscroll = myScrollHandler; - }, 0 ); - scrollFunc(); - } - element.setOpacity( editor.config.dialog.backgroundCoverOpacity ); - element.appendTo( CKEDITOR.document.getBody() ); - }, - - removeCover : function() - { - var element = CKEDITOR.document.getById( 'cke_dialog_background_cover' ), - win = CKEDITOR.document.getWindow(); - if ( element ) - { - element.remove(); - win.removeListener( 'resize', CKEDITOR.dialog._.resizeCover ); - - if ( CKEDITOR.env.ie6Compat ) - { - win.$.setTimeout( function() - { - var prevScrollHandler = window.onscroll && window.onscroll.prevScrollHandler; - window.onscroll = prevScrollHandler || null; - }, 0 ); - } - CKEDITOR.dialog._.resizeCover = null; - } - }, - - initDragAndDrop : function( dialog ) - { - var lastCoords = null, - abstractDialogCoords = null, - element = dialog.getElement().getFirst(), - magnetDistance = dialog._.editor.config.dialog.magnetDistance, - mouseMoveHandler = function( evt ) - { - var dialogSize = dialog.getSize(), - viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(), - x = evt.data.$.screenX, - y = evt.data.$.screenY, - dx = x - lastCoords.x, - dy = y - lastCoords.y, - realX, realY; - - lastCoords = { x : x, y : y }; - abstractDialogCoords.x += dx; - abstractDialogCoords.y += dy; - - if ( abstractDialogCoords.x + CKEDITOR.dialog._.margins[3] < magnetDistance ) - realX = - CKEDITOR.dialog._.margins[3]; - else if ( abstractDialogCoords.x - CKEDITOR.dialog._.margins[1] > viewPaneSize.width - dialogSize.width - magnetDistance ) - realX = viewPaneSize.width - dialogSize.width + CKEDITOR.dialog._.margins[1]; - else - realX = abstractDialogCoords.x; - - if ( abstractDialogCoords.y + CKEDITOR.dialog._.margins[0] < magnetDistance ) - realY = - CKEDITOR.dialog._.margins[0]; - else if ( abstractDialogCoords.y - CKEDITOR.dialog._.margins[2] > viewPaneSize.height - dialogSize.height - magnetDistance ) - realY = viewPaneSize.height - dialogSize.height + CKEDITOR.dialog._.margins[2]; - else - realY = abstractDialogCoords.y; - - dialog.move( realX, realY ); - - evt.data.preventDefault(); - }, - mouseUpHandler = function( evt ) - { - CKEDITOR.document.removeListener( 'mousemove', mouseMoveHandler ); - CKEDITOR.document.removeListener( 'mouseup', mouseUpHandler ); - - if ( CKEDITOR.env.ie6Compat ) - { - var coverDoc = new CKEDITOR.dom.document( frames( 'cke_dialog_background_iframe' ).document ); - coverDoc.removeListener( 'mousemove', mouseMoveHandler ); - coverDoc.removeListener( 'mouseup', mouseUpHandler ); - } - }; - - dialog.parts.title.on( 'mousedown', function( evt ) - { - lastCoords = { x : evt.data.$.screenX, y : evt.data.$.screenY }; - - CKEDITOR.document.on( 'mousemove', mouseMoveHandler ); - CKEDITOR.document.on( 'mouseup', mouseUpHandler ); - abstractDialogCoords = dialog.getPosition(); - - if ( CKEDITOR.env.ie6Compat ) - { - var coverDoc = new CKEDITOR.dom.document( frames( 'cke_dialog_background_iframe' ).document ); - coverDoc.on( 'mousemove', mouseMoveHandler ); - coverDoc.on( 'mouseup', mouseUpHandler ); - } - - evt.data.preventDefault(); - }, dialog ); - }, - - initResizeHandles : function( dialog ) - { - var definition = dialog._.definition, - minWidth = definition.minWidth || 0, - minHeight = definition.minHeight || 0, - resizable = definition.resizable, - topSizer = function( coords, dy ) - { - coords.y += dy; - }, - rightSizer = function( coords, dx ) - { - coords.x2 += dx; - }, - bottomSizer = function( coords, dy ) - { - coords.y2 += dy; - }, - leftSizer = function( coords, dx ) - { - coords.x += dx; - }, - lastCoords = null, - abstractDialogCoords = null, - magnetDistance = dialog._.editor.config.magnetDistance, - parts = [ 'tl', 't', 'tr', 'l', 'r', 'bl', 'b', 'br' ], - mouseDownHandler = function( evt ) - { - var partName = evt.listenerData.part, size = dialog.getSize(); - abstractDialogCoords = dialog.getPosition(); - CKEDITOR.tools.extend( abstractDialogCoords, - { - x2 : abstractDialogCoords.x + size.width, - y2 : abstractDialogCoords.y + size.height - } ); - lastCoords = { x : evt.data.$.screenX, y : evt.data.$.screenY }; - - CKEDITOR.document.on( 'mousemove', mouseMoveHandler, dialog, { part : partName } ); - CKEDITOR.document.on( 'mouseup', mouseUpHandler, dialog, { part : partName } ); - - if ( CKEDITOR.env.ie6Compat ) - { - var coverDoc = new CKEDITOR.dom.document( frames( 'cke_dialog_background_iframe' ).document ); - coverDoc.on( 'mousemove', mouseMoveHandler, dialog, { part : partName } ); - coverDoc.on( 'mouseup', mouseUpHandler, dialog, { part : partName } ); - } - - evt.data.preventDefault(); - }, - mouseMoveHandler = function( evt ) - { - var x = evt.data.$.screenX, - y = evt.data.$.screenY, - dx = x - lastCoords.x, - dy = y - lastCoords.y, - viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(), - partName = evt.listenerData.part; - - if ( partName.search( 't' ) != -1 ) - topSizer( abstractDialogCoords, dy ); - if ( partName.search( 'l' ) != -1 ) - leftSizer( abstractDialogCoords, dx ); - if ( partName.search( 'b' ) != -1 ) - bottomSizer( abstractDialogCoords, dy ); - if ( partName.search( 'r' ) != -1 ) - rightSizer( abstractDialogCoords, dx ); - - lastCoords = { x : x, y : y }; - - var realX, realY, realX2, realY2; - - if ( abstractDialogCoords.x + CKEDITOR.dialog._.margins[3] < magnetDistance ) - realX = - CKEDITOR.dialog._.margins[3]; - else if ( partName.search( 'l' ) != -1 && abstractDialogCoords.x2 - abstractDialogCoords.x < minWidth + magnetDistance ) - realX = abstractDialogCoords.x2 - minWidth; - else - realX = abstractDialogCoords.x; - - if ( abstractDialogCoords.y + CKEDITOR.dialog._.margins[0] < magnetDistance ) - realY = - CKEDITOR.dialog._.margins[0]; - else if ( partName.search( 't' ) != -1 && abstractDialogCoords.y2 - abstractDialogCoords.y < minHeight + magnetDistance ) - realY = abstractDialogCoords.y2 - minHeight; - else - realY = abstractDialogCoords.y; - - if ( abstractDialogCoords.x2 - CKEDITOR.dialog._.margins[1] > viewPaneSize.width - magnetDistance ) - realX2 = viewPaneSize.width + CKEDITOR.dialog._.margins[1] ; - else if ( partName.search( 'r' ) != -1 && abstractDialogCoords.x2 - abstractDialogCoords.x < minWidth + magnetDistance ) - realX2 = abstractDialogCoords.x + minWidth; - else - realX2 = abstractDialogCoords.x2; - - if ( abstractDialogCoords.y2 - CKEDITOR.dialog._.margins[2] > viewPaneSize.height - magnetDistance ) - realY2= viewPaneSize.height + CKEDITOR.dialog._.margins[2] ; - else if ( partName.search( 'b' ) != -1 && abstractDialogCoords.y2 - abstractDialogCoords.y < minHeight + magnetDistance ) - realY2 = abstractDialogCoords.y + minHeight; - else - realY2 = abstractDialogCoords.y2 ; - - dialog.move( realX, realY ); - dialog.resize( realX2 - realX, realY2 - realY ); - - evt.data.preventDefault(); - }, - mouseUpHandler = function( evt ) - { - CKEDITOR.document.removeListener( 'mouseup', mouseUpHandler ); - CKEDITOR.document.removeListener( 'mousemove', mouseMoveHandler ); - - if ( CKEDITOR.env.ie6Compat ) - { - var coverDoc = new CKEDITOR.dom.document( frames( 'cke_dialog_background_iframe' ).document ); - coverDoc.removeListener( 'mouseup', mouseUpHandler ); - coverDoc.removeListener( 'mousemove', mouseMoveHandler ); - } - }; - - var widthTest = /[lr]/, - heightTest = /[tb]/; - for ( var i = 0 ; i < parts.length ; i++ ) - { - var element = dialog.parts[ parts[i] + '_resize' ]; - if ( resizable == CKEDITOR.DIALOG_RESIZE_NONE || - resizable == CKEDITOR.DIALOG_RESIZE_HEIGHT && widthTest.test( parts[i] ) || - resizable == CKEDITOR.DIALOG_RESIZE_WIDTH && heightTest.test( parts[i] ) ) - { - element.hide(); - continue; - } - element.on( 'mousedown', mouseDownHandler, dialog, { part : parts[i] } ); - } - }, - - currentTop : null, - - currentZIndex : null, - - margins : [0, 0, 0, 0], + return null; + }; /** @@ -1260,19 +1070,101 @@ * } ); */ - definitionObject : function( dialog, dialogDefinition ) - { - if ( arguments.length < 2 ) - return; - ( this._ || ( this._ = {} ) ).dialog = dialog; + var definitionObject = function( dialog, dialogDefinition ) + { + // TODO : Check if needed. + this.dialog = dialog; + + // Transform the contents entries in contentObjects. + var contents = dialogDefinition.contents; + for ( var i = 0, content ; ( content = contents[i] ) ; i++ ) + contents[ i ] = new contentObject( dialog, content ); + CKEDITOR.tools.extend( this, dialogDefinition ); - - var cursor, i; - for ( i = 0 ; i < dialogDefinition.contents.length && ( cursor = dialogDefinition.contents[i] ) ; i++ ) - dialogDefinition.contents[i] = new CKEDITOR.dialog._.contentObject( dialog, cursor.id, cursor ); - }, + }; + + definitionObject.prototype = + /** @lends CKEDITOR.dialog.dialogDefinitionObject.prototype */ + { + /** + * Gets a content definition. + * @param {String} id The id of the content definition. + * @returns {CKEDITOR.dialog.contentDefinition} The content definition + * matching id. + */ + getContents : function( id ) + { + return getById( this.contents, id ); + }, + + /** + * Gets a button definition. + * @param {String} id The id of the button definition. + * @returns {CKEDITOR.dialog.buttonDefinition} The button definition + * matching id. + */ + getButton : function( id ) + { + return getById( this.buttons, id ); + }, + + /** + * Adds a content definition object under this dialog definition. + * @param {CKEDITOR.dialog.contentDefinition} contentDefinition The + * content definition. + * @param {String} [nextSiblingId] The id of an existing content + * definition which the new content definition will be inserted + * before. Omit if the new content definition is to be inserted as + * the last item. + * @returns {CKEDITOR.dialog.contentDefinition} The inserted content + * definition. + */ + addContents : function( contentDefinition, nextSiblingId ) + { + return addById( this.contents, contentDefinition, nextSiblingId ); + }, + + /** + * Adds a button definition object under this dialog definition. + * @param {CKEDITOR.dialog.buttonDefinition} buttonDefinition The + * button definition. + * @param {String} [nextSiblingId] The id of an existing button + * definition which the new button definition will be inserted + * before. Omit if the new button definition is to be inserted as + * the last item. + * @returns {CKEDITOR.dialog.buttonDefinition} The inserted button + * definition. + */ + addButton : function( buttonDefinition, nextSiblingId ) + { + return addById( this.buttons, buttonDefinition, nextSiblingId ); + }, + + /** + * Removes a content definition from this dialog definition. + * @param {String} id The id of the content definition to be removed. + * @returns {CKEDITOR.dialog.contentDefinition} The removed content + * definition. + */ + removeContents : function( id ) + { + removeById( this.contents, id ); + }, + + /** + * Removes a button definition from the dialog definition. + * @param {String} id The id of the button definition to be removed. + * @returns {CKEDITOR.dialog.buttonDefinition} The removed button + * definition. + */ + removeButton : function( id ) + { + removeById( this.buttons, id ); + } + }; /** - * This class is not really part of the API. It is the template of the objects - * representing content pages inside the CKEDITOR.dialog.dialogDefinitionObject. + * This class is not really part of the API. It is the template of the + * objects representing content pages inside the + * CKEDITOR.dialog.dialogDefinitionObject. * @constructor * @name CKEDITOR.dialog.contentDefinitionObject @@ -1286,17 +1178,359 @@ * } ); */ - contentObject : function( dialog, id, contentDefinition ) - { - if ( arguments.length < 3 ) - return; - CKEDITOR.tools.extend( ( this._ || ( this._ = {} ) ), - { - id : id, - dialog : dialog - }); + var contentObject = function( dialog, contentDefinition ) + { + this._ = + { + dialog : dialog + }; + CKEDITOR.tools.extend( this, contentDefinition ); - }, - - accessKeyDownHandler : function( evt ) + }; + + contentObject.prototype = + /** @lends CKEDITOR.dialog.contentDefinitionObject.prototype */ + { + /** + * Gets a UI element definition under the content definition. + * @param {String} id The id of the UI element definition. + * @returns {CKEDITOR.dialog.uiElementDefinition} + */ + get : function( id ) + { + return getById( this.elements, id, 'children' ); + }, + + /** + * Adds a UI element definition to the content definition. + * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition The + * UI elemnet definition to be added. + * @param {String} nextSiblingId The id of an existing UI element + * definition which the new UI element definition will be inserted + * before. Omit if the new button definition is to be inserted as + * the last item. + * @returns {CKEDITOR.dialog.uiElementDefinition} The element + * definition inserted. + */ + add : function( elementDefinition, nextSiblingId ) + { + return addById( this.elements, elementDefinition, nextSiblingId ); + }, + + /** + * Removes a UI element definition from the content definition. + * @param {String} id The id of the UI element definition to be + * removed. + * @returns {CKEDITOR.dialog.uiElementDefinition} The element + * definition removed. + * @example + */ + remove : function( id ) + { + removeById( this.elements, id ); + } + }; + + var initDragAndDrop = function( dialog ) + { + var lastCoords = null, + abstractDialogCoords = null, + element = dialog.getElement().getFirst(), + magnetDistance = dialog._.editor.config.dialog.magnetDistance, + mouseMoveHandler = function( evt ) + { + var dialogSize = dialog.getSize(), + viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(), + x = evt.data.$.screenX, + y = evt.data.$.screenY, + dx = x - lastCoords.x, + dy = y - lastCoords.y, + realX, realY; + + lastCoords = { x : x, y : y }; + abstractDialogCoords.x += dx; + abstractDialogCoords.y += dy; + + if ( abstractDialogCoords.x + CKEDITOR.dialog._.margins[3] < magnetDistance ) + realX = - CKEDITOR.dialog._.margins[3]; + else if ( abstractDialogCoords.x - CKEDITOR.dialog._.margins[1] > viewPaneSize.width - dialogSize.width - magnetDistance ) + realX = viewPaneSize.width - dialogSize.width + CKEDITOR.dialog._.margins[1]; + else + realX = abstractDialogCoords.x; + + if ( abstractDialogCoords.y + CKEDITOR.dialog._.margins[0] < magnetDistance ) + realY = - CKEDITOR.dialog._.margins[0]; + else if ( abstractDialogCoords.y - CKEDITOR.dialog._.margins[2] > viewPaneSize.height - dialogSize.height - magnetDistance ) + realY = viewPaneSize.height - dialogSize.height + CKEDITOR.dialog._.margins[2]; + else + realY = abstractDialogCoords.y; + + dialog.move( realX, realY ); + + evt.data.preventDefault(); + }, + mouseUpHandler = function( evt ) + { + CKEDITOR.document.removeListener( 'mousemove', mouseMoveHandler ); + CKEDITOR.document.removeListener( 'mouseup', mouseUpHandler ); + + if ( CKEDITOR.env.ie6Compat ) + { + var coverDoc = new CKEDITOR.dom.document( frames( 'cke_dialog_background_iframe' ).document ); + coverDoc.removeListener( 'mousemove', mouseMoveHandler ); + coverDoc.removeListener( 'mouseup', mouseUpHandler ); + } + }; + + dialog.parts.title.on( 'mousedown', function( evt ) + { + lastCoords = { x : evt.data.$.screenX, y : evt.data.$.screenY }; + + CKEDITOR.document.on( 'mousemove', mouseMoveHandler ); + CKEDITOR.document.on( 'mouseup', mouseUpHandler ); + abstractDialogCoords = dialog.getPosition(); + + if ( CKEDITOR.env.ie6Compat ) + { + var coverDoc = new CKEDITOR.dom.document( frames( 'cke_dialog_background_iframe' ).document ); + coverDoc.on( 'mousemove', mouseMoveHandler ); + coverDoc.on( 'mouseup', mouseUpHandler ); + } + + evt.data.preventDefault(); + }, dialog ); + }; + + var initResizeHandles = function( dialog ) + { + var definition = dialog._.definition, + minWidth = definition.minWidth || 0, + minHeight = definition.minHeight || 0, + resizable = definition.resizable, + topSizer = function( coords, dy ) + { + coords.y += dy; + }, + rightSizer = function( coords, dx ) + { + coords.x2 += dx; + }, + bottomSizer = function( coords, dy ) + { + coords.y2 += dy; + }, + leftSizer = function( coords, dx ) + { + coords.x += dx; + }, + lastCoords = null, + abstractDialogCoords = null, + magnetDistance = dialog._.editor.config.magnetDistance, + parts = [ 'tl', 't', 'tr', 'l', 'r', 'bl', 'b', 'br' ], + mouseDownHandler = function( evt ) + { + var partName = evt.listenerData.part, size = dialog.getSize(); + abstractDialogCoords = dialog.getPosition(); + CKEDITOR.tools.extend( abstractDialogCoords, + { + x2 : abstractDialogCoords.x + size.width, + y2 : abstractDialogCoords.y + size.height + } ); + lastCoords = { x : evt.data.$.screenX, y : evt.data.$.screenY }; + + CKEDITOR.document.on( 'mousemove', mouseMoveHandler, dialog, { part : partName } ); + CKEDITOR.document.on( 'mouseup', mouseUpHandler, dialog, { part : partName } ); + + if ( CKEDITOR.env.ie6Compat ) + { + var coverDoc = new CKEDITOR.dom.document( frames( 'cke_dialog_background_iframe' ).document ); + coverDoc.on( 'mousemove', mouseMoveHandler, dialog, { part : partName } ); + coverDoc.on( 'mouseup', mouseUpHandler, dialog, { part : partName } ); + } + + evt.data.preventDefault(); + }, + mouseMoveHandler = function( evt ) + { + var x = evt.data.$.screenX, + y = evt.data.$.screenY, + dx = x - lastCoords.x, + dy = y - lastCoords.y, + viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(), + partName = evt.listenerData.part; + + if ( partName.search( 't' ) != -1 ) + topSizer( abstractDialogCoords, dy ); + if ( partName.search( 'l' ) != -1 ) + leftSizer( abstractDialogCoords, dx ); + if ( partName.search( 'b' ) != -1 ) + bottomSizer( abstractDialogCoords, dy ); + if ( partName.search( 'r' ) != -1 ) + rightSizer( abstractDialogCoords, dx ); + + lastCoords = { x : x, y : y }; + + var realX, realY, realX2, realY2; + + if ( abstractDialogCoords.x + CKEDITOR.dialog._.margins[3] < magnetDistance ) + realX = - CKEDITOR.dialog._.margins[3]; + else if ( partName.search( 'l' ) != -1 && abstractDialogCoords.x2 - abstractDialogCoords.x < minWidth + magnetDistance ) + realX = abstractDialogCoords.x2 - minWidth; + else + realX = abstractDialogCoords.x; + + if ( abstractDialogCoords.y + CKEDITOR.dialog._.margins[0] < magnetDistance ) + realY = - CKEDITOR.dialog._.margins[0]; + else if ( partName.search( 't' ) != -1 && abstractDialogCoords.y2 - abstractDialogCoords.y < minHeight + magnetDistance ) + realY = abstractDialogCoords.y2 - minHeight; + else + realY = abstractDialogCoords.y; + + if ( abstractDialogCoords.x2 - CKEDITOR.dialog._.margins[1] > viewPaneSize.width - magnetDistance ) + realX2 = viewPaneSize.width + CKEDITOR.dialog._.margins[1] ; + else if ( partName.search( 'r' ) != -1 && abstractDialogCoords.x2 - abstractDialogCoords.x < minWidth + magnetDistance ) + realX2 = abstractDialogCoords.x + minWidth; + else + realX2 = abstractDialogCoords.x2; + + if ( abstractDialogCoords.y2 - CKEDITOR.dialog._.margins[2] > viewPaneSize.height - magnetDistance ) + realY2= viewPaneSize.height + CKEDITOR.dialog._.margins[2] ; + else if ( partName.search( 'b' ) != -1 && abstractDialogCoords.y2 - abstractDialogCoords.y < minHeight + magnetDistance ) + realY2 = abstractDialogCoords.y + minHeight; + else + realY2 = abstractDialogCoords.y2 ; + + dialog.move( realX, realY ); + dialog.resize( realX2 - realX, realY2 - realY ); + + evt.data.preventDefault(); + }, + mouseUpHandler = function( evt ) + { + CKEDITOR.document.removeListener( 'mouseup', mouseUpHandler ); + CKEDITOR.document.removeListener( 'mousemove', mouseMoveHandler ); + + if ( CKEDITOR.env.ie6Compat ) + { + var coverDoc = new CKEDITOR.dom.document( frames( 'cke_dialog_background_iframe' ).document ); + coverDoc.removeListener( 'mouseup', mouseUpHandler ); + coverDoc.removeListener( 'mousemove', mouseMoveHandler ); + } + }; + + var widthTest = /[lr]/, + heightTest = /[tb]/; + for ( var i = 0 ; i < parts.length ; i++ ) + { + var element = dialog.parts[ parts[i] + '_resize' ]; + if ( resizable == CKEDITOR.DIALOG_RESIZE_NONE || + resizable == CKEDITOR.DIALOG_RESIZE_HEIGHT && widthTest.test( parts[i] ) || + resizable == CKEDITOR.DIALOG_RESIZE_WIDTH && heightTest.test( parts[i] ) ) + { + element.hide(); + continue; + } + element.on( 'mousedown', mouseDownHandler, dialog, { part : parts[i] } ); + } + }; + + var resizeCover; + + var addCover = function( editor ) + { + var win = CKEDITOR.document.getWindow(); + + var html = [ + '
' + ]; + + if ( CKEDITOR.env.ie6Compat ) + { + html.push( '' ); + } + + html.push( '
' ); + + var element = CKEDITOR.dom.element.createFromHtml( html.join( '' ) ); + + var resizeFunc = function() + { + var size = win.getViewPaneSize(); + element.setStyles( + { + width : size.width + 'px', + height : size.height + 'px' + }); + }; + + var scrollFunc = function() + { + var pos = win.getScrollPosition(), + cursor = CKEDITOR.dialog._.currentTop; + element.setStyles( + { + left : pos.x + 'px', + top : pos.y + 'px' + }); + + do + { + var dialogPos = cursor.getPosition(); + cursor.move( dialogPos.x, dialogPos.y ); + } while( cursor = cursor._.parentDialog ); + }; + + resizeCover = resizeFunc; + win.on( 'resize', resizeFunc ); + resizeFunc(); + if ( CKEDITOR.env.ie6Compat ) + { + // IE BUG: win.$.onscroll assignment doesn't work.. it must be window.onscroll. + // So we need to invent a really funny way to make it work. + var myScrollHandler = function() + { + scrollFunc(); + arguments.callee.prevScrollHandler.apply( this, arguments ); + }; + win.$.setTimeout( function() + { + myScrollHandler.prevScrollHandler = window.onscroll || function(){}; + window.onscroll = myScrollHandler; + }, 0 ); + scrollFunc(); + } + element.setOpacity( editor.config.dialog.backgroundCoverOpacity ); + element.appendTo( CKEDITOR.document.getBody() ); + }; + + var removeCover = function() + { + var element = CKEDITOR.document.getById( 'cke_dialog_background_cover' ), + win = CKEDITOR.document.getWindow(); + if ( element ) + { + element.remove(); + win.removeListener( 'resize', resizeCover ); + + if ( CKEDITOR.env.ie6Compat ) + { + win.$.setTimeout( function() + { + var prevScrollHandler = window.onscroll && window.onscroll.prevScrollHandler; + window.onscroll = prevScrollHandler || null; + }, 0 ); + } + resizeCover = null; + } + }; + + var accessKeyProcessors = {}; + + var accessKeyDownHandler = function( evt ) { var ctrl = evt.data.$.ctrlKey || evt.data.$.metaKey, @@ -1304,5 +1538,5 @@ shift = evt.data.$.shiftKey, key = String.fromCharCode( evt.data.$.keyCode ), - keyProcessor = CKEDITOR.dialog._.accessKeyProcessors[( ctrl ? 'CTRL+' : '' ) + ( alt ? 'ALT+' : '') + ( shift ? 'SHIFT+' : '' ) + key]; + keyProcessor = accessKeyProcessors[( ctrl ? 'CTRL+' : '' ) + ( alt ? 'ALT+' : '') + ( shift ? 'SHIFT+' : '' ) + key]; if ( !keyProcessor || !keyProcessor.length ) @@ -1312,7 +1546,7 @@ keyProcessor.keydown && keyProcessor.keydown.call( keyProcessor.uiElement, keyProcessor.dialog, keyProcessor.key ); evt.data.preventDefault(); - }, - - accessKeyUpHandler : function( evt ) + }; + + var accessKeyUpHandler = function( evt ) { var ctrl = evt.data.$.ctrlKey || evt.data.$.metaKey, @@ -1320,5 +1554,5 @@ shift = evt.data.$.shiftKey, key = String.fromCharCode( evt.data.$.keyCode ), - keyProcessor = CKEDITOR.dialog._.accessKeyProcessors[( ctrl ? 'CTRL+' : '' ) + ( alt ? 'ALT+' : '') + ( shift ? 'SHIFT+' : '' ) + key]; + keyProcessor = accessKeyProcessors[( ctrl ? 'CTRL+' : '' ) + ( alt ? 'ALT+' : '') + ( shift ? 'SHIFT+' : '' ) + key]; if ( !keyProcessor || !keyProcessor.length ) @@ -1328,9 +1562,9 @@ keyProcessor.keyup && keyProcessor.keyup.call( keyProcessor.uiElement, keyProcessor.dialog, keyProcessor.key ); evt.data.preventDefault(); - }, - - registerAccessKey : function( uiElement, dialog, key, downFunc, upFunc ) - { - var procList = this.accessKeyProcessors[key] || ( this.accessKeyProcessors[key] = [] ); + }; + + var registerAccessKey = function( uiElement, dialog, key, downFunc, upFunc ) + { + var procList = accessKeyProcessors[key] || ( accessKeyProcessors[key] = [] ); procList.push( { uiElement : uiElement, @@ -1340,11 +1574,11 @@ keydown : downFunc || uiElement.accessKeyDown } ); - }, - - unregisterAccessKey : function( obj ) - { - for ( var i in this.accessKeyProcessors ) - { - var list = this.accessKeyProcessors[i]; + }; + + var unregisterAccessKey = function( obj ) + { + for ( var i in accessKeyProcessors ) + { + var list = accessKeyProcessors[i]; for ( var j = list.length - 1 ; j >= 0 ; j-- ) { @@ -1353,614 +1587,442 @@ } if ( list.length == 0 ) - delete this.accessKeyProcessors[i]; + delete accessKeyProcessors[i]; } - }, - - accessKeyProcessors : {}, - - tabAccessKeyUp : function( dialog, key ) + }; + + var tabAccessKeyUp = function( dialog, key ) { if ( dialog._.accessKeyMap[key] ) dialog.selectPage( dialog._.accessKeyMap[key] ); - }, - - tabAccessKeyDown : function( dialog, key ) - { - } -}; - -CKEDITOR.event.implementOn( CKEDITOR.dialog ); - -CKEDITOR.dialog._.definitionObject.prototype = -/** @lends CKEDITOR.dialog.dialogDefinitionObject.prototype */ -{ - /** - * Gets a content definition in the dialog definition. - * @param {String} id The id of the content definition. - * @returns {CKEDITOR.dialog.contentDefinition} The content definition with id. - * @example - */ - getContents : function( id ) - { - for ( var i = 0, cursor ; i < this.contents.length && ( cursor = this.contents[i] ) ; i++ ) - { - if ( cursor.id == id ) - return cursor; - } - return null; - }, - - /** - * Gets a button definition in the dialog definition. - * @param {String} id The id of the button definition. - * @returns {CKEDITOR.dialog.buttonDefinition} The button definition with id. - * @example - */ - getButton : function( id ) - { - for ( var i = 0, cursor ; i < this.buttons.length && ( cursor = this.buttons[i] ) ; i++ ) - { - if ( cursor.id == id ) - return cursor; - } - return null; - }, - - /** - * Adds a content definition object under the dialog definition. - * @param {CKEDITOR.dialog.contentDefinition} The content definition. - * @param {String} nextSiblingId The id of an existing content definition which the new content definition - * will be inserted before. Omit if the new content definition is to be inserted as the last item. - * @returns {CKEDITOR.dialog.contentDefinition} The inserted content definition. - * @example - */ - addContents : function( contentDefinition, nextSiblingId ) - { - for ( var i = 0, cursor ; i < this.contents.length && ( cursor = this.contents[i] ) ; i++ ) - { - if ( cursor.id == nextSiblingId ) - { - this.contents.splice( i, 0, contentDefinition ); - return contentDefinition; + }; + + var tabAccessKeyDown = function( dialog, key ) + { + }; + + (function() + { + var decimalRegex = /^\d+(?:\.\d+)?$/, + fixLength = function( length ) + { + return length + ( decimalRegex.test( length ) ? 'px' : '' ); } - } - this.contents.push( contentDefinition ); - return contentDefinition; - }, - - /** - * Adds a button definition object under the dialog definition. - * @param {CKEDITOR.dialog.buttonDefinition} The button definition. - * @param {String} nextSiblingId The id of an existing button definition which the new button definition - * will be inserted before. Omit if the new button definition is to be inserted as the last item. - * @returns {CKEDITOR.dialog.buttonDefinition} The inserted button definition. - * @example - */ - addButton : function( buttonDefinition, nextSiblingId ) - { - for ( var i = 0, cursor ; i < this.buttons.length && ( cursor = this.buttons[i] ) ; i++ ) - { - if ( cursor.id == nextSiblingId ) - { - this.buttons.splice( i, 0, buttonDefinition ); - return buttonDefinition; + + CKEDITOR.ui.dialog = + { + /** + * The base class of all dialog UI elements. + * @constructor + * @param {CKEDITOR.dialog} dialog Parent dialog object. + * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition Element + * definition. Accepted fields: + * + * @param {Array} htmlList + * List of HTML code to be added to the dialog's content area. + * @param {Function|String} nodeNameArg + * A function returning a string, or a simple string for the node name for + * the root DOM node. Default is 'div'. + * @param {Function|Object} stylesArg + * A function returning an object, or a simple object for CSS styles applied + * to the DOM node. Default is empty object. + * @param {Function|Object} attributesArg + * A fucntion returning an object, or a simple object for attributes applied + * to the DOM node. Default is empty object. + * @param {Function|String} contentsArg + * A function returning a string, or a simple string for the HTML code inside + * the root DOM node. Default is empty string. + * @example + */ + uiElement : function( dialog, elementDefinition, htmlList, nodeNameArg, stylesArg, attributesArg, contentsArg ) + { + if (arguments.length < 4 ) + return; + + var nodeName = ( nodeNameArg.call ? nodeNameArg( elementDefinition ) : nodeNameArg ) || 'div', + html = [ '<', nodeName, ' ' ], + styles = ( stylesArg && stylesArg.call ? stylesArg( elementDefinition ) : stylesArg ) || {}, + attributes = ( attributesArg && attributesArg.call ? attributesArg( elementDefinition ) : attributesArg ) || {}, + innerHTML = ( contentsArg && contentsArg.call ? contentsArg( dialog, elementDefinition ) : contentsArg ) || '', + domId = this.domId = attributes.id || CKEDITOR.tools.getNextNumber() + '_uiElement', + id = this.id = elementDefinition.id, + i; + + // Set the id, a unique id is required for getElement() to work. + attributes.id = domId; + + // Set the type and definition CSS class names. + var classes = {}; + if ( elementDefinition.type ) + classes[ 'cke_dialog_ui_' + elementDefinition.type ] = 1; + if ( elementDefinition.className ) + classes[ elementDefinition.className ] = 1; + var attributeClasses = ( attributes['class'] && attributes['class'].split ) ? attributes['class'].split( ' ' ) : []; + for ( i = 0 ; i < attributeClasses.length ; i++ ) + { + if ( attributeClasses[i] ) + classes[ attributeClasses[i] ] = 1; + } + var finalClasses = []; + for ( i in classes ) + finalClasses.push( i ); + attributes['class'] = finalClasses.join( ' ' ); + + // Set the popup tooltop. + if ( elementDefinition.title ) + attributes.title = elementDefinition.title; + + // Write the inline CSS styles. + var styleStr = ( elementDefinition.style || '' ).split( ';' ); + for ( i in styles ) + styleStr.push( i + ':' + styles[i] ); + for ( i = styleStr.length - 1 ; i >= 0 ; i-- ) + { + if ( styleStr[i] === '' ) + styleStr.splice( i, 1 ); + } + if ( styleStr.length > 0 ) + attributes.style = ( attributes.style || '' ) + styleStr.join( '; ' ); + + // Write the attributes. + for ( i in attributes ) + html.push( i + '="' + CKEDITOR.tools.htmlEncode( attributes[i] ) + '" '); + + // Write the content HTML. + html.push( '>', innerHTML, '' ); + + // Add contents to the parent HTML array. + htmlList.push( html.join( '' ) ); + + ( this._ || ( this._ = {} ) ).dialog = dialog; + + // Override isChanged if it is defined in element definition. + if ( typeof( elementDefinition.isChanged ) == 'boolean' ) + this.isChanged = function(){ return elementDefinition.isChanged; }; + if ( typeof( elementDefinition.isChanged ) == 'function' ) + this.isChanged = elementDefinition.isChanged; + + // Add events. + CKEDITOR.event.implementOn( this ); + + this.registerEvents( elementDefinition ); + if ( this.accessKeyUp && this.accessKeyDown && elementDefinition.accessKey ) + registerAccessKey( this, dialog, 'CTRL+' + elementDefinition.accessKey ); + + // Completes this object with everything we have in the + // definition. + CKEDITOR.tools.extend( this, elementDefinition ); + }, + + /** + * Horizontal layout box for dialog UI elements, auto-expends to available width of container. + * @constructor + * @extends CKEDITOR.ui.dialog.uiElement + * @param {CKEDITOR.dialog} dialog + * Parent dialog object. + * @param {Array} childObjList + * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this + * container. + * @param {Array} childHtmlList + * Array of HTML code that correspond to the HTML output of all the + * objects in childObjList. + * @param {Array} htmlList + * Array of HTML code that this element will output to. + * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition + * The element definition. Accepted fields: + * + * @example + */ + hbox : function( dialog, childObjList, childHtmlList, htmlList, elementDefinition ) + { + if ( arguments.length < 4 ) + return; + + this._ || ( this._ = {} ); + + var children = this._.children = childObjList, + widths = elementDefinition && elementDefinition.widths || null, + height = elementDefinition && elementDefinition.height || null, + styles = {}, + i; + /** @ignore */ + var innerHTML = function() + { + var html = [ '' ]; + for ( i = 0 ; i < childHtmlList.length ; i++ ) + { + var className = 'cke_dialog_ui_hbox_child', + styles = []; + if ( i === 0 ) + className = 'cke_dialog_ui_hbox_first'; + if ( i == childHtmlList.length - 1 ) + className = 'cke_dialog_ui_hbox_last'; + html.push( ' 0 ) + html.push( 'style="' + styles.join('; ') + '" ' ); + html.push( '>', childHtmlList[i], '' ); + } + html.push( '' ); + return html.join( '' ); + }; + + CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition || { type : 'hbox' }, htmlList, 'table', styles, + { align : ( elementDefinition && elementDefinition.align ) || + ( dialog.getParentEditor().lang.dir == 'ltr' ? 'left' : 'right' ) }, innerHTML ); + }, + + /** + * Vertical layout box for dialog UI elements. + * @constructor + * @extends CKEDITOR.ui.dialog.hbox + * @param {CKEDITOR.dialog} dialog + * Parent dialog object. + * @param {Array} childObjList + * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this + * container. + * @param {Array} childHtmlList + * Array of HTML code that correspond to the HTML output of all the + * objects in childObjList. + * @param {Array} htmlList + * Array of HTML code that this element will output to. + * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition + * The element definition. Accepted fields: + * + * @example + */ + vbox : function( dialog, childObjList, childHtmlList, htmlList, elementDefinition ) + { + if (arguments.length < 3 ) + return; + + this._ || ( this._ = {} ); + + var children = this._.children = childObjList, + width = elementDefinition && elementDefinition.width || null, + heights = elementDefinition && elementDefinition.heights || null; + /** @ignore */ + var innerHTML = function() + { + var html = [ '' ); + for ( var i = 0 ; i < childHtmlList.length ; i++ ) + { + var styles = []; + html.push( '' ); + } + html.push( '
0 ) + html.push( 'style="', styles.join( '; ' ), '" ' ); + html.push( ' class="cke_dialog_ui_vbox_child">', childHtmlList[i], '
' ); + return html.join( '' ); + }; + CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition || { type : 'vbox' }, htmlList, 'div', null, null, innerHTML ); } - } - this.buttons.push( buttonDefinition ); - return buttonDefinition; - }, - - /** - * Removes a content definition from the dialog definition. - * @param {String} id The id of the content definition to be removed. - * @returns {CKEDITOR.dialog.contentDefinition} The removed content definition. - * @example - */ - removeContents : function( id ) - { - for ( var i = 0; i < this.contents.length ; i++ ) - { - if ( this.contents[i].id == id ) - return this.contents.splice( i, 1 ); - } - return null; - }, - - /** - * Removes a button definition from the dialog definition. - * @param {String} id The id of the button definition to be removed. - * @returns {CKEDITOR.dialog.buttonDefinition} The removed button definition. - * @example - */ - removeButton : function( id ) - { - for ( var i = 0 ; i < this.buttons.length ; i++ ) - { - if ( this.buttons[i].id == id ) - return this.buttons.splice( i, 1 ); - } - return null; - } -}; - -CKEDITOR.dialog._.contentObject.prototype = -/** @lends CKEDITOR.dialog.contentDefinitionObject.prototype */ -{ - /** - * Gets a UI element definition under the content definition. - * @param {String} id The id of the UI element definition. - * @returns {CKEDITOR.dialog.uiElementDefinition} - * @example - */ - get : function( id ) - { - for ( var i = 0, cursor ; i < this.elements.length && ( cursor = this.elements[i] ) ; i++ ) - { - if ( cursor.id == id ) - return cursor; - } - return null; - }, - - /** - * Adds a UI element definition to the content definition. - * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition The UI elemnet definition - * to be added. - * @param {String} nextSiblingId The id of an existing UI element definition which the new - * UI element definition will be inserted before. Omit if the new button definition is to - * be inserted as the last item. - * @returns {CKEDITOR.dialog.uiElementDefinition} The element definition inserted. - * @example - */ - add : function( elementDefinition, nextSiblingId ) - { - for ( var i = 0, cursor ; i < this.elements.length && ( cursor = this.elements[i] ) ; i++ ) - { - if ( cursor.id == nextSiblingId ) - { - this.elements.splice( i, 0, elementDefinition ); - return elementDefinition; - } - } - this.elements.push( elementDefinition ); - return elementDefinition; - }, - - /** - * Removes a UI element definition from the content definition. - * @param {String} id The id of the UI element definition to be removed. - * @returns {CKEDITOR.dialog.uiElementDefinition} The element definition removed. - * @example - */ - remove : function( id ) - { - for ( var i = 0 ; i < this.elements.length ; i++ ) - { - if ( this.elements[i].id == id ) - return this.elements.splice( i, 1 ); - } - return null; - } -}; - -(function() -{ - var decimalRegex = /^\d+(?:\.\d+)?$/, - fixLength = function( length ) - { - return length + ( decimalRegex.test( length ) ? 'px' : '' ); - } - - CKEDITOR.ui.dialog = - { - /** - * The base class of all dialog UI elements. - * @constructor - * @param {CKEDITOR.dialog} dialog Parent dialog object. - * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition Element - * definition. Accepted fields: - * - * @param {Array} htmlList - * List of HTML code to be added to the dialog's content area. - * @param {Function|String} nodeNameArg - * A function returning a string, or a simple string for the node name for - * the root DOM node. Default is 'div'. - * @param {Function|Object} stylesArg - * A function returning an object, or a simple object for CSS styles applied - * to the DOM node. Default is empty object. - * @param {Function|Object} attributesArg - * A fucntion returning an object, or a simple object for attributes applied - * to the DOM node. Default is empty object. - * @param {Function|String} contentsArg - * A function returning a string, or a simple string for the HTML code inside - * the root DOM node. Default is empty string. - * @example - */ - uiElement : function( dialog, elementDefinition, htmlList, nodeNameArg, stylesArg, attributesArg, contentsArg ) - { - if (arguments.length < 4 ) - return; - - var nodeName = ( nodeNameArg.call ? nodeNameArg( elementDefinition ) : nodeNameArg ) || 'div', - html = [ '<', nodeName, ' ' ], - styles = ( stylesArg && stylesArg.call ? stylesArg( elementDefinition ) : stylesArg ) || {}, - attributes = ( attributesArg && attributesArg.call ? attributesArg( elementDefinition ) : attributesArg ) || {}, - innerHTML = ( contentsArg && contentsArg.call ? contentsArg( dialog, elementDefinition ) : contentsArg ) || '', - domId = this.domId = attributes.id || CKEDITOR.tools.getNextNumber() + '_uiElement', - id = this.id = elementDefinition.id, - i; - - // Set the id, a unique id is required for getElement() to work. - attributes.id = domId; - - // Set the type and definition CSS class names. - var classes = {}; - if ( elementDefinition.type ) - classes[ 'cke_dialog_ui_' + elementDefinition.type ] = 1; - if ( elementDefinition.className ) - classes[ elementDefinition.className ] = 1; - var attributeClasses = ( attributes['class'] && attributes['class'].split ) ? attributes['class'].split( ' ' ) : []; - for ( i = 0 ; i < attributeClasses.length ; i++ ) - { - if ( attributeClasses[i] ) - classes[ attributeClasses[i] ] = 1; - } - var finalClasses = []; - for ( i in classes ) - finalClasses.push( i ); - attributes['class'] = finalClasses.join( ' ' ); - - // Set the popup tooltop. - if ( elementDefinition.title ) - attributes.title = elementDefinition.title; - - // Write the inline CSS styles. - var styleStr = ( elementDefinition.style || '' ).split( ';' ); - for ( i in styles ) - styleStr.push( i + ':' + styles[i] ); - for ( i = styleStr.length - 1 ; i >= 0 ; i-- ) - { - if ( styleStr[i] === '' ) - styleStr.splice( i, 1 ); - } - if ( styleStr.length > 0 ) - attributes.style = ( attributes.style || '' ) + styleStr.join( '; ' ); - - // Write the attributes. - for ( i in attributes ) - html.push( i + '="' + CKEDITOR.tools.htmlEncode( attributes[i] ) + '" '); - - // Write the content HTML. - html.push( '>', innerHTML, '' ); - - // Add contents to the parent HTML array. - htmlList.push( html.join( '' ) ); - - ( this._ || ( this._ = {} ) ).dialog = dialog; - - // Override isChanged if it is defined in element definition. - if ( typeof( elementDefinition.isChanged ) == 'boolean' ) - this.isChanged = function(){ return elementDefinition.isChanged; }; - if ( typeof( elementDefinition.isChanged ) == 'function' ) - this.isChanged = elementDefinition.isChanged; - - // Add events. - CKEDITOR.event.implementOn( this ); - - this.registerEvents( elementDefinition ); - if ( this.accessKeyUp && this.accessKeyDown && elementDefinition.accessKey ) - CKEDITOR.dialog._.registerAccessKey( this, dialog, 'CTRL+' + elementDefinition.accessKey ); - }, - - /** - * Horizontal layout box for dialog UI elements, auto-expends to available width of container. - * @constructor - * @extends CKEDITOR.ui.dialog.uiElement - * @param {CKEDITOR.dialog} dialog - * Parent dialog object. - * @param {Array} childObjList - * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this - * container. - * @param {Array} childHtmlList - * Array of HTML code that correspond to the HTML output of all the - * objects in childObjList. - * @param {Array} htmlList - * Array of HTML code that this element will output to. - * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition - * The element definition. Accepted fields: - * - * @example - */ - hbox : function( dialog, childObjList, childHtmlList, htmlList, elementDefinition ) - { - if ( arguments.length < 4 ) - return; - - this._ || ( this._ = {} ); - - var children = this._.children = childObjList, - widths = elementDefinition && elementDefinition.widths || null, - height = elementDefinition && elementDefinition.height || null, - styles = {}, - i; - /** @ignore */ - var innerHTML = function() - { - var html = [ '' ]; - for ( i = 0 ; i < childHtmlList.length ; i++ ) - { - var className = 'cke_dialog_ui_hbox_child', - styles = []; - if ( i === 0 ) - className = 'cke_dialog_ui_hbox_first'; - if ( i == childHtmlList.length - 1 ) - className = 'cke_dialog_ui_hbox_last'; - html.push( ' 0 ) - html.push( 'style="' + styles.join('; ') + '" ' ); - html.push( '>', childHtmlList[i], '' ); - } - html.push( '' ); - return html.join( '' ); - }; - - CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition || { type : 'hbox' }, htmlList, 'table', styles, - { align : ( elementDefinition && elementDefinition.align ) || - ( dialog.getParentEditor().lang.dir == 'ltr' ? 'left' : 'right' ) }, innerHTML ); - }, - - /** - * Vertical layout box for dialog UI elements. - * @constructor - * @extends CKEDITOR.ui.dialog.hbox - * @param {CKEDITOR.dialog} dialog - * Parent dialog object. - * @param {Array} childObjList - * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this - * container. - * @param {Array} childHtmlList - * Array of HTML code that correspond to the HTML output of all the - * objects in childObjList. - * @param {Array} htmlList - * Array of HTML code that this element will output to. - * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition - * The element definition. Accepted fields: - * - * @example - */ - vbox : function( dialog, childObjList, childHtmlList, htmlList, elementDefinition ) - { - if (arguments.length < 3 ) - return; - - this._ || ( this._ = {} ); - - var children = this._.children = childObjList, - width = elementDefinition && elementDefinition.width || null, - heights = elementDefinition && elementDefinition.heights || null; - /** @ignore */ - var innerHTML = function() - { - var html = [ '' ); - for ( var i = 0 ; i < childHtmlList.length ; i++ ) - { - var styles = []; - html.push( '' ); - } - html.push( '
0 ) - html.push( 'style="', styles.join( '; ' ), '" ' ); - html.push( ' class="cke_dialog_ui_vbox_child">', childHtmlList[i], '
' ); - return html.join( '' ); - }; - CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition || { type : 'vbox' }, htmlList, 'div', null, null, innerHTML ); - } - }; -})(); - -CKEDITOR.ui.dialog.uiElement.prototype = -{ - /** - * Gets the root DOM element of this dialog UI object. - * @returns {CKEDITOR.dom.element} Root DOM element of UI object. - * @example - * uiElement.getElement().hide(); - */ - getElement : function() - { - return CKEDITOR.document.getById( this.domId ); - }, - - /** - * Gets the DOM element that the user inputs values. - * This function is used by setValue(), getValue() and focus(). It should - * be overrided in child classes where the input element isn't the root - * element. - * @returns {CKEDITOR.dom.element} The element where the user input values. - * @example - * var rawValue = textInput.getInputElement().$.value; - */ - getInputElement : function() - { - return this.getElement(); - }, - - /** - * Gets the parent dialog object containing this UI element. - * @returns {CKEDITOR.dialog} Parent dialog object. - * @example - * var dialog = uiElement.getDialog(); - */ - getDialog : function() - { - return this._.dialog; - }, - - /** - * Sets the value of this dialog UI object. - * @param {Object} value The new value. - * @returns {CKEDITOR.dialog.uiElement} The current UI element. - * @example - * uiElement.setValue( 'Dingo' ); - */ - setValue : function( value ) - { - this.getInputElement().$.value = value; - this.fire( 'change', { value : value } ); - return this; - }, - - /** - * Gets the current value of this dialog UI object. - * @returns {Object} The current value. - * @example - * var myValue = uiElement.getValue(); - */ - getValue : function() - { - return this.getInputElement().$.value; - }, - - /** - * Tells whether the UI object's value has changed. - * @returns {Boolean} true if changed, false if not changed. - * @example - * if ( uiElement.isChanged() ) - *   confirm( 'Value changed! Continue?' ); - */ - isChanged : function() - { - // Override in input classes. - return false; - }, - - /** - * Selects the parent tab of this element. Usually called by focus() or overridden focus() methods. - * @returns {CKEDITOR.dialog.uiElement} The current UI element. - * @example - * focus : function() - * { - * this.selectParentTab(); - * // do something else. - * } - */ - selectParentTab : function() - { - var element = this.getInputElement(), - cursor = element, - tabId; - while ( ( cursor = cursor.getParent() ) && cursor.$.className.search( 'cke_dialog_page_contents' ) == -1 ); - tabId = cursor.getAttribute( 'name' ); - - this._.dialog.selectPage( tabId ); - return this; - }, - - /** - * Puts the focus to the UI object. Switches tabs if the UI object isn't in the active tab page. - * @returns {CKEDITOR.dialog.uiElement} The current UI element. - * @example - * uiElement.focus(); - */ - focus : function() - { - this.selectParentTab().getInputElement().focus(); - return this; - }, - - /** - * Registers the on* event handlers defined in the element definition. - * The default behavior of this function is: - *
    - *
  1. - * If the on* event is defined in the class's eventProcesors list, - * then the registration is delegated to the corresponding function - * in the eventProcessors list. - *
    2. - *
  2. - * If the on* event is not defined in the eventProcessors list, then - * register the event handler under the corresponding DOM event of - * the UI element's input DOM element (as defined by the return value - * of {@link CKEDITOR.ui.dialog.uiElement#getInputElement}). - *
    3. - *
- * This function is only called at UI element instantiation, but can - * be overridded in child classes if they require more flexibility. - * @param {CKEDITOR.dialog.uiElementDefinition} definition The UI element - * definition. - * @returns {CKEDITOR.dialog.uiElement} The current UI element. - * @example - */ - registerEvents : function( definition ) - { - var regex = /^on([A-Z]\w+)/, - match, - registerDomEvent = function( uiElement, dialog, eventName, func ) + }; + })(); + + CKEDITOR.ui.dialog.uiElement.prototype = + { + /** + * Gets the root DOM element of this dialog UI object. + * @returns {CKEDITOR.dom.element} Root DOM element of UI object. + * @example + * uiElement.getElement().hide(); + */ + getElement : function() + { + return CKEDITOR.document.getById( this.domId ); + }, + + /** + * Gets the DOM element that the user inputs values. + * This function is used by setValue(), getValue() and focus(). It should + * be overrided in child classes where the input element isn't the root + * element. + * @returns {CKEDITOR.dom.element} The element where the user input values. + * @example + * var rawValue = textInput.getInputElement().$.value; + */ + getInputElement : function() + { + return this.getElement(); + }, + + /** + * Gets the parent dialog object containing this UI element. + * @returns {CKEDITOR.dialog} Parent dialog object. + * @example + * var dialog = uiElement.getDialog(); + */ + getDialog : function() + { + return this._.dialog; + }, + + /** + * Sets the value of this dialog UI object. + * @param {Object} value The new value. + * @returns {CKEDITOR.dialog.uiElement} The current UI element. + * @example + * uiElement.setValue( 'Dingo' ); + */ + setValue : function( value ) + { + this.getInputElement().setValue( value ); + this.fire( 'change', { value : value } ); + return this; + }, + + /** + * Gets the current value of this dialog UI object. + * @returns {Object} The current value. + * @example + * var myValue = uiElement.getValue(); + */ + getValue : function() + { + return this.getInputElement().getValue(); + }, + + /** + * Tells whether the UI object's value has changed. + * @returns {Boolean} true if changed, false if not changed. + * @example + * if ( uiElement.isChanged() ) + *   confirm( 'Value changed! Continue?' ); + */ + isChanged : function() + { + // Override in input classes. + return false; + }, + + /** + * Selects the parent tab of this element. Usually called by focus() or overridden focus() methods. + * @returns {CKEDITOR.dialog.uiElement} The current UI element. + * @example + * focus : function() + * { + * this.selectParentTab(); + * // do something else. + * } + */ + selectParentTab : function() + { + var element = this.getInputElement(), + cursor = element, + tabId; + while ( ( cursor = cursor.getParent() ) && cursor.$.className.search( 'cke_dialog_page_contents' ) == -1 ); + tabId = cursor.getAttribute( 'name' ); + + this._.dialog.selectPage( tabId ); + return this; + }, + + /** + * Puts the focus to the UI object. Switches tabs if the UI object isn't in the active tab page. + * @returns {CKEDITOR.dialog.uiElement} The current UI element. + * @example + * uiElement.focus(); + */ + focus : function() + { + this.selectParentTab().getInputElement().focus(); + return this; + }, + + /** + * Registers the on* event handlers defined in the element definition. + * The default behavior of this function is: + *
    + *
  1. + * If the on* event is defined in the class's eventProcesors list, + * then the registration is delegated to the corresponding function + * in the eventProcessors list. + *
    2. + *
  2. + * If the on* event is not defined in the eventProcessors list, then + * register the event handler under the corresponding DOM event of + * the UI element's input DOM element (as defined by the return value + * of {@link CKEDITOR.ui.dialog.uiElement#getInputElement}). + *
    3. + *
+ * This function is only called at UI element instantiation, but can + * be overridded in child classes if they require more flexibility. + * @param {CKEDITOR.dialog.uiElementDefinition} definition The UI element + * definition. + * @returns {CKEDITOR.dialog.uiElement} The current UI element. + * @example + */ + registerEvents : function( definition ) + { + var regex = /^on([A-Z]\w+)/, + match; + + var registerDomEvent = function( uiElement, dialog, eventName, func ) { dialog.on( 'load', function() @@ -1970,144 +2032,315 @@ }; - for ( var i in definition ) - { - if ( !( match = i.match( regex ) ) ) - continue; - if ( this.eventProcessors[i] ) - this.eventProcessors[i].call( this, this._.dialog, definition[i] ); - else - registerDomEvent( this, this._.dialog, match[1].toLowerCase(), definition[i] ); + for ( var i in definition ) + { + if ( !( match = i.match( regex ) ) ) + continue; + if ( this.eventProcessors[i] ) + this.eventProcessors[i].call( this, this._.dialog, definition[i] ); + else + registerDomEvent( this, this._.dialog, match[1].toLowerCase(), definition[i] ); + } + + return this; + }, + + /** + * The event processor list used by + * {@link CKEDITOR.ui.dialog.uiElement#getInputElement} at UI element + * instantiation. The default list defines three on* events: + *
    + *
  1. onLoad - Called when the element's parent dialog opens for the + * first time
    2. + *
  2. onShow - Called whenever the element's parent dialog opens.
    3. + *
  3. onHide - Called whenever the element's parent dialog closes.
    4. + *
+ * @field + * @type Object + * @example + * // This connects the 'click' event in CKEDITOR.ui.dialog.button to onClick + * // handlers in the UI element's definitions. + * CKEDITOR.ui.dialog.button.eventProcessors = CKEDITOR.tools.extend( {}, + *   CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors, + *   { onClick : function( dialog, func ) { this.on( 'click', func ); } }, + *   true ); + */ + eventProcessors : + { + onLoad : function( dialog, func ) + { + dialog.on( 'load', func ); + }, + + onShow : function( dialog, func ) + { + dialog.on( 'show', func ); + }, + + onHide : function( dialog, func ) + { + dialog.on( 'hide', func ); + } + }, + + /** + * The default handler for a UI element's access key down event, which + * tries to put focus to the UI element.
+ * Can be overridded in child classes for more sophisticaed behavior. + * @param {CKEDITOR.dialog} dialog The parent dialog object. + * @param {String} key The key combination pressed. Since access keys + * are defined to always include the CTRL key, its value should always + * include a 'CTRL+' prefix. + * @example + */ + accessKeyDown : function( dialog, key ) + { + this.focus(); + }, + + /** + * The default handler for a UI element's access key up event, which + * does nothing.
+ * Can be overridded in child classes for more sophisticated behavior. + * @param {CKEDITOR.dialog} dialog The parent dialog object. + * @param {String} key The key combination pressed. Since access keys + * are defined to always include the CTRL key, its value should always + * include a 'CTRL+' prefix. + * @example + */ + accessKeyUp : function( dialog, key ) + { + }, + + /** + * Disables a UI element. + * @example + */ + disable : function() + { + var element = this.getInputElement(); + element.setAttribute( 'disabled', 'true' ); + element.addClass( 'cke_disabled' ); + }, + + /** + * Enables a UI element. + * @example + */ + enable : function() + { + var element = this.getInputElement(); + element.removeAttribute( 'disabled' ); + element.removeClass( 'cke_disabled' ); } - - return this; - }, + }; + + CKEDITOR.ui.dialog.hbox.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.uiElement, + /** + * @lends CKEDITOR.ui.dialog.hbox.prototype + */ + { + /** + * Gets a child UI element inside this container. + * @param {Array|Number} indices An array or a single number to indicate the child's + * position in the container's descendant tree. Omit to get all the children in an array. + * @returns {Array|CKEDITOR.ui.dialog.uiElement} Array of all UI elements in the container + * if no argument given, or the specified UI element if indices is given. + * @example + * var checkbox = hbox.getChild( [0,1] ); + * checkbox.setValue( true ); + */ + getChild : function( indices ) + { + // If no arguments, return a clone of the children array. + if ( arguments.length < 1 ) + return this._.children.concat(); + + // If indices isn't array, make it one. + if ( !indices.splice ) + indices = [ indices ]; + + // Retrieve the child element according to tree position. + if ( indices.length < 2 ) + return this._.children[ indices[0] ]; + else + return ( this._.children[ indices[0] ] && this._.children[ indices[0] ].getChild ) ? + this._.children[ indices[0] ].getChild( indices.slice( 1, indices.length ) ) : + null; + } + }, true ); + + CKEDITOR.ui.dialog.vbox.prototype = new CKEDITOR.ui.dialog.hbox(); + + + + (function() + { + var commonBuilder = { + build : function( dialog, elementDefinition, output ) + { + var children = elementDefinition.children, + child, + childHtmlList = [], + childObjList = []; + for ( var i = 0 ; ( i < children.length && ( child = children[i] ) ) ; i++ ) + { + var childHtml = []; + childHtmlList.push( childHtml ); + childObjList.push( CKEDITOR.dialog._.uiElementBuilders[ child.type ].build( dialog, child, childHtml ) ); + } + return new CKEDITOR.ui.dialog[elementDefinition.type]( dialog, childObjList, childHtmlList, output, elementDefinition ); + } + }; + + CKEDITOR.dialog.addUIElement( 'hbox', commonBuilder ); + CKEDITOR.dialog.addUIElement( 'vbox', commonBuilder ); + })(); /** - * The event processor list used by - * {@link CKEDITOR.ui.dialog.uiElement#getInputElement} at UI element - * instantiation. The default list defines three on* events: - *
    - *
  1. onLoad - Called when the element's parent dialog opens for the - * first time
    2. - *
  2. onShow - Called whenever the element's parent dialog opens.
    3. - *
  3. onHide - Called whenever the element's parent dialog closes.
    4. - *
- * @field - * @type Object + * Generic dialog command. It opens a specific dialog when executed. + * @constructor + * @augments CKEDITOR.commandDefinition + * @param {string} dialogName The name of the dialog to open when executing + * this command. * @example - * // This connects the 'click' event in CKEDITOR.ui.dialog.button to onClick - * // handlers in the UI element's definitions. - * CKEDITOR.ui.dialog.button.eventProcessors = CKEDITOR.tools.extend( {}, - *   CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors, - *   { onClick : function( dialog, func ) { this.on( 'click', func ); } }, - *   true ); + * // Register the "link" command, which opens the "link" dialog. + * editor.addCommand( 'link', new CKEDITOR.dialogCommand( 'link' ) ); */ - eventProcessors : - { - onLoad : function( dialog, func ) - { - dialog.on( 'load', func, this, null, CKEDITOR.tools.getNextNumber() ); - }, - - onShow : function( dialog, func ) - { - dialog.on( 'show', func, this, null, CKEDITOR.tools.getNextNumber() ); - }, - - onHide : function( dialog, func ) - { - dialog.on( 'hide', func, this, null, CKEDITOR.tools.getNextNumber() ); + CKEDITOR.dialogCommand = function( dialogName ) + { + this.dialogName = dialogName; + }; + + CKEDITOR.dialogCommand.prototype = + { + /** @ignore */ + exec : function( editor ) + { + editor.openDialog( this.dialogName ); } - }, - - /** - * The default handler for a UI element's access key down event, which - * tries to put focus to the UI element.
- * Can be overridded in child classes for more sophisticaed behavior. - * @param {CKEDITOR.dialog} dialog The parent dialog object. - * @param {String} key The key combination pressed. Since access keys - * are defined to always include the CTRL key, its value should always - * include a 'CTRL+' prefix. - * @example - */ - accessKeyDown : function( dialog, key ) - { - this.focus(); - }, - - /** - * The default handler for a UI element's access key up event, which - * does nothing.
- * Can be overridded in child classes for more sophisticated behavior. - * @param {CKEDITOR.dialog} dialog The parent dialog object. - * @param {String} key The key combination pressed. Since access keys - * are defined to always include the CTRL key, its value should always - * include a 'CTRL+' prefix. - * @example - */ - accessKeyUp : function( dialog, key ) - { - }, - - /** - * Disables a UI element. - * @example - */ - disable : function() - { - var element = this.getInputElement(); - element.setAttribute( 'disabled', 'true' ); - element.addClass( 'disabled' ); - }, - - /** - * Enables a UI element. - * @example - */ - enable : function() - { - var element = this.getInputElement(); - element.removeAttribute( 'disabled' ); - element.removeClass( 'disabled' ); - } -}; - -CKEDITOR.ui.dialog.hbox.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.uiElement, - /** - * @lends CKEDITOR.ui.dialog.hbox.prototype - */ - { - /** - * Gets a child UI element inside this container. - * @param {Array|Number} indices An array or a single number to indicate the child's - * position in the container's descendant tree. Omit to get all the children in an array. - * @returns {Array|CKEDITOR.ui.dialog.uiElement} Array of all UI elements in the container - * if no argument given, or the specified UI element if indices is given. - * @example - * var checkbox = hbox.getChild( [0,1] ); - * checkbox.setValue( true ); - */ - getChild : function( indices ) - { - // If no arguments, return a clone of the children array. - if ( arguments.length < 1 ) - return this._.children.concat(); - - // If indices isn't array, make it one. - if ( !indices.splice ) - indices = [ indices ]; - - // Retrieve the child element according to tree position. - if ( indices.length < 2 ) - return this._.children[ indices[0] ]; - else - return ( this._.children[ indices[0] ] && this._.children[ indices[0] ].getChild ) ? - this._.children[ indices[0] ].getChild( indices.slice( 1, indices.length ) ) : - null; - } - }, true ); - -CKEDITOR.ui.dialog.vbox.prototype = new CKEDITOR.ui.dialog.hbox(); - + }; + + (function() + { + var notEmptyRegex = /^([a]|[^a])+$/, + integerRegex = /^\d*$/, + numberRegex = /^\d*(?:\.\d+)?$/; + + CKEDITOR.VALIDATE_OR = 1; + CKEDITOR.VALIDATE_AND = 2; + + CKEDITOR.dialog.validate = + { + functions : function() + { + return function() + { + /** + * It's important for validate functions to be able to accept the value + * as argument in addition to this.getValue(), so that it is possible to + * combine validate functions together to make more sophisticated + * validators. + */ + var value = this && this.getValue ? this.getValue() : arguments[0]; + + var msg = undefined, + relation = CKEDITOR.VALIDATE_AND, + functions = [], i; + + for ( i = 0 ; i < arguments.length ; i++ ) + { + if ( typeof( arguments[i] ) == 'function' ) + functions.push( arguments[i] ); + else + break; + } + + if ( i < arguments.length && typeof( arguments[i] ) == 'string' ) + { + msg = arguments[i]; + i++; + } + + if ( i < arguments.length && typeof( arguments[i]) == 'number' ) + relation = arguments[i]; + + var passed = ( relation == CKEDITOR.VALIDATE_AND ? true : false ); + for ( i = 0 ; i < functions.length ; i++ ) + { + if ( relation == CKEDITOR.VALIDATE_AND ) + passed = passed && functions[i]( value ); + else + passed = passed || functions[i]( value ); + } + + if ( !passed ) + { + if ( msg !== undefined ) + alert( msg ); + if ( this && ( this.select || this.focus ) ) + ( this.select || this.focus )(); + return false; + } + + return true; + }; + }, + + regex : function( regex, msg ) + { + /* + * Can be greatly shortened by deriving from functions validator if code size + * turns out to be more important than performance. + */ + return function() + { + var value = this && this.getValue ? this.getValue() : arguments[0]; + if ( !regex.test( value ) ) + { + if ( msg !== undefined ) + alert( msg ); + if ( this && ( this.select || this.focus ) ) + { + if ( this.select ) + this.select(); + else + this.focus(); + } + return false; + } + return true; + } + }, + + notEmpty : function( msg ) + { + return this.regex( notEmptyRegex, msg ); + }, + + integer : function( msg ) + { + return this.regex( integerRegex, msg ); + }, + + 'number' : function( msg ) + { + return this.regex( numberRegex, msg ); + }, + + equals : function( value, msg ) + { + return this.functions( function( val ){ return val == value; }, msg ); + }, + + notEqual : function( value, msg ) + { + return this.functions( function( val ){ return val != value; }, msg ); + } + }; + })(); + +})(); + +// Extend the CKEDITOR.editor class with dialog specific functions. CKEDITOR.tools.extend( CKEDITOR.editor.prototype, /** @lends CKEDITOR.editor.prototype */ @@ -2123,15 +2356,17 @@ openDialog : function( dialogName ) { - var me = this; - + var dialogDefinitions = CKEDITOR.dialog._.dialogDefinitions[ dialogName ]; + // If the dialogDefinition is already loaded, open it immediately. - if ( typeof( CKEDITOR.dialog._.dialogDefinitions[dialogName] ) == 'function' ) - { - if ( !this._.storedDialogs ) - this._.storedDialogs = {}; - - var dialog = this._.storedDialogs[dialogName] || new CKEDITOR.dialog( this, dialogName ); - this._.storedDialogs[dialogName] = dialog; + if ( typeof dialogDefinitions == 'function' ) + { + var storedDialogs = this._.storedDialogs || + ( this._.storedDialogs = {} ); + + var dialog = storedDialogs[ dialogName ] || + ( storedDialogs[ dialogName ] = new CKEDITOR.dialog( this, dialogName ) ); + dialog.show(); + return dialog; } @@ -2139,7 +2374,9 @@ // Not loaded? Load the .js file first. var body = CKEDITOR.document.getBody(), - cursor = body.$.style.cursor; + cursor = body.$.style.cursor, + me = this; + body.setStyle( 'cursor', 'wait' ); - CKEDITOR.scriptLoader.load( CKEDITOR.getUrl( CKEDITOR.dialog._.dialogDefinitions[dialogName] ), function() + CKEDITOR.scriptLoader.load( CKEDITOR.getUrl( dialogDefinitions ), function() { me.openDialog( dialogName ); @@ -2149,170 +2386,5 @@ }); -(function() -{ - var commonBuilder = { - build : function( dialog, elementDefinition, output ) - { - var children = elementDefinition.children, - child, - childHtmlList = [], - childObjList = []; - for ( var i = 0 ; ( i < children.length && ( child = children[i] ) ) ; i++ ) - { - var childHtml = []; - childHtmlList.push( childHtml ); - childObjList.push( CKEDITOR.dialog._.uiElementBuilders[ child.type ].build( dialog, child, childHtml ) ); - } - return new CKEDITOR.ui.dialog[elementDefinition.type]( dialog, childObjList, childHtmlList, output, elementDefinition ); - } - }; - - CKEDITOR.dialog.addUIElement( 'hbox', commonBuilder ); - CKEDITOR.dialog.addUIElement( 'vbox', commonBuilder ); -})(); - -/** - * Generic dialog command. It opens a specific dialog when executed. - * @constructor - * @augments CKEDITOR.commandDefinition - * @param {string} dialogName The name of the dialog to open when executing - * this command. - * @example - * // Register the "link" command, which opens the "link" dialog. - * editor.addCommand( 'link', new CKEDITOR.dialogCommand( 'link' ) ); - */ -CKEDITOR.dialogCommand = function( dialogName ) -{ - this.dialogName = dialogName; -}; - -CKEDITOR.dialogCommand.prototype = -{ - /** @ignore */ - exec : function( editor ) - { - editor.openDialog( this.dialogName ); - } -}; - -(function() -{ - var notEmptyRegex = /^([a]|[^a])+$/, - integerRegex = /^\d*$/, - numberRegex = /^\d*(?:\.\d+)?$/; - - CKEDITOR.VALIDATE_OR = 1; - CKEDITOR.VALIDATE_AND = 2; - - CKEDITOR.dialog.validate = - { - functions : function() - { - return function() - { - /** - * It's important for validate functions to be able to accept the value - * as argument in addition to this.getValue(), so that it is possible to - * combine validate functions together to make more sophisticated - * validators. - */ - var value = this && this.getValue ? this.getValue() : arguments[0]; - - var msg = undefined, - relation = CKEDITOR.VALIDATE_AND, - functions = [], i; - - for ( i = 0 ; i < arguments.length ; i++ ) - { - if ( typeof( arguments[i] ) == 'function' ) - functions.push( arguments[i] ); - else - break; - } - - if ( i < arguments.length && typeof( arguments[i] ) == 'string' ) - { - msg = arguments[i]; - i++; - } - - if ( i < arguments.length && typeof( arguments[i]) == 'number' ) - relation = arguments[i]; - - var passed = ( relation == CKEDITOR.VALIDATE_AND ? true : false ); - for ( i = 0 ; i < functions.length ; i++ ) - { - if ( relation == CKEDITOR.VALIDATE_AND ) - passed = passed && functions[i]( value ); - else - passed = passed || functions[i]( value ); - } - - if ( !passed ) - { - if ( msg !== undefined ) - alert( msg ); - if ( this && ( this.select || this.focus ) ) - ( this.select || this.focus )(); - return false; - } - - return true; - }; - }, - - regex : function( regex, msg ) - { - /* - * Can be greatly shortened by deriving from functions validator if code size - * turns out to be more important than performance. - */ - return function() - { - var value = this && this.getValue ? this.getValue() : arguments[0]; - if ( !regex.test( value ) ) - { - if ( msg !== undefined ) - alert( msg ); - if ( this && ( this.select || this.focus ) ) - { - if ( this.select ) - this.select(); - else - this.focus(); - } - return false; - } - return true; - } - }, - - notEmpty : function( msg ) - { - return this.regex( notEmptyRegex, msg ); - }, - - integer : function( msg ) - { - return this.regex( integerRegex, msg ); - }, - - 'number' : function( msg ) - { - return this.regex( numberRegex, msg ); - }, - - equals : function( value, msg ) - { - return this.functions( function( val ){ return val == value; }, msg ); - }, - - notEqual : function( value, msg ) - { - return this.functions( function( val ){ return val != value; }, msg ); - } - }; -})(); - +// Dialog related configurations. CKEDITOR.config.dialog = { Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/checkbox.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/checkbox.js (revision 2989) +++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/checkbox.js (revision 2990) @@ -5,90 +5,43 @@ CKEDITOR.dialog.add( 'checkbox', function( editor ) { - var addChange = function( name, input ){ - var dialog = input.getDialog(); - if ( input.isChanged() || ( dialog.editMode == false && input.getValue() != '' )) - { - dialog.changedAttibutes[ name ] = input.getValue(); - return true; - } - return false; - }; - - // Function called in onShow to load selected element. - var loadSelection = function( editor, selection, ranges, element ) - { - this.saveSelection(); - this.editObj = element; - this.editMode = true; - - // Fill out all fields. - readAttribute.apply( this, [ this.editObj, 'info', 'name', 'txtName', true ] ); - readAttribute.apply( this, [ this.editObj, 'info', 'value', 'txtValue', true ] ); - readAttribute.apply( this, [ this.editObj, 'info', 'checked', 'cmbSelected', true ] ); - - return false; - }; - - var readAttribute = function( object, page, attribute, input, setIfNull ) - { - var attributeValue = object.getAttribute( attribute ); - if ( attributeValue == null ) - if ( setIfNull ) - this.setValueOf( page, input, "" ); - else - this.setValueOf( page, input, attributeValue ); - return attributeValue; - } - return { title : editor.lang.checkboxAndRadio.checkboxTitle, - resizable : CKEDITOR.DIALOG_RESIZE_NONE, minWidth : 400, minHeight : 230, onShow : function() { - // Default: create a new element. - this.editMode = false; - this.changedAttibutes = new Array(); - - // IE BUG: Selection must be in the editor for getSelection() to work. + // IE BUG: Selection must be in the editor for getSelectedElement() + // to work. this.restoreSelection(); - var editor = this.getParentEditor(), - selection = editor.getSelection(), - ranges = selection.getRanges(); + var element = this.getParentEditor().getSelection().getSelectedElement(); - // Check selection. Fill in all the relevant fields if there's already one link selected. - if ( ranges.length == 1 ) + if ( element && element.getAttribute( 'type' ) == "checkbox" ) { - ranges[0].enlarge( CKEDITOR.ENLARGE_ELEMENT ); - - var rangeRoot = ranges[0].getCommonAncestor( true ); - var element = rangeRoot.getAscendant( 'input', true ); - if ( element && element.getAttribute( 'type' ) == "checkbox" ) - { - loadSelection.apply( this, [ editor, selection, ranges, element ] ); - selection.selectElement( element ); - } + this._element = element; + this.setupContent( element ); } - - if ( this.editMode == false ) //New object. - this.editObj = editor.document.createElement( 'input' ); - - this.getContentElement( 'info', 'txtName' ).focus(); }, onOk : function() { - this.changedAttibutes[ 'type' ] = 'checkbox'; + var editor, + element = this._element, + isInsertMode = !element; + + if ( isInsertMode ) + { + editor = this.getParentEditor(); + element = editor.document.createElement( 'input' ); + element.setAttribute( 'type', 'checkbox' ); + } - this.editObj.setAttributes( this.changedAttibutes ); + this.commitContent( element ); - if ( this.editMode == false ) + if ( isInsertMode ) { this.restoreSelection(); this.clearSavedSelection(); - editor.insertElement( this.editObj ); + editor.insertElement( element ); } - return true; }, contents : [ @@ -98,4 +51,5 @@ title : editor.lang.checkboxAndRadio.checkboxTitle, accessKey : 'I', + startupFocus : 'txtName', elements : [ { @@ -105,8 +59,11 @@ 'default' : '', accessKey : 'N', - validate: function() + setup : function( element ) { - addChange( 'name', this ); - return true; + this.setValue( element.getAttribute( 'name' ) ); + }, + commit : function( element ) + { + element.setAttribute( 'name', this.getValue() ); } }, @@ -117,8 +74,11 @@ 'default' : '', accessKey : 'V', - validate: function() + setup : function( element ) { - addChange( 'value', this ); - return true; + this.setValue( element.getAttribute( 'value' ) ); + }, + commit : function( element ) + { + element.setAttribute( 'value', this.getValue() ); } }, @@ -130,8 +90,11 @@ accessKey : 'S', value : "checked", - validate: function() + setup : function( element ) { - addChange( 'checked', this ); - return true; + this.setValue( element.getAttribute( 'checked' ) ); + }, + commit : function( element ) + { + element.setAttribute( 'checked', this.getValue() ); } } Index: /CKEditor/branches/prototype/_source/themes/default/theme.js =================================================================== --- /CKEditor/branches/prototype/_source/themes/default/theme.js (revision 2989) +++ /CKEditor/branches/prototype/_source/themes/default/theme.js (revision 2990) @@ -64,5 +64,5 @@ '' , bottomHtml , '' + '' + - '' ].join('') ); + '' ].join( '' ) ); container.getChild( [0, 0, 0] ).unselectable(); @@ -90,60 +90,71 @@ buildDialog : function( editor ) { - var container = CKEDITOR.dom.element.createFromHtml( [ + var baseIdNumber = CKEDITOR.tools.getNextNumber(); + + var element = CKEDITOR.dom.element.createFromHtml( [ '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '', - '', - '', - '
  
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
' + ' cke_', editor.lang.dir, + '" dir="', editor.lang.dir, '">' + + '
', + '
'+ + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '' + + '' + + '' + + '
  
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' + + '
' ].join( '' ) - .replace( /#/g, CKEDITOR.tools.getNextNumber() ) + .replace( /#/g, baseIdNumber ) .replace( /%/g, 'cke_dialog_' ) ); - container.getChild( [0, 1, 1, 0] ).unselectable(); + // Make the Title unselectable. + element.getChild( [0, 1, 1, 0] ).unselectable(); - return container; + return { + element : element, + titleId : 'cke_dialog_title_' + baseIdNumber, + contentsId : 'cke_dialog_contents_' + baseIdNumber, + footerId : 'cke_dialog_footer_' + baseIdNumber, + closeIds : [ 'cke_dialog_close_button_' + baseIdNumber ], + dragIds : [ 'cke_dialog_title_' + baseIdNumber, 'cke_dialog_tabs_' + baseIdNumber ] + }; },