[freeside-commits] freeside/httemplate/elements/fckeditor/editor/plugins/placeholder fck_placeholder.html, 1.1, 1.1.6.1 fckplugin.js, 1.1, 1.1.6.1

Tue Mar 16 01:35:04 PDT 2010

Update of /home/cvs/cvsroot/freeside/httemplate/elements/fckeditor/editor/plugins/placeholder
In directory wavetail.420.am:/tmp/cvs-serv23603/editor/plugins/placeholder

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	fck_placeholder.html fckplugin.js 
Log Message:
FCKeditor 2.6.6

Index: fckplugin.js
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/fckeditor/editor/plugins/placeholder/fckplugin.js,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -w -d -r1.1 -r1.1.6.1

--- fckplugin.js	1 Aug 2007 22:26:34 -0000	1.1
+++ fckplugin.js	16 Mar 2010 08:35:02 -0000	1.1.6.1
@@ -1,6 +1,6 @@
 ï»¿/*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2010 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -22,7 +22,7 @@
  */
 
 // Register the related command.
-FCKCommands.RegisterCommand( 'Placeholder', new FCKDialogCommand( 'Placeholder', FCKLang.PlaceholderDlgTitle, FCKPlugins.Items['placeholder'].Path + 'fck_placeholder.html', 340, 170 ) ) ;
+FCKCommands.RegisterCommand( 'Placeholder', new FCKDialogCommand( 'Placeholder', FCKLang.PlaceholderDlgTitle, FCKPlugins.Items['placeholder'].Path + 'fck_placeholder.html', 340, 160 ) ) ;
 
 // Create the "Plaholder" toolbar button.
 var oPlaceholderItem = new FCKToolbarButton( 'Placeholder', FCKLang.PlaceholderBtn ) ;
@@ -37,7 +37,7 @@
 // Add a new placeholder at the actual selection.
 FCKPlaceholders.Add = function( name )
 {
-	var oSpan = FCK.CreateElement( 'SPAN' ) ;
+	var oSpan = FCK.InsertElement( 'span' ) ;
 	this.SetupSpan( oSpan, name ) ;
 }
 

Index: fck_placeholder.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/fckeditor/editor/plugins/placeholder/fck_placeholder.html,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -w -d -r1.1 -r1.1.6.1
--- fck_placeholder.html	1 Aug 2007 22:26:34 -0000	1.1
+++ fck_placeholder.html	16 Mar 2010 08:35:02 -0000	1.1.6.1
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2010 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -26,9 +26,11 @@
 		<title>Placeholder Properties</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta content="noindex, nofollow" name="robots">
+		<script src="../../dialog/common/fck_dialog_common.js" type="text/javascript"></script>
 		<script language="javascript">
 
-var oEditor = window.parent.InnerDialogLoaded() ;
+var dialog = window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
 var FCKLang = oEditor.FCKLang ;
 var FCKPlaceholders = oEditor.FCKPlaceholders ;
 
@@ -40,10 +42,13 @@
 	LoadSelected() ;
 
 	// Show the "Ok" button.
-	window.parent.SetOkButton( true ) ;
+	dialog.SetOkButton( true ) ;
+
+	// Select text field on load.
+	SelectField( 'txtName' ) ;
 }
 
-var eSelected = oEditor.FCKSelection.GetSelectedElement() ;
+var eSelected = dialog.Selection.GetSelectedElement() ;
 
 function LoadSelected()
 {

