Index: /CKEditor/branches/features/adobeair/_source/core/plugins.js
===================================================================
--- /CKEditor/branches/features/adobeair/_source/core/plugins.js	(revision 6154)
+++ /CKEditor/branches/features/adobeair/_source/core/plugins.js	(revision 6155)
@@ -53,16 +53,12 @@
 						else
 						{
-							var methods = [ 'beforeLoad', 'onLoad', 'afterLoad' ];
-							for ( i = 0; i < methods.length; i++ )
+							// Call the "onLoad" function for all plugins.
+							for ( pluginName in allPlugins )
 							{
-								// Call the events for all plugins.
-								for ( pluginName in allPlugins )
+								plugin = allPlugins[ pluginName ];
+								if ( plugin.onLoad && !plugin.onLoad._called )
 								{
-									plugin = allPlugins[ pluginName ];
-									if ( plugin[ methods[ i ] ] && !plugin[ methods[ i ] ]._called )
-									{
-										plugin[ methods[ i ] ]();
-										plugin[ methods[ i ] ]._called = 1;
-									}
+									plugin.onLoad();
+									plugin.onLoad._called = 1;
 								}
 							}
Index: /CKEditor/branches/features/adobeair/_source/plugins/adobeair/plugin.js
===================================================================
--- /CKEditor/branches/features/adobeair/_source/plugins/adobeair/plugin.js	(revision 6154)
+++ /CKEditor/branches/features/adobeair/_source/plugins/adobeair/plugin.js	(revision 6155)
@@ -28,5 +28,4 @@
 					(function( eventName )
 					{
-
 						if ( node.hasAttribute( 'on' + eventName ) )
 						{
@@ -121,35 +120,32 @@
 						});
 				});
-		},
-
-		afterLoad : function()
-		{
-			CKEDITOR.ui.on( 'ready', function( evt )
-			{
-				var ui = evt.data;
-				// richcombo, panelbutton and menu
-				if ( ui._.panel )
-				{
-					var panel = ui._.panel._.panel,
-							holder;
-
-					( function()
-					{
-						// 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 );
-			});
 		}
 	});
+
+	CKEDITOR.ui.on( 'ready', function( evt )
+		{
+			var ui = evt.data;
+			// richcombo, panelbutton and menu
+			if ( ui._.panel )
+			{
+				var panel = ui._.panel._.panel,
+						holder;
+
+				( function()
+				{
+					// 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 );
+		});
 })();