[geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dialog/common fck_dialog_common.js, 1.6, 1.7

Blaine Lang blaine at qs1489.pair.com
Sun Aug 10 12:46:30 EDT 2008


Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/common
In directory qs1489.pair.com:/tmp/cvs-serv4567/editor/dialog/common

Modified Files:
	fck_dialog_common.js 
Log Message:
Upgrade to FCKeditor ver 2.6.3

Index: fck_dialog_common.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/common/fck_dialog_common.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_dialog_common.js	5 May 2008 00:35:24 -0000	1.6
--- fck_dialog_common.js	10 Aug 2008 16:46:28 -0000	1.7
***************
*** 58,62 ****
  function GetCommonDialogCss( prefix )
  {
! 	// CSS minified by http://iceyboard.no-ip.org/projects/css_compressor
  	return FCKConfig.BasePath + 'dialog/common/' + '|.ImagePreviewArea{border:#000 1px solid;overflow:auto;width:100%;height:170px;background-color:#fff}.FlashPreviewArea{border:#000 1px solid;padding:5px;overflow:auto;width:100%;height:170px;background-color:#fff}.BtnReset{float:left;background-position:center center;background-image:url(images/reset.gif);width:16px;height:16px;background-repeat:no-repeat;border:1px none;font-size:1px}.BtnLocked,.BtnUnlocked{float:left;background-position:center center;background-image:url(images/locked.gif);width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.BtnUnlocked{background-image:url(images/unlocked.gif)}.BtnOver{border:outset 1px;cursor:pointer;cursor:hand}' ;
  }
--- 58,62 ----
  function GetCommonDialogCss( prefix )
  {
! 	// CSS minified by http://iceyboard.no-ip.org/projects/css_compressor (see _dev/css_compression.txt).
  	return FCKConfig.BasePath + 'dialog/common/' + '|.ImagePreviewArea{border:#000 1px solid;overflow:auto;width:100%;height:170px;background-color:#fff}.FlashPreviewArea{border:#000 1px solid;padding:5px;overflow:auto;width:100%;height:170px;background-color:#fff}.BtnReset{float:left;background-position:center center;background-image:url(images/reset.gif);width:16px;height:16px;background-repeat:no-repeat;border:1px none;font-size:1px}.BtnLocked,.BtnUnlocked{float:left;background-position:center center;background-image:url(images/locked.gif);width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.BtnUnlocked{background-image:url(images/unlocked.gif)}.BtnOver{border:outset 1px;cursor:pointer;cursor:hand}' ;
  }
***************
*** 188,219 ****
  	sOptions += ",top=" + iTop ;
  
! 	// The "PreserveSessionOnFileBrowser" because the above code could be
! 	// blocked by popup blockers.
! 	if ( oEditor.FCKConfig.PreserveSessionOnFileBrowser && oEditor.FCKBrowserInfo.IsIE )
! 	{
! 		// The following change has been made otherwise IE will open the file
! 		// browser on a different server session (on some cases):
! 		// http://support.microsoft.com/default.aspx?scid=kb;en-us;831678
! 		// by Simone Chiaretta.
! 		var oWindow = oEditor.window.open( url, 'FCKBrowseWindow', sOptions ) ;
! 
! 		if ( oWindow )
! 		{
! 			// Detect Yahoo popup blocker.
! 			try
! 			{
! 				var sTest = oWindow.name ; // Yahoo returns "something", but we can't access it, so detect that and avoid strange errors for the user.
! 				oWindow.opener = window ;
! 			}
! 			catch(e)
! 			{
! 				alert( oEditor.FCKLang.BrowseServerBlocked ) ;
! 			}
! 		}
! 		else
! 			alert( oEditor.FCKLang.BrowseServerBlocked ) ;
!     }
!     else
! 		window.open( url, 'FCKBrowseWindow', sOptions ) ;
  }
  
--- 188,192 ----
  	sOptions += ",top=" + iTop ;
  
! 	window.open( url, 'FCKBrowseWindow', sOptions ) ;
  }
  




More information about the geeklog-cvs mailing list