X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fsourcearea%2Fplugin.js;h=91430fe4724a8017c7d73a0482aa04a948e098c6;hb=fb481ba0a7d298e3e7b9034fcb9f2afdc6e8e796;hp=a7331b65e3748ced8aaeef26f15288a063f23a3c;hpb=c6e377a02b54abc07129d72b632763c727476a15;p=ckeditor.git

diff --git a/_source/plugins/sourcearea/plugin.js b/_source/plugins/sourcearea/plugin.js
index a7331b6..91430fe 100644
--- a/_source/plugins/sourcearea/plugin.js
+++ b/_source/plugins/sourcearea/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, 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
 */
 
@@ -34,11 +34,15 @@ CKEDITOR.plugins.add( 'sourcearea',
 							textarea.setAttributes(
 								{
 									dir : 'ltr',
-									tabIndex : -1
+									tabIndex : CKEDITOR.env.webkit ? -1 : editor.tabIndex,
+									'role' : 'textbox',
+									'aria-label' : editor.lang.editorTitle.replace( '%1', editor.name )
 								});
 							textarea.addClass( 'cke_source' );
 							textarea.addClass( 'cke_enable_context_menu' );
 
+							editor.readOnly && textarea.setAttribute( 'readOnly', 'readonly' );
+
 							var styles =
 							{
 								// IE7 has overflow the <textarea> from wrapping table cell.
@@ -70,17 +74,6 @@ CKEDITOR.plugins.add( 'sourcearea',
 								win.on( 'resize', onResize );
 								setTimeout( onResize, 0 );
 							}
-							else
-							{
-								// By some yet unknown reason, we must stop the
-								// mousedown propagation for the textarea,
-								// otherwise it's not possible to place the caret
-								// inside of it (non IE).
-								textarea.on( 'mousedown', function( evt )
-									{
-										evt.data.stopPropagation();
-									} );
-							}
 
 							// Reset the holder element and append the
 							// <textarea> to it.
@@ -88,6 +81,8 @@ CKEDITOR.plugins.add( 'sourcearea',
 							holderElement.append( textarea );
 							textarea.setStyles( styles );
 
+							editor.fire( 'ariaWidget', textarea );
+
 							textarea.on( 'blur', function()
 								{
 									editor.focusManager.blur();
@@ -111,7 +106,7 @@ CKEDITOR.plugins.add( 'sourcearea',
 							setTimeout( function()
 							{
 								editor.mode = 'source';
-								editor.fire( 'mode' );
+								editor.fire( 'mode', { previousMode : editor._.previousMode } );
 							},
 							( CKEDITOR.env.gecko || CKEDITOR.env.webkit ) ? 100 : 0 );
 						},
@@ -134,6 +129,7 @@ CKEDITOR.plugins.add( 'sourcearea',
 
 						unload : function( holderElement )
 						{
+							textarea.clearCustomData();
 							editor.textarea = textarea = null;
 
 							if ( onResize )
@@ -153,6 +149,17 @@ CKEDITOR.plugins.add( 'sourcearea',
 					});
 			});
 
+		editor.on( 'readOnly', function()
+			{
+				if ( editor.mode == 'source' )
+				{
+					if ( editor.readOnly )
+						editor.textarea.setAttribute( 'readOnly', 'readonly' );
+					else
+						editor.textarea.removeAttribute( 'readOnly' );
+				}
+			});
+
 		editor.addCommand( 'source', sourcearea.commands.source );
 
 		if ( editor.ui.addButton )
@@ -186,7 +193,8 @@ CKEDITOR.plugins.sourcearea =
 		source :
 		{
 			modes : { wysiwyg:1, source:1 },
-
+			editorFocus : false,
+			readOnly : 1,
 			exec : function( editor )
 			{
 				if ( editor.mode == 'wysiwyg' )