X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fsourcearea%2Fplugin.js;h=92ddce3d41a6b3b0f8275f25a41bc76f88ddb2be;hb=059b4c2fef02528bf1af189f7996e80652faddfb;hp=54f9d540258ec22fb8a1e35f653a4be5fff21951;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91;p=ckeditor.git

diff --git a/_source/plugins/sourcearea/plugin.js b/_source/plugins/sourcearea/plugin.js
index 54f9d54..92ddce3 100644
--- a/_source/plugins/sourcearea/plugin.js
+++ b/_source/plugins/sourcearea/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -14,7 +14,8 @@ CKEDITOR.plugins.add( 'sourcearea',
 
 	init : function( editor )
 	{
-		var sourcearea = CKEDITOR.plugins.sourcearea;
+		var sourcearea = CKEDITOR.plugins.sourcearea,
+			win = CKEDITOR.document.getWindow();
 
 		editor.on( 'editingBlockReady', function()
 			{
@@ -33,9 +34,12 @@ CKEDITOR.plugins.add( 'sourcearea',
 							textarea.setAttributes(
 								{
 									dir : 'ltr',
-									tabIndex : -1
+									tabIndex : editor.tabIndex,
+									'role' : 'textbox',
+									'aria-label' : editor.lang.editorTitle.replace( '%1', editor.name )
 								});
 							textarea.addClass( 'cke_source' );
+							textarea.addClass( 'cke_enable_context_menu' );
 
 							var styles =
 							{
@@ -47,24 +51,26 @@ CKEDITOR.plugins.add( 'sourcearea',
 								'text-align' : 'left'
 							};
 
-							// The textarea height/width='100%' doesn't
-							// constraint to the 'td' in IE strick mode
+							// Having to make <textarea> fixed sized to conque the following bugs:
+							// 1. The textarea height/width='100%' doesn't constraint to the 'td' in IE6/7.
+							// 2. Unexpected vertical-scrolling behavior happens whenever focus is moving out of editor
+							// if text content within it has overflowed. (#4762)
 							if ( CKEDITOR.env.ie )
 							{
-								if ( !CKEDITOR.env.ie8Compat )
+								onResize = function()
 								{
-									onResize = function()
-										{
-											// Holder rectange size is stretched by textarea,
-											// so hide it just for a moment.
-											textarea.hide();
-											textarea.setStyle( 'height', holderElement.$.clientHeight + 'px' );
-											// When we have proper holder size, show textarea again.
-											textarea.show();
-										};
-									editor.on( 'resize', onResize );
-									styles.height = holderElement.$.clientHeight + 'px';
-								}
+									// Holder rectange size is stretched by textarea,
+									// so hide it just for a moment.
+									textarea.hide();
+									textarea.setStyle( 'height', holderElement.$.clientHeight + 'px' );
+									textarea.setStyle( 'width', holderElement.$.clientWidth + 'px' );
+									// When we have proper holder size, show textarea again.
+									textarea.show();
+								};
+
+								editor.on( 'resize', onResize );
+								win.on( 'resize', onResize );
+								setTimeout( onResize, 0 );
 							}
 							else
 							{
@@ -74,9 +80,7 @@ CKEDITOR.plugins.add( 'sourcearea',
 								// inside of it (non IE).
 								textarea.on( 'mousedown', function( evt )
 									{
-										evt = evt.data.$;
-										if ( evt.stopPropagation )
-											evt.stopPropagation();
+										evt.data.stopPropagation();
 									} );
 							}
 
@@ -86,6 +90,18 @@ CKEDITOR.plugins.add( 'sourcearea',
 							holderElement.append( textarea );
 							textarea.setStyles( styles );
 
+							editor.fire( 'ariaWidget', textarea );
+
+							textarea.on( 'blur', function()
+								{
+									editor.focusManager.blur();
+								});
+
+							textarea.on( 'focus', function()
+								{
+									editor.focusManager.focus();
+								});
+
 							// The editor data "may be dirty" after this point.
 							editor.mayBeDirty = true;
 
@@ -107,6 +123,7 @@ CKEDITOR.plugins.add( 'sourcearea',
 						loadData : function( data )
 						{
 							textarea.setValue( data );
+							editor.fire( 'dataReady' );
 						},
 
 						getData : function()
@@ -124,7 +141,10 @@ CKEDITOR.plugins.add( 'sourcearea',
 							editor.textarea = textarea = null;
 
 							if ( onResize )
+							{
 								editor.removeListener( 'resize', onResize );
+								win.removeListener( 'resize', onResize );
+							}
 
 							if ( CKEDITOR.env.ie && CKEDITOR.env.version < 8 )
 								holderElement.removeStyle( 'position' );