Index: CKEditor/branches/features/adobeair/_source/core/ui.js
===================================================================
--- CKEditor/branches/features/adobeair/_source/core/ui.js	(revision 6132)
+++ CKEditor/branches/features/adobeair/_source/core/ui.js	(revision 6147)
@@ -92,4 +92,6 @@
 };
 
+CKEDITOR.event.implementOn( CKEDITOR.ui );
+
 /**
  * (Virtual Class) Do not call this constructor. This class is not really part
Index: CKEditor/branches/features/adobeair/_source/plugins/adobeair/plugin.js
===================================================================
--- CKEditor/branches/features/adobeair/_source/plugins/adobeair/plugin.js	(revision 6132)
+++ CKEditor/branches/features/adobeair/_source/plugins/adobeair/plugin.js	(revision 6147)
@@ -115,36 +115,29 @@
 		afterLoad : function()
 		{
-			var richCombo = CKEDITOR.ui.richCombo,
-				panelButton = CKEDITOR.ui.panelButton,
-				menu = CKEDITOR.menu,
-				dialog = CKEDITOR.dialog;
+			CKEDITOR.ui.on( 'ready', function( evt )
+			{
+				var ui = evt.data;
+				// richcombo, panelbutton and menu
+				if ( ui._.panel )
+				{
+					var panel = ui._.panel._.panel,
+							holder;
 
-			function onPanelUIReady( evt )
-			{
-				var floatPanel = evt.data._.panel,
-					panel = floatPanel._.panel,
-					holder;
-
-				( function(){
-
-					// Adding dom event listeners off-line are not supported in AIR,
-					// waiting for panel iframe loaded.
-					if ( !panel.isLoaded )
+					( function()
 					{
-						setTimeout( arguments.callee, 30 );
-						return;
-					}
-					holder = panel._.holder;
-					convertInlineHandlers( holder );
-				})();
-			}
-
-			richCombo && richCombo.on( 'uiReady', onPanelUIReady );
-			panelButton && panelButton.on( 'uiReady', onPanelUIReady );
-			menu && menu.on( 'uiReady', onPanelUIReady );
-			dialog && dialog.on( 'uiReady', function ( evt )
-				{
-					convertInlineHandlers( evt.data._.element );
-				});
+						// Adding dom event listeners off-line are not supported in AIR,
+						// waiting for panel iframe loaded.
+						if ( !panel.isLoaded )
+						{
+							setTimeout( arguments.callee, 30 );
+							return;
+						}
+						holder = panel._.holder;
+						convertInlineHandlers( holder );
+					})();
+				}
+				else if ( ui instanceof CKEDITOR.dialog )
+					convertInlineHandlers( ui._.element );
+			});
 		}
 	});
Index: CKEditor/branches/features/adobeair/_source/plugins/colorbutton/plugin.js
===================================================================
--- CKEditor/branches/features/adobeair/_source/plugins/colorbutton/plugin.js	(revision 6132)
+++ CKEditor/branches/features/adobeair/_source/plugins/colorbutton/plugin.js	(revision 6147)
@@ -44,5 +44,5 @@
 						block.element.getDocument().getBody().setStyle( 'overflow', 'hidden' );
 
-						CKEDITOR.ui.panelButton.fire( 'uiReady', this );
+						CKEDITOR.ui.fire( 'ready', this );
 
 						var keys = block.keys;
Index: CKEditor/branches/features/adobeair/_source/plugins/menu/plugin.js
===================================================================
--- CKEditor/branches/features/adobeair/_source/plugins/menu/plugin.js	(revision 6132)
+++ CKEditor/branches/features/adobeair/_source/plugins/menu/plugin.js	(revision 6147)
@@ -248,5 +248,5 @@
 				element.setHtml( output.join( '' ) );
 
-				CKEDITOR.menu.fire( 'uiReady', this );
+				CKEDITOR.ui.fire( 'ready', this );
 
 				// Show the panel.
Index: CKEditor/branches/features/adobeair/_source/plugins/richcombo/plugin.js
===================================================================
--- CKEditor/branches/features/adobeair/_source/plugins/richcombo/plugin.js	(revision 6132)
+++ CKEditor/branches/features/adobeair/_source/plugins/richcombo/plugin.js	(revision 6147)
@@ -349,5 +349,5 @@
 				this._.list.commit();
 				this._.committed = 1;
-				CKEDITOR.ui.richCombo.fire( 'uiReady', this );
+				CKEDITOR.ui.fire( 'ready', this );
 			}
 		},