X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Ffloatpanel%2Fplugin.js;h=849d5fc6945f453358e815b7acff179813ec72f1;hb=c6e377a02b54abc07129d72b632763c727476a15;hp=0a935284b499fc98caa4b5fe23935a9b954dbe97;hpb=8761695d9b70afe75905deaac88f78c1f8aeb32d;p=ckeditor.git

diff --git a/_source/plugins/floatpanel/plugin.js b/_source/plugins/floatpanel/plugin.js
index 0a93528..849d5fc 100644
--- a/_source/plugins/floatpanel/plugin.js
+++ b/_source/plugins/floatpanel/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
 */
 
@@ -55,10 +55,6 @@ CKEDITOR.plugins.add( 'floatpanel',
 
 			this.element = element;
 
-			// Register panels to editor for easy destroying ( #4241 ).
-			editor.panels ? editor.panels.push( element ) : editor.panels = [ element ];
-
-
 			this._ =
 			{
 				// The panel that will be floating.
@@ -135,11 +131,13 @@ CKEDITOR.plugins.add( 'floatpanel',
 					{
 						top : top + 'px',
 						left : '-3000px',
-						visibility : 'hidden',
 						opacity : '0',	// FF3 is ignoring "visibility"
 						display	: ''
 					});
 
+				// To allow the context menu to decrease back their width
+				element.getFirst().removeStyle('width');
+
 				// Configure the IFrame blur event. Do that only once.
 				if ( !this._.blurSet )
 				{
@@ -153,7 +151,7 @@ CKEDITOR.plugins.add( 'floatpanel',
 
 					focused.on( 'blur', function( ev )
 						{
-							if ( CKEDITOR.env.ie && !this.allowBlur() )
+							if ( !this.allowBlur() )
 								return;
 
 							// As we are using capture to register the listener,
@@ -195,18 +193,36 @@ CKEDITOR.plugins.add( 'floatpanel',
 						if ( rtl )
 							left -= element.$.offsetWidth;
 
-						element.setStyles(
-							{
-								left : left + 'px',
-								visibility	: '',
-								opacity : '1'	// FF3 is ignoring "visibility"
-							});
-
-						if ( block.autoSize )
+						var panelLoad = CKEDITOR.tools.bind( function ()
 						{
-							function setHeight()
+							var target = element.getFirst();
+
+							if ( block.autoSize )
 							{
-								var target = element.getFirst();
+								// We must adjust first the width or IE6 could include extra lines in the height computation
+								var widthNode = block.element.$;
+
+								if ( CKEDITOR.env.gecko || CKEDITOR.env.opera)
+									widthNode = widthNode.parentNode;
+
+								if ( CKEDITOR.env.ie)
+									widthNode = widthNode.document.body;
+
+								var width = widthNode.scrollWidth;
+								// Account for extra height needed due to IE quirks box model bug:
+								// http://en.wikipedia.org/wiki/Internet_Explorer_box_model_bug
+								// (#3426)
+								if ( CKEDITOR.env.ie && CKEDITOR.env.quirks && width > 0 )
+									width += ( target.$.offsetWidth || 0 ) - ( target.$.clientWidth || 0 );
+								// A little extra at the end.
+								// If not present, IE6 might break into the next line, but also it looks better this way
+								width += 4 ;
+
+								target.setStyle( 'width', width + 'px' );
+
+								// IE doesn't compute the scrollWidth if a filter is applied previously
+								block.element.addClass( 'cke_frameLoaded' );
+
 								var height = block.element.$.scrollHeight;
 
 								// Account for extra height needed due to IE quirks box model bug:
@@ -220,16 +236,40 @@ CKEDITOR.plugins.add( 'floatpanel',
 								// Fix IE < 8 visibility.
 								panel._.currentBlock.element.setStyle( 'display', 'none' ).removeStyle( 'display' );
 							}
-
-							if ( panel.isLoaded )
-								setHeight();
 							else
-								panel.onLoad = setHeight;
-						}
-						else
-							element.getFirst().removeStyle( 'height' );
+								target.removeStyle( 'height' );
 
-						// Set the IFrame focus, so the blur event gets fired.
+							var panelElement = panel.element,
+								panelWindow = panelElement.getWindow(),
+								windowScroll = panelWindow.getScrollPosition(),
+								viewportSize = panelWindow.getViewPaneSize(),
+								panelSize =
+								{
+									'height' : panelElement.$.offsetHeight,
+									'width' : panelElement.$.offsetWidth
+								};
+
+							// If the menu is horizontal off, shift it toward
+							// the opposite language direction.
+							if ( rtl ? left < 0 : left + panelSize.width > viewportSize.width + windowScroll.x )
+								left += ( panelSize.width * ( rtl ? 1 : -1 ) );
+
+							// Vertical off screen is simpler.
+							if ( top + panelSize.height > viewportSize.height + windowScroll.y )
+								top -= panelSize.height;
+
+							element.setStyles(
+								{
+									top : top + 'px',
+									left : left + 'px',
+									opacity : '1'
+								} );
+
+						} , this );
+
+						panel.isLoaded ? panelLoad() : panel.onLoad = panelLoad;
+
+						// Set the panel frame focus, so the blur event gets fired.
 						CKEDITOR.tools.setTimeout( function()
 							{
 								if ( definition.voiceLabel )
@@ -243,14 +283,11 @@ CKEDITOR.plugins.add( 'floatpanel',
 										iframe.setAttribute( 'title', ' ' );
 									}
 								}
-								if ( CKEDITOR.env.ie && CKEDITOR.env.quirks )
-									iframe.focus();
-								else
-									iframe.$.contentWindow.focus();
 
+								iframe.$.contentWindow.focus();
 								// We need this get fired manually because of unfired focus() function.
-								if ( CKEDITOR.env.ie && !CKEDITOR.env.quirks )
-									this.allowBlur( true );
+								this.allowBlur( true );
+
 							}, 0, this);
 					}, 0, this);
 				this.visible = 1;
@@ -329,4 +366,23 @@ CKEDITOR.plugins.add( 'floatpanel',
 			}
 		}
 	});
+
+	CKEDITOR.on( 'instanceDestroyed', function()
+	{
+		var isLastInstance = CKEDITOR.tools.isEmpty( CKEDITOR.instances );
+
+		for ( var i in panels )
+		{
+			var panel = panels[ i ];
+			// Safe to destroy it since there're no more instances.(#4241)
+			if ( isLastInstance )
+				panel.destroy();
+			// Panel might be used by other instances, just hide them.(#4552)
+			else
+				panel.element.hide();
+		}
+		// Remove the registration.
+		isLastInstance && ( panels = {} );
+
+	} );
 })();