X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fdialog%2Fplugin.js;h=eee4916bd47f96b2eac1b1a9be4680956a8653a7;hb=refs%2Ftags%2Fv3.6.3;hp=13ee0efc588c4c65befbc4702895ca6ae7dea745;hpb=e73319a12b56100b29ef456fd74114fe5519e01c;p=ckeditor.git

diff --git a/_source/plugins/dialog/plugin.js b/_source/plugins/dialog/plugin.js
index 13ee0ef..eee4916 100644
--- a/_source/plugins/dialog/plugin.js
+++ b/_source/plugins/dialog/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -138,7 +138,10 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 		var definition = CKEDITOR.dialog._.dialogDefinitions[ dialogName ],
 			defaultDefinition = CKEDITOR.tools.clone( defaultDialogDefinition ),
 			buttonsOrder = editor.config.dialog_buttonsOrder || 'OS',
-			dir = editor.lang.dir;
+			dir = editor.lang.dir,
+			tabsToRemove = {},
+			i,
+			processed;
 
 			if ( ( buttonsOrder == 'OS' && CKEDITOR.env.mac ) ||    // The buttons in MacOS Apps are in reverse order (#4750)
 				( buttonsOrder == 'rtl' && dir == 'ltr' ) ||
@@ -219,7 +222,6 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 			}
 			, editor ).definition;
 
-		var tabsToRemove = {};
 		// Cache tabs that should be removed.
 		if ( !( 'removeDialogTabs' in editor._ ) && editor.config.removeDialogTabs )
 		{
@@ -358,10 +360,11 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 				focusList[ i ].focusIndex = i;
 		}
 
-		function changeFocus( forward )
+		function changeFocus( offset )
 		{
-			var focusList = me._.focusList,
-				offset = forward ? 1 : -1;
+			var focusList = me._.focusList;
+			offset = offset || 0;
+
 			if ( focusList.length < 1 )
 				return;
 
@@ -377,12 +380,13 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 
 			var startIndex = ( current + offset + focusList.length ) % focusList.length,
 				currentIndex = startIndex;
-			while ( !focusList[ currentIndex ].isFocusable() )
+			while ( offset && !focusList[ currentIndex ].isFocusable() )
 			{
 				currentIndex = ( currentIndex + offset + focusList.length ) % focusList.length;
 				if ( currentIndex == startIndex )
 					break;
 			}
+
 			focusList[ currentIndex ].focus();
 
 			// Select whole field content.
@@ -392,7 +396,6 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 
 		this.changeFocus = changeFocus;
 
-		var processed;
 
 		function focusKeydownHandler( evt )
 		{
@@ -419,7 +422,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 				else
 				{
 					// Change the focus of inputs.
-					changeFocus( !shiftPressed );
+					changeFocus( shiftPressed ? -1 : 1 );
 				}
 
 				processed = 1;
@@ -444,7 +447,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 				this.selectPage( this._.currentTabId );
 				this._.tabBarMode = false;
 				this._.currentFocusIndex = -1;
-				changeFocus( true );
+				changeFocus( 1 );
 				processed = 1;
 			}
 
@@ -512,7 +515,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 					}
 					// Focus the first field in layout order.
 					else
-						changeFocus( true );
+						changeFocus( 1 );
 
 					/*
 					 * IE BUG: If the initial focus went into a non-text element (e.g. button),
@@ -558,7 +561,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 		( new CKEDITOR.dom.text( definition.title, CKEDITOR.document ) ).appendTo( this.parts.title );
 
 		// Insert the tabs and contents.
-		for ( var i = 0 ; i < definition.contents.length ; i++ )
+		for ( i = 0 ; i < definition.contents.length ; i++ )
 		{
 			var page = definition.contents[i];
 			page && this.addPage( page );
@@ -578,7 +581,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 						{
 							this._.tabBarMode = false;
 							this._.currentFocusIndex = -1;
-							changeFocus( true );
+							changeFocus( 1 );
 						}
 						evt.data.preventDefault();
 					}
@@ -794,19 +797,12 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 			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;
 				showCover( this._.editor );
 
-				element.on( 'keydown', accessKeyDownHandler );
-				element.on( CKEDITOR.env.opera ? 'keypress' : 'keyup', accessKeyUpHandler );
-
-				// Prevent some keys from bubbling up. (#4269)
-				for ( var event in { keyup :1, keydown :1, keypress :1 } )
-					element.on( event, preventKeyBubbling );
 			}
 			else
 			{
@@ -816,10 +812,25 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 				CKEDITOR.dialog._.currentTop = this;
 			}
 
+			element.on( 'keydown', accessKeyDownHandler );
+			element.on( CKEDITOR.env.opera ? 'keypress' : 'keyup', accessKeyUpHandler );
+
+			// Prevent some keys from bubbling up. (#4269)
+			for ( var event in { keyup :1, keydown :1, keypress :1 } )
+				element.on( event, preventKeyBubbling );
+
 			// Register the Esc hotkeys.
 			registerAccessKey( this, this, '\x1b', null, function()
 					{
-						this.getButton( 'cancel' ) && this.getButton( 'cancel' ).click();
+						var button = this.getButton( 'cancel' );
+						// If there's a Cancel button, click it, else just fire the cancel event and hide the dialog
+						if ( button )
+							button.click();
+						else
+						{
+							if ( this.fire( 'cancel', { hide : true } ).hide !== false )
+								this.hide();
+						}
 					} );
 
 			// Reset the hasFocus state.
@@ -2935,7 +2946,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 		{
 			// Special treatment for Opera. (#8031)
 			CKEDITOR.env.opera ?
-				CKEDITOR.tools.setTimeout( function() { editor.openDialog( this.dialogName ) }, 0, this )
+				CKEDITOR.tools.setTimeout( function() { editor.openDialog( this.dialogName ); }, 0, this )
 				: editor.openDialog( this.dialogName );
 		},