Index: /CKEditor/branches/features/adobeair/_samples/replacebycode.html
===================================================================
--- /CKEditor/branches/features/adobeair/_samples/replacebycode.html	(revision 5621)
+++ /CKEditor/branches/features/adobeair/_samples/replacebycode.html	(revision 5622)
@@ -52,5 +52,5 @@
 			<label for="editor2">
 				Editor 2:</label><br />
-			<textarea cols="80" id="editor2" name="editor2" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+			<textarea cols="80" id="editor2" name="editor2" rows="10">second</textarea>
 			<script type="text/javascript">
 			//<![CDATA[
Index: /CKEditor/branches/features/adobeair/_source/plugins/adobeair/assets/air_boostrap_frame.html
===================================================================
--- /CKEditor/branches/features/adobeair/_source/plugins/adobeair/assets/air_boostrap_frame.html	(revision 5622)
+++ /CKEditor/branches/features/adobeair/_source/plugins/adobeair/assets/air_boostrap_frame.html	(revision 5622)
@@ -0,0 +1,5 @@
+<script id="cke_air_bootscript">
+	document.write( window.parent.CKEDITOR._[ 'air_bootstrap_data' + location.search.substring( 1 ) ] || '' );
+	var me = document.getElementById( "cke_air_bootscript" );
+		me.parentNode.removeChild( me );
+</script>
Index: /CKEditor/branches/features/adobeair/_source/plugins/adobeair/plugin.js
===================================================================
--- /CKEditor/branches/features/adobeair/_source/plugins/adobeair/plugin.js	(revision 5621)
+++ /CKEditor/branches/features/adobeair/_source/plugins/adobeair/plugin.js	(revision 5622)
@@ -13,4 +13,7 @@
 		// Body doesn't get default margin on AIR. 
 		editor.addCss( 'body { padding: 8px }' );
+
+		// Frame source from application sandbox to be consumed by 'wysiwyg' plugin. 
+		editor._.air_bootstrap_frame_url = this.path + '/assets/air_boostrap_frame.html?' + editor.name;
 
 		var eventNameList = [ 'click', 'keydown', 'mousedown', 'keypress' ];
Index: /CKEditor/branches/features/adobeair/_source/plugins/wysiwygarea/plugin.js
===================================================================
--- /CKEditor/branches/features/adobeair/_source/plugins/wysiwygarea/plugin.js	(revision 5621)
+++ /CKEditor/branches/features/adobeair/_source/plugins/wysiwygarea/plugin.js	(revision 5622)
@@ -320,5 +320,5 @@
 							// for other browers, the 'src' attribute should be left empty to
 							// trigger iframe's 'load' event.
-  							' src="' + ( CKEDITOR.env.air ? CKEDITOR.basePath + 'air_sandbox_frame.html' : CKEDITOR.env.ie ? 'javascript:void(function(){' + encodeURIComponent( srcScript ) + '}())' : '' ) + '"' +
+  							' src="' + ( CKEDITOR.env.air ? editor._.air_bootstrap_frame_url : CKEDITOR.env.ie ? 'javascript:void(function(){' + encodeURIComponent( srcScript ) + '}())' : '' ) + '"' +
 							'" tabIndex="' + ( CKEDITOR.env.webkit? -1 : editor.tabIndex ) + '"' +
   							' allowTransparency="true"' +
@@ -327,5 +327,5 @@
 						if ( CKEDITOR.env.air )
 						{
-							CKEDITOR._.air_sandbox_frame_data = data;
+							CKEDITOR._[ 'air_bootstrap_data' + editor.name ] = data;
 							frameLoaded = 1;
 						}
Index: Editor/branches/features/adobeair/air_sandbox_frame.html
===================================================================
--- /CKEditor/branches/features/adobeair/air_sandbox_frame.html	(revision 5621)
+++ 	(revision )
@@ -1,6 +1,0 @@
-<script id="cke_air_bootscript">
-	document.write( window.parent.CKEDITOR._.air_sandbox_frame_data || '' );
-
-	var me = document.getElementById( "cke_air_bootscript" );
-		me.parentNode.removeChild( me );
-</script>
