Index: /CKEditor/branches/features/adobeair/_source/plugins/button/plugin.js
===================================================================
--- /CKEditor/branches/features/adobeair/_source/plugins/button/plugin.js	(revision 5617)
+++ /CKEditor/branches/features/adobeair/_source/plugins/button/plugin.js	(revision 5618)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -53,170 +53,4 @@
 	{
 		return new CKEDITOR.ui.button( definition );
-	}
-};
-
-CKEDITOR.ui.button.prototype =
-{
-	canGroup : true,
-
-	/**
-	 * Renders the button.
-	 * @param {CKEDITOR.editor} editor The editor instance which this button is
-	 *		to be used by.
-	 * @param {Array} output The output array to which append the HTML relative
-	 *		to this button.
-	 * @example
-	 */
-	render : function( editor, output )
-	{
-		var env = CKEDITOR.env,
-			id = this._.id = 'cke_' + CKEDITOR.tools.getNextNumber(),
-			classes = '',
-			command = this.command, // Get the command name.
-			clickFn,
-			index;
-
-		this._.editor = editor;
-
-		var instance =
-		{
-			id : id,
-			button : this,
-			editor : editor,
-			focus : function()
-			{
-				var element = CKEDITOR.document.getById( id );
-				element.focus();
-			},
-			execute : function()
-			{
-				this.button.click( editor );
-			}
-		};
-
-		instance.clickFn = clickFn = CKEDITOR.tools.addFunction( instance.execute, instance );
-
-		instance.index = index = CKEDITOR.ui.button._.instances.push( instance ) - 1;
-
-		if ( this.modes )
-		{
-			editor.on( 'mode', function()
-				{
-					this.setState( this.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );
-				}, this);
-		}
-		else if ( command )
-		{
-			// Get the command instance.
-			command = editor.getCommand( command );
-
-			if ( command )
-			{
-				command.on( 'state', function()
-					{
-						this.setState( command.state );
-					}, this);
-
-				classes += 'cke_' + (
-					command.state == CKEDITOR.TRISTATE_ON ? 'on' :
-					command.state == CKEDITOR.TRISTATE_DISABLED ? 'disabled' :
-					'off' );
-			}
-		}
-
-		if ( !command )
-			classes	+= 'cke_off';
-
-		if ( this.className )
-			classes += ' ' + this.className;
-
-		output.push(
-			'<span class="cke_button">',
-			'<a id="', id, '"' +
-				' class="', classes, '"',
-				env.gecko && env.version >= 10900 && !env.hc  ? '' : '" href="javascript:void(\''+ ( this.title || '' ).replace( "'"+ '' )+ '\')"',
-				' title="', this.title, '"' +
-				' tabindex="-1"' +
-				' hidefocus="true"' +
-			    ' role="button"' +
-				' aria-labelledby="' + id + '_label"' +
-				( this.hasArrow ?  ' aria-haspopup="true"' : '' ) );
-
-		// Some browsers don't cancel key events in the keydown but in the
-		// keypress.
-		// TODO: Check if really needed for Gecko+Mac.
-		if ( env.opera || ( env.gecko && env.mac ) )
-		{
-			output.push(
-				' onkeypress="return false;"' );
-		}
-
-		// With Firefox, we need to force the button to redraw, otherwise it
-		// will remain in the focus state.
-		if ( env.gecko )
-		{
-			output.push(
-				' onblur="this.style.cssText = this.style.cssText;"' );
-		}
-
-		output.push(
-				' onkeydown="return CKEDITOR.ui.button._.keydown(', index, ', event);"' +
-				' onfocus="return CKEDITOR.ui.button._.focus(', index, ', event);"' +
-				' onclick="CKEDITOR.tools.callFunction(', clickFn, ', this); return false;">' +
-					'<span class="cke_icon"' );
-
-		if ( this.icon )
-		{
-			var offset = ( this.iconOffset || 0 ) * -16;
-			output.push( ' style="background-image:url(', CKEDITOR.getUrl( this.icon ), ');background-position:0 ' + offset + 'px;"' );
-		}
-
-		output.push(
-					'>&nbsp;</span>' +
-					'<span id="', id, '_label" class="cke_label">', this.label, '</span>' );
-
-		if ( this.hasArrow )
-		{
-			output.push(
-					'<span class="cke_buttonarrow">'
-					// BLACK DOWN-POINTING TRIANGLE
-					+ ( CKEDITOR.env.hc ? '&#9660;' : '&nbsp;' )
-					+ '</span>' );
-		}
-
-		output.push(
-			'</a>',
-			'</span>' );
-
-		if ( this.onRender )
-			this.onRender();
-
-		return instance;
-	},
-
-	setState : function( state )
-	{
-		if ( this._.state == state )
-			return false;
-
-		this._.state = state;
-
-		var element = CKEDITOR.document.getById( this._.id );
-
-		if ( element )
-		{
-			element.setState( state );
-			state == CKEDITOR.TRISTATE_DISABLED ?
-				element.setAttribute( 'aria-disabled', true ) :
-				element.removeAttribute( 'aria-disabled' );
-
-			state == CKEDITOR.TRISTATE_ON ?
-				element.setAttribute( 'aria-pressed', true ) :
-				element.removeAttribute( 'aria-pressed' );
-
-			return true;
-		}
-		else
-			return false;
 	}
 };
@@ -256,4 +90,177 @@
 };
 
+( function()
+{
+	var keydownFn = CKEDITOR.tools.addFunction( CKEDITOR.ui.button._.keydown, CKEDITOR.ui.button._ ),
+		focusFn = CKEDITOR.tools.addFunction( CKEDITOR.ui.button._.focus, CKEDITOR.ui.button._ );
+
+	CKEDITOR.ui.button.prototype =
+	{
+		canGroup : true,
+
+		/**
+		 * Renders the button.
+		 * @param {CKEDITOR.editor} editor The editor instance which this button is
+		 *		to be used by.
+		 * @param {Array} output The output array to which append the HTML relative
+		 *		to this button.
+		 * @example
+		 */
+		render : function( editor, output )
+		{
+			var env = CKEDITOR.env,
+				id = this._.id = 'cke_' + CKEDITOR.tools.getNextNumber(),
+				classes = '',
+				command = this.command, // Get the command name.
+				clickFn,
+				index;
+
+			this._.editor = editor;
+
+			var instance =
+			{
+				id : id,
+				button : this,
+				editor : editor,
+				focus : function()
+				{
+					var element = CKEDITOR.document.getById( id );
+					element.focus();
+				},
+				execute : function()
+				{
+					this.button.click( editor );
+				}
+			};
+
+			instance.clickFn = clickFn = CKEDITOR.tools.addFunction( instance.execute, instance );
+
+			instance.index = index = CKEDITOR.ui.button._.instances.push( instance ) - 1;
+
+			if ( this.modes )
+			{
+				editor.on( 'mode', function()
+					{
+						this.setState( this.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );
+					}, this);
+			}
+			else if ( command )
+			{
+				// Get the command instance.
+				command = editor.getCommand( command );
+
+				if ( command )
+				{
+					command.on( 'state', function()
+						{
+							this.setState( command.state );
+						}, this);
+
+					classes += 'cke_' + (
+						command.state == CKEDITOR.TRISTATE_ON ? 'on' :
+						command.state == CKEDITOR.TRISTATE_DISABLED ? 'disabled' :
+						'off' );
+				}
+			}
+
+			if ( !command )
+				classes	+= 'cke_off';
+
+			if ( this.className )
+				classes += ' ' + this.className;
+
+			output.push(
+				'<span class="cke_button">',
+				'<a id="', id, '"' +
+					' class="', classes, '"',
+					env.gecko && env.version >= 10900 && !env.hc  ? '' : '" href="javascript:void(\''+ ( this.title || '' ).replace( "'"+ '' )+ '\')"',
+					' title="', this.title, '"' +
+					' tabindex="-1"' +
+					' hidefocus="true"' +
+					' role="button"' +
+					' aria-labelledby="' + id + '_label"' +
+					( this.hasArrow ?  ' aria-haspopup="true"' : '' ) );
+
+			// Some browsers don't cancel key events in the keydown but in the
+			// keypress.
+			// TODO: Check if really needed for Gecko+Mac.
+			if ( env.opera || ( env.gecko && env.mac ) )
+			{
+				output.push(
+					' onkeypress="return false;"' );
+			}
+
+			// With Firefox, we need to force the button to redraw, otherwise it
+			// will remain in the focus state.
+			if ( env.gecko )
+			{
+				output.push(
+					' onblur="this.style.cssText = this.style.cssText;"' );
+			}
+
+			output.push(
+					' onkeydown="return CKEDITOR.tools.callFunction(', keydownFn, ', ', index, ', event);"' +
+					' onfocus="return CKEDITOR.tools.callFunction(', focusFn,', ', index, ', event);"' +
+					' onclick="CKEDITOR.tools.callFunction(', clickFn, ', this); return false;">' +
+						'<span class="cke_icon"' );
+
+			if ( this.icon )
+			{
+				var offset = ( this.iconOffset || 0 ) * -16;
+				output.push( ' style="background-image:url(', CKEDITOR.getUrl( this.icon ), ');background-position:0 ' + offset + 'px;"' );
+			}
+
+			output.push(
+						'>&nbsp;</span>' +
+						'<span id="', id, '_label" class="cke_label">', this.label, '</span>' );
+
+			if ( this.hasArrow )
+			{
+				output.push(
+						'<span class="cke_buttonarrow">'
+						// BLACK DOWN-POINTING TRIANGLE
+						+ ( CKEDITOR.env.hc ? '&#9660;' : '&nbsp;' )
+						+ '</span>' );
+			}
+
+			output.push(
+				'</a>',
+				'</span>' );
+
+			if ( this.onRender )
+				this.onRender();
+
+			return instance;
+		},
+
+		setState : function( state )
+		{
+			if ( this._.state == state )
+				return false;
+
+			this._.state = state;
+
+			var element = CKEDITOR.document.getById( this._.id );
+
+			if ( element )
+			{
+				element.setState( state );
+				state == CKEDITOR.TRISTATE_DISABLED ?
+					element.setAttribute( 'aria-disabled', true ) :
+					element.removeAttribute( 'aria-disabled' );
+
+				state == CKEDITOR.TRISTATE_ON ?
+					element.setAttribute( 'aria-pressed', true ) :
+					element.removeAttribute( 'aria-pressed' );
+
+				return true;
+			}
+			else
+				return false;
+		}
+	};
+
+} )();
+
 /**
  * Adds a button definition to the UI elements list.