[geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dialog fck_about.html, 1.6, 1.7 fck_anchor.html, 1.6, 1.7 fck_button.html, 1.4, 1.5 fck_checkbox.html, 1.5, 1.6 fck_colorselector.html, 1.4, 1.5 fck_docprops.html, 1.5, 1.6 fck_flash.html, 1.4, 1.5 fck_form.html, 1.4, 1.5 fck_hiddenfield.html, 1.4, 1.5 fck_image.html, 1.7, 1.8 fck_link.html, 1.6, 1.7 fck_listprop.html, 1.5, 1.6 fck_paste.html, 1.5, 1.6 fck_radiobutton.html, 1.5, 1.6 fck_replace.html, 1.4, 1.5 fck_select.html, 1.4, 1.5 fck_smiley.html, 1.5, 1.6 fck_source.html, 1.4, 1.5 fck_specialchar.html, 1.6, 1.7 fck_spellerpages.html, 1.4, 1.5 fck_table.html, 1.6, 1.7 fck_tablecell.html, 1.4, 1.5 fck_template.html, 1.6, 1.7 fck_textarea.html, 1.4, 1.5 fck_textfield.html, 1.4, 1.5
Blaine Lang
blaine at qs1489.pair.com
Sun May 4 20:35:27 EDT 2008
Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog
In directory qs1489.pair.com:/tmp/cvs-serv85146/editor/dialog
Modified Files:
fck_about.html fck_anchor.html fck_button.html
fck_checkbox.html fck_colorselector.html fck_docprops.html
fck_flash.html fck_form.html fck_hiddenfield.html
fck_image.html fck_link.html fck_listprop.html fck_paste.html
fck_radiobutton.html fck_replace.html fck_select.html
fck_smiley.html fck_source.html fck_specialchar.html
fck_spellerpages.html fck_table.html fck_tablecell.html
fck_template.html fck_textarea.html fck_textfield.html
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08
Index: fck_table.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_table.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_table.html 9 Feb 2008 12:53:57 -0000 1.6
--- fck_table.html 5 May 2008 00:35:24 -0000 1.7
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 30,34 ****
<script type="text/javascript">
! var oEditor = window.parent.InnerDialogLoaded() ;
// Gets the document DOM
--- 30,36 ----
<script type="text/javascript">
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
! var dialogArguments = dialog.Args() ;
// Gets the document DOM
***************
*** 37,41 ****
// Gets the table if there is one selected.
var table ;
! var e = oEditor.FCKSelection.GetSelectedElement() ;
if ( ( !e && document.location.search.substr(1) == 'Parent' ) || ( e && e.tagName != 'TABLE' ) )
--- 39,43 ----
// Gets the table if there is one selected.
var table ;
! var e = dialog.Selection.GetSelectedElement() ;
if ( ( !e && document.location.search.substr(1) == 'Parent' ) || ( e && e.tagName != 'TABLE' ) )
***************
*** 89,96 ****
document.getElementById('txtRows').disabled = true ;
document.getElementById('txtColumns').disabled = true ;
}
! window.parent.SetOkButton( true ) ;
! window.parent.SetAutoSize( true ) ;
}
--- 91,101 ----
document.getElementById('txtRows').disabled = true ;
document.getElementById('txtColumns').disabled = true ;
+ SelectField( 'txtWidth' ) ;
}
+ else
+ SelectField( 'txtRows' ) ;
! dialog.SetOkButton( true ) ;
! dialog.SetAutoSize( true ) ;
}
Index: fck_template.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_template.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_template.html 9 Feb 2008 12:53:57 -0000 1.6
--- fck_template.html 5 May 2008 00:35:24 -0000 1.7
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
Index: fck_radiobutton.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_radiobutton.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fck_radiobutton.html 9 Feb 2008 12:53:57 -0000 1.5
--- fck_radiobutton.html 5 May 2008 00:35:24 -0000 1.6
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 30,39 ****
<script type="text/javascript">
! var oEditor = window.parent.InnerDialogLoaded() ;
// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;
! var oActiveEl = oEditor.FCKSelection.GetSelectedElement() ;
window.onload = function()
--- 30,40 ----
<script type="text/javascript">
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;
! var oActiveEl = dialog.Selection.GetSelectedElement() ;
window.onload = function()
***************
*** 51,56 ****
oActiveEl = null ;
! window.parent.SetOkButton( true ) ;
! window.parent.SetAutoSize( true ) ;
}
--- 52,58 ----
oActiveEl = null ;
! dialog.SetOkButton( true ) ;
! dialog.SetAutoSize( true ) ;
! SelectField( 'txtName' ) ;
}
***************
*** 58,71 ****
{
oEditor.FCKUndo.SaveUndoStep() ;
-
- if ( !oActiveEl )
- {
- oActiveEl = oEditor.FCK.EditorDocument.createElement( 'INPUT' ) ;
- oActiveEl.type = 'radio' ;
- oActiveEl = oEditor.FCK.InsertElement( oActiveEl ) ;
- }
! if ( GetE('txtName').value.length > 0 )
! oActiveEl.name = GetE('txtName').value ;
if ( oEditor.FCKBrowserInfo.IsIE )
--- 60,65 ----
{
oEditor.FCKUndo.SaveUndoStep() ;
! oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: 'radio' } ) ;
if ( oEditor.FCKBrowserInfo.IsIE )
Index: fck_hiddenfield.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_hiddenfield.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_hiddenfield.html 9 Feb 2008 12:53:57 -0000 1.4
--- fck_hiddenfield.html 5 May 2008 00:35:24 -0000 1.5
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 30,34 ****
<script type="text/javascript">
! var oEditor = window.parent.InnerDialogLoaded() ;
var FCK = oEditor.FCK ;
--- 30,36 ----
<script type="text/javascript">
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
!
var FCK = oEditor.FCK ;
***************
*** 37,41 ****
// Get the selected flash embed (if available).
! var oFakeImage = FCK.Selection.GetSelectedElement() ;
var oActiveEl ;
--- 39,43 ----
// Get the selected flash embed (if available).
! var oFakeImage = dialog.Selection.GetSelectedElement() ;
var oActiveEl ;
***************
*** 59,64 ****
}
! window.parent.SetOkButton( true ) ;
! window.parent.SetAutoSize( true ) ;
}
--- 61,67 ----
}
! dialog.SetOkButton( true ) ;
! dialog.SetAutoSize( true ) ;
! SelectField( 'txtName' ) ;
}
***************
*** 67,80 ****
{
oEditor.FCKUndo.SaveUndoStep() ;
-
- if ( !oActiveEl )
- {
- oActiveEl = FCK.EditorDocument.createElement( 'INPUT' ) ;
- oActiveEl.type = 'hidden' ;
! oFakeImage = null ;
! }
- oActiveEl.name = GetE('txtName').value ;
SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ;
--- 70,76 ----
{
oEditor.FCKUndo.SaveUndoStep() ;
! oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: 'hidden' } ) ;
SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ;
***************
*** 83,92 ****
oFakeImage = oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__InputHidden', oActiveEl ) ;
oFakeImage.setAttribute( '_fckinputhidden', 'true', 0 ) ;
! oFakeImage = FCK.InsertElement( oFakeImage ) ;
}
else
oEditor.FCKUndo.SaveUndoStep() ;
-
- oEditor.FCKFlashProcessor.RefreshView( oFakeImage, oActiveEl ) ;
return true ;
--- 79,88 ----
oFakeImage = oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__InputHidden', oActiveEl ) ;
oFakeImage.setAttribute( '_fckinputhidden', 'true', 0 ) ;
!
! oActiveEl.parentNode.insertBefore( oFakeImage, oActiveEl ) ;
! oActiveEl.parentNode.removeChild( oActiveEl ) ;
}
else
oEditor.FCKUndo.SaveUndoStep() ;
return true ;
Index: fck_link.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_link.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_link.html 9 Feb 2008 12:53:57 -0000 1.6
--- fck_link.html 5 May 2008 00:35:24 -0000 1.7
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
Index: fck_button.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_button.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_button.html 9 Feb 2008 12:53:57 -0000 1.4
--- fck_button.html 5 May 2008 00:35:24 -0000 1.5
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 30,39 ****
<script type="text/javascript">
! var oEditor = window.parent.InnerDialogLoaded() ;
// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;
! var oActiveEl = oEditor.FCKSelection.GetSelectedElement() ;
window.onload = function()
--- 30,40 ----
<script type="text/javascript">
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;
! var oActiveEl = dialog.Selection.GetSelectedElement() ;
window.onload = function()
***************
*** 47,58 ****
GetE('txtValue').value = oActiveEl.value ;
GetE('txtType').value = oActiveEl.type ;
-
- GetE('txtType').disabled = true ;
}
else
oActiveEl = null ;
! window.parent.SetOkButton( true ) ;
! window.parent.SetAutoSize( true ) ;
}
--- 48,58 ----
GetE('txtValue').value = oActiveEl.value ;
GetE('txtType').value = oActiveEl.type ;
}
else
oActiveEl = null ;
! dialog.SetOkButton( true ) ;
! dialog.SetAutoSize( true ) ;
! SelectField( 'txtName' ) ;
}
***************
*** 60,72 ****
{
oEditor.FCKUndo.SaveUndoStep() ;
-
- if ( !oActiveEl )
- {
- oActiveEl = oEditor.FCK.EditorDocument.createElement( 'INPUT' ) ;
- oActiveEl.type = GetE('txtType').value ;
- oActiveEl = oEditor.FCK.InsertElement( oActiveEl ) ;
- }
! oActiveEl.name = GetE('txtName').value ;
SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ;
--- 60,66 ----
{
oEditor.FCKUndo.SaveUndoStep() ;
! oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: GetE('txtType').value } ) ;
!
SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ;
Index: fck_listprop.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_listprop.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fck_listprop.html 9 Feb 2008 12:53:57 -0000 1.5
--- fck_listprop.html 5 May 2008 00:35:24 -0000 1.6
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 30,34 ****
<script type="text/javascript">
! var oEditor = window.parent.InnerDialogLoaded() ;
// Gets the document DOM
--- 30,35 ----
<script type="text/javascript">
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
// Gets the document DOM
***************
*** 36,40 ****
var sListType = ( location.search == '?OL' ? 'OL' : 'UL' ) ;
! var oActiveEl = oEditor.FCKSelection.MoveToAncestorNode( sListType ) ;
var oActiveSel ;
--- 37,41 ----
var sListType = ( location.search == '?OL' ? 'OL' : 'UL' ) ;
! var oActiveEl = dialog.Selection.GetSelection().MoveToAncestorNode( sListType ) ;
var oActiveSel ;
***************
*** 64,69 ****
}
! window.parent.SetOkButton( true ) ;
! window.parent.SetAutoSize( true ) ;
}
--- 65,72 ----
}
! dialog.SetOkButton( true ) ;
! dialog.SetAutoSize( true ) ;
!
! SelectField( 'txtStartPosition' ) ;
}
Index: fck_about.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_about.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_about.html 9 Feb 2008 12:53:57 -0000 1.6
--- fck_about.html 5 May 2008 00:35:24 -0000 1.7
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 71,75 ****
<table cellpadding="0" cellspacing="0" border="0" width="100%" style="height: 100%">
<tr>
! <td>
<img alt="" src="fck_about/logo_fckeditor.gif" width="236" height="41" align="left" />
<table width="80" border="0" cellspacing="0" cellpadding="5" bgcolor="#ffffff" align="right">
--- 71,75 ----
<table cellpadding="0" cellspacing="0" border="0" width="100%" style="height: 100%">
<tr>
! <td colspan="2">
<img alt="" src="fck_about/logo_fckeditor.gif" width="236" height="41" align="left" />
<table width="80" border="0" cellspacing="0" cellpadding="5" bgcolor="#ffffff" align="right">
***************
*** 79,84 ****
<span fcklang="DlgAboutVersion">version</span>
<br />
! <b>2.5.1</b><br />
! Build 17566</td>
</tr>
</table>
--- 79,84 ----
<span fcklang="DlgAboutVersion">version</span>
<br />
! <b>2.6</b><br />
! Build 18638</td>
</tr>
</table>
***************
*** 86,107 ****
</tr>
<tr style="height: 100%">
! <td align="center">
! <br />
<span style="font-size: 14px" dir="ltr">
- <br />
<b><a href="http://www.fckeditor.net/?about" target="_blank" title="Visit the FCKeditor web site">
Support <b>Open Source</b> Software</a></b> </span>
! <br />
! <br />
! <br />
<span fcklang="DlgAboutInfo">For further information go to</span> <a href="http://www.fckeditor.net/?About"
target="_blank">http://www.fckeditor.net/</a>.
<br />
! Copyright © 2003-2007 <a href="#" onclick="SendEMail();">Frederico Caldeira Knabben</a>
</td>
- </tr>
- <tr>
<td align="center">
! <img alt="" src="fck_about/logo_fredck.gif" width="87" height="36" />
</td>
</tr>
--- 86,113 ----
</tr>
<tr style="height: 100%">
! <td align="center" valign="middle">
<span style="font-size: 14px" dir="ltr">
<b><a href="http://www.fckeditor.net/?about" target="_blank" title="Visit the FCKeditor web site">
Support <b>Open Source</b> Software</a></b> </span>
! <div style="padding-top:15px">
! <img alt="" src="fck_about/logo_fredck.gif" width="87" height="36" />
! </div>
! </td>
! <td align="center" nowrap="nowrap" valign="middle">
! <div>
! <div style="margin-bottom:5px" dir="ltr">Selected Sponsor</div>
! <a href="http://www.spellchecker.net/fckeditor/" target="_blank"><img alt="Selected Sponsor" border="0" src="fck_about/sponsors/spellchecker_net.gif" width="75" height="75" /></a>
! </div>
! </td>
! </tr>
! <tr>
! <td width="100%" nowrap="nowrap">
<span fcklang="DlgAboutInfo">For further information go to</span> <a href="http://www.fckeditor.net/?About"
target="_blank">http://www.fckeditor.net/</a>.
<br />
! Copyright © 2003-2008 <a href="#" onclick="SendEMail();">Frederico Caldeira Knabben</a>
</td>
<td align="center">
! <a href="http://www.fckeditor.net/sponsors/apply" target="_blank">Become a Sponsor</a>
</td>
</tr>
Index: fck_image.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** fck_image.html 9 Feb 2008 12:53:57 -0000 1.7
--- fck_image.html 5 May 2008 00:35:24 -0000 1.8
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 29,33 ****
<script src="common/fck_dialog_common.js" type="text/javascript"></script>
<script src="fck_image/fck_image.js" type="text/javascript"></script>
! <link href="common/fck_dialog_common.css" rel="stylesheet" type="text/css" />
</head>
<body scroll="no" style="overflow: hidden">
--- 29,37 ----
<script src="common/fck_dialog_common.js" type="text/javascript"></script>
<script src="fck_image/fck_image.js" type="text/javascript"></script>
! <script type="text/javascript">
!
! document.write( FCKTools.GetStyleHtml( GetCommonDialogCss() ) ) ;
!
! </script>
</head>
<body scroll="no" style="overflow: hidden">
***************
*** 161,165 ****
<br />
<input id="btnUpload" type="submit" value="Send it to the Server" fcklang="DlgLnkBtnUpload" />
! <iframe name="UploadWindow" style="display: none" src="javascript:void(0)"></iframe>
</form>
</div>
--- 165,171 ----
<br />
<input id="btnUpload" type="submit" value="Send it to the Server" fcklang="DlgLnkBtnUpload" />
! <script type="text/javascript">
! document.write( '<iframe name="UploadWindow" style="display: none" src="' + FCKTools.GetVoidUrl() + '"></iframe>' ) ;
! </script>
</form>
</div>
Index: fck_smiley.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_smiley.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fck_smiley.html 9 Feb 2008 12:53:57 -0000 1.5
--- fck_smiley.html 5 May 2008 00:35:24 -0000 1.6
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 34,40 ****
}
</style>
<script type="text/javascript">
! var oEditor = window.parent.InnerDialogLoaded() ;
window.onload = function ()
--- 34,42 ----
}
</style>
+ <script src="common/fck_dialog_common.js" type="text/javascript"></script>
<script type="text/javascript">
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
window.onload = function ()
***************
*** 43,47 ****
oEditor.FCKLanguageManager.TranslatePage(document) ;
! window.parent.SetAutoSize( true ) ;
}
--- 45,49 ----
oEditor.FCKLanguageManager.TranslatePage(document) ;
! dialog.SetAutoSize( true ) ;
}
***************
*** 49,52 ****
--- 51,55 ----
{
oEditor.FCKUndo.SaveUndoStep() ;
+
var oImg = oEditor.FCK.InsertElement( 'img' ) ;
oImg.src = url ;
***************
*** 58,62 ****
document.body.innerHTML = '' ;
! window.parent.Cancel() ;
}
--- 61,65 ----
document.body.innerHTML = '' ;
! dialog.Cancel() ;
}
Index: fck_checkbox.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_checkbox.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fck_checkbox.html 9 Feb 2008 12:53:57 -0000 1.5
--- fck_checkbox.html 5 May 2008 00:35:24 -0000 1.6
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 30,39 ****
<script type="text/javascript">
! var oEditor = window.parent.InnerDialogLoaded() ;
// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;
! var oActiveEl = oEditor.FCKSelection.GetSelectedElement() ;
window.onload = function()
--- 30,40 ----
<script type="text/javascript">
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;
! var oActiveEl = dialog.Selection.GetSelectedElement() ;
window.onload = function()
***************
*** 51,56 ****
oActiveEl = null ;
! window.parent.SetOkButton( true ) ;
! window.parent.SetAutoSize( true ) ;
}
--- 52,58 ----
oActiveEl = null ;
! dialog.SetOkButton( true ) ;
! dialog.SetAutoSize( true ) ;
! SelectField( 'txtName' ) ;
}
***************
*** 58,71 ****
{
oEditor.FCKUndo.SaveUndoStep() ;
-
- if ( !oActiveEl )
- {
- oActiveEl = oEditor.FCK.EditorDocument.createElement( 'INPUT' ) ;
- oActiveEl.type = 'checkbox' ;
- oActiveEl = oEditor.FCK.InsertElement( oActiveEl ) ;
- }
! if ( GetE('txtName').value.length > 0 )
! oActiveEl.name = GetE('txtName').value ;
if ( oEditor.FCKBrowserInfo.IsIE )
--- 60,65 ----
{
oEditor.FCKUndo.SaveUndoStep() ;
! oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: 'checkbox' } ) ;
if ( oEditor.FCKBrowserInfo.IsIE )
Index: fck_tablecell.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_tablecell.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_tablecell.html 9 Feb 2008 12:53:57 -0000 1.4
--- fck_tablecell.html 5 May 2008 00:35:24 -0000 1.5
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 30,34 ****
<script type="text/javascript">
! var oEditor = window.parent.InnerDialogLoaded() ;
// Gets the document DOM
--- 30,35 ----
<script type="text/javascript">
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
// Gets the document DOM
***************
*** 45,50 ****
SetStartupValue() ;
! window.parent.SetOkButton( true ) ;
! window.parent.SetAutoSize( true ) ;
}
--- 46,52 ----
SetStartupValue() ;
! dialog.SetOkButton( true ) ;
! dialog.SetAutoSize( true ) ;
! SelectField( 'txtWidth' ) ;
}
***************
*** 88,92 ****
if ( GetE('selWordWrap').value == 'false' )
! SetAttribute( aCells[i], 'noWrap', 'nowrap' ) ;
else
aCells[i].removeAttribute( 'noWrap' ) ;
--- 90,94 ----
if ( GetE('selWordWrap').value == 'false' )
! SetAttribute( aCells[i], 'noWrap', 'nowrap' ) ;
else
aCells[i].removeAttribute( 'noWrap' ) ;
***************
*** 119,123 ****
function SelectColor( wich )
{
! oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', oEditor.FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, wich == 'Back' ? SelectBackColor : SelectBorderColor, window ) ;
}
--- 121,125 ----
function SelectColor( wich )
{
! oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', oEditor.FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, wich == 'Back' ? SelectBackColor : SelectBorderColor, window ) ;
}
Index: fck_replace.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_replace.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_replace.html 9 Feb 2008 12:53:57 -0000 1.4
--- fck_replace.html 5 May 2008 00:35:24 -0000 1.5
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 30,38 ****
<script type="text/javascript">
! var oEditor = window.parent.InnerDialogLoaded() ;
var FCKLang = oEditor.FCKLang ;
! window.parent.AddTab( 'Find', FCKLang.DlgFindTitle ) ;
! window.parent.AddTab( 'Replace', FCKLang.DlgReplaceTitle ) ;
var idMap = {} ;
--- 30,41 ----
<script type="text/javascript">
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
! var dialogArguments = dialog.Args() ;
!
var FCKLang = oEditor.FCKLang ;
! dialog.AddTab( 'Find', FCKLang.DlgFindTitle ) ;
! dialog.AddTab( 'Replace', FCKLang.DlgReplaceTitle ) ;
var idMap = {} ;
***************
*** 46,50 ****
if ( tabCode == 'Replace' )
! window.parent.SetAutoSize( true ) ;
}
--- 49,85 ----
if ( tabCode == 'Replace' )
! dialog.SetAutoSize( true ) ;
! }
!
! // Place a range at the start of document.
! // This will be the starting point of our search.
! var GlobalRange = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
!
! function ResetGlobalRange()
! {
! GlobalRange.SetStart( oEditor.FCK.EditorDocument.body, 1 ) ;
! GlobalRange.SetEnd( oEditor.FCK.EditorDocument.body, 1 ) ;
! GlobalRange.Collapse( true ) ;
! }
! ResetGlobalRange() ;
!
! var HighlightRange = null ;
! function Highlight()
! {
! if ( HighlightRange )
! ClearHighlight() ;
! var cloneRange = GlobalRange.Clone() ;
! oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' ).ApplyToRange( cloneRange, false, true ) ;
! HighlightRange = cloneRange ;
! GlobalRange = HighlightRange.Clone() ;
! }
!
! function ClearHighlight()
! {
! if ( HighlightRange )
! {
! oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' ).RemoveFromRange( HighlightRange, false, true ) ;
! HighlightRange = null ;
! }
}
***************
*** 54,109 ****
oEditor.FCKLanguageManager.TranslatePage( document ) ;
- // Place the cursor at the start of document.
- // This will be the starting point of our search.
- var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
- range.SetStart( oEditor.FCK.EditorDocument.body, 1 ) ;
- range.SetEnd( oEditor.FCK.EditorDocument.body, 1 ) ;
- range.Collapse( true ) ;
- range.Select() ;
-
// Show the appropriate tab at startup.
! if ( window.parent.name.search( 'Replace' ) == -1 )
{
! window.parent.SetSelectedTab( 'Find' ) ;
! window.parent.SetAutoSize( true ) ;
}
else
! window.parent.SetSelectedTab( 'Replace' ) ;
}
! function btnStat(frm)
{
! document.getElementById('btnReplace').disabled =
! document.getElementById('btnReplaceAll').disabled =
! document.getElementById('btnFind').disabled =
! ( document.getElementById(idMap["FindText"]).value.length == 0 ) ;
}
! function GetSelection()
{
! var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
! range.MoveToSelection() ;
! return range.CreateBookmark2() ;
}
function GetSearchString()
{
! return document.getElementById(idMap['FindText']).value ;
}
function GetReplaceString()
{
! return document.getElementById("txtReplace").value ;
}
function GetCheckCase()
{
! return !! ( document.getElementById(idMap['CheckCase']).checked ) ;
}
function GetMatchWord()
{
! return !! ( document.getElementById(idMap['CheckWord']).checked ) ;
}
--- 89,135 ----
oEditor.FCKLanguageManager.TranslatePage( document ) ;
// Show the appropriate tab at startup.
! if ( dialogArguments.CustomValue == 'Find' )
{
! dialog.SetSelectedTab( 'Find' ) ;
! dialog.SetAutoSize( true ) ;
}
else
! dialog.SetSelectedTab( 'Replace' ) ;
+ SelectField( 'txtFind' + dialogArguments.CustomValue ) ;
}
! function btnStat()
{
! GetE('btnReplace').disabled =
! GetE('btnReplaceAll').disabled =
! GetE('btnFind').disabled =
! ( GetE(idMap["FindText"]).value.length == 0 ) ;
}
! function btnStatDelayed()
{
! setTimeout( btnStat, 1 ) ;
}
function GetSearchString()
{
! return GetE(idMap['FindText']).value ;
}
function GetReplaceString()
{
! return GetE("txtReplace").value ;
}
function GetCheckCase()
{
! return !! ( GetE(idMap['CheckCase']).checked ) ;
}
function GetMatchWord()
{
! return !! ( GetE(idMap['CheckWord']).checked ) ;
}
***************
*** 242,246 ****
return KMP_MATCHED;
}
! return KMP_ADVANCED;
}
else if ( this._State == 0 )
--- 268,272 ----
return KMP_MATCHED;
}
! return KMP_ADVANCED ;
}
else if ( this._State == 0 )
***************
*** 262,268 ****
// Start from the end of the current selection.
var matcher = new KmpMatch( GetSearchString(), ! GetCheckCase() ) ;
! var cursor = GetSelection().End ;
var matchState = KMP_NOMATCH ;
var matchBookmark = null ;
// Match finding.
--- 288,295 ----
// Start from the end of the current selection.
var matcher = new KmpMatch( GetSearchString(), ! GetCheckCase() ) ;
! var cursor = GlobalRange.CreateBookmark2().End ;
var matchState = KMP_NOMATCH ;
var matchBookmark = null ;
+ var matchBookmarkStart = [] ;
// Match finding.
***************
*** 279,283 ****
{
matcher.Reset();
! matchBookmark = null ;
}
}
--- 306,310 ----
{
matcher.Reset();
! matchBookmarkStart = [] ;
}
}
***************
*** 286,301 ****
matchState = matcher.FeedCharacter(data) ;
if ( matchState == KMP_NOMATCH )
! matchBookmark = null ;
! else if ( matchState == KMP_ADVANCED && matchBookmark == null )
! matchBookmark = { Start : cursor.concat( [] ) } ;
else if ( matchState == KMP_MATCHED )
{
! if ( matchBookmark == null )
! matchBookmark = { Start : cursor.concat( [] ) } ;
! matchBookmark.End = cursor.concat( [] ) ;
matchBookmark.End[ matchBookmark.End.length - 1 ]++;
// Wait, do we have to match a whole word?
if ( GetMatchWord() )
{
--- 313,340 ----
matchState = matcher.FeedCharacter(data) ;
+ // No possible match of any useful substring in the pattern for the currently scanned character.
+ // So delete any positional information.
if ( matchState == KMP_NOMATCH )
! matchBookmarkStart = [] ;
! // We've matched something, but it's not a complete match, so let's just mark down the position for backtracking later.
! else if ( matchState == KMP_ADVANCED )
! {
! matchBookmarkStart.push( cursor.concat( [] ) ) ;
! if ( matchBookmarkStart.length > matcher._State )
! matchBookmarkStart.shift() ;
! }
! // Found a complete match! Mark down the ending position as well.
else if ( matchState == KMP_MATCHED )
{
! // It is possible to get a KMP_MATCHED without KMP_ADVANCED when the match pattern is only 1 character.
! // So need to check and mark down the starting position as well.
! if ( matchBookmarkStart.length == 0 )
! matchBookmarkStart = [cursor.concat( [] )] ;
!
! matchBookmark = { 'Start' : matchBookmarkStart.shift(), 'End' : cursor.concat( [] ) } ;
matchBookmark.End[ matchBookmark.End.length - 1 ]++;
// Wait, do we have to match a whole word?
+ // If yes, carry out additional checks on what we've got.
if ( GetMatchWord() )
{
***************
*** 342,352 ****
}
! // If we've found a match, select the match.
if ( matchState == KMP_MATCHED )
{
! var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
! range.MoveToBookmark2( matchBookmark ) ;
! range.Select() ;
! var focus = range._Range.endContainer ;
while ( focus && focus.nodeType != 1 )
focus = focus.parentNode ;
--- 381,390 ----
}
! // If we've found a match, highlight the match.
if ( matchState == KMP_MATCHED )
{
! GlobalRange.MoveToBookmark2( matchBookmark ) ;
! Highlight() ;
! var focus = GlobalRange._Range.endContainer ;
while ( focus && focus.nodeType != 1 )
focus = focus.parentNode ;
***************
*** 360,397 ****
}
! return true;
}
else
! return false;
}
function Find()
{
- var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
- range.MoveToSelection() ;
- range.Collapse( false ) ;
- range.Select() ;
-
if ( ! _Find() )
alert( FCKLang.DlgFindNotFoundMsg ) ;
}
function Replace()
{
! var selection = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
! selection.MoveToSelection() ;
!
! if ( selection.CheckIsCollapsed() )
{
if (! _Find() )
alert( FCKLang.DlgFindNotFoundMsg ) ;
}
else
{
oEditor.FCKUndo.SaveUndoStep() ;
! selection.DeleteContents() ;
! selection.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ;
! selection.Collapse( false ) ;
! selection.Select() ;
}
}
--- 398,435 ----
}
! return true ;
}
else
! {
! ResetGlobalRange() ;
! return false ;
! }
}
function Find()
{
if ( ! _Find() )
+ {
+ ClearHighlight() ;
alert( FCKLang.DlgFindNotFoundMsg ) ;
+ }
}
function Replace()
{
! if ( GlobalRange.CheckIsCollapsed() )
{
if (! _Find() )
+ {
+ ClearHighlight() ;
alert( FCKLang.DlgFindNotFoundMsg ) ;
+ }
}
else
{
oEditor.FCKUndo.SaveUndoStep() ;
! GlobalRange.DeleteContents() ;
! GlobalRange.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ;
! GlobalRange.Collapse( false ) ;
}
}
***************
*** 400,420 ****
{
oEditor.FCKUndo.SaveUndoStep() ;
- var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
-
var replaceCount = 0 ;
while ( _Find() )
{
! range.MoveToSelection() ;
! range.DeleteContents() ;
! range.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ;
! range.Collapse( false ) ;
! range.Select() ;
replaceCount++ ;
}
if ( replaceCount == 0 )
alert( FCKLang.DlgFindNotFoundMsg ) ;
! window.parent.Cancel() ;
}
</script>
</head>
--- 438,460 ----
{
oEditor.FCKUndo.SaveUndoStep() ;
var replaceCount = 0 ;
while ( _Find() )
{
! dialog.Selection.EnsureSelection() ;
! GlobalRange.DeleteContents() ;
! GlobalRange.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ;
! GlobalRange.Collapse( false ) ;
replaceCount++ ;
}
if ( replaceCount == 0 )
+ {
+ ClearHighlight() ;
alert( FCKLang.DlgFindNotFoundMsg ) ;
! }
! dialog.Cancel() ;
}
+
+ window.onunload = function(){ ClearHighlight() ; }
</script>
</head>
***************
*** 428,432 ****
</td>
<td width="100%">
! <input id="txtFindFind" onkeyup="btnStat(this.form)" style="width: 100%" tabindex="1"
type="text" />
</td>
--- 468,472 ----
</td>
<td width="100%">
! <input id="txtFindFind" onkeyup="btnStat()" oninput="btnStat()" onpaste="btnStatDelayed()" style="width: 100%" tabindex="1"
type="text" />
</td>
***************
*** 455,459 ****
</td>
<td width="100%">
! <input id="txtFindReplace" onkeyup="btnStat(this.form)" style="width: 100%" tabindex="1"
type="text" />
</td>
--- 495,499 ----
</td>
<td width="100%">
! <input id="txtFindReplace" onkeyup="btnStat()" oninput="btnStat()" onpaste="btnStatDelayed()" style="width: 100%" tabindex="1"
type="text" />
</td>
Index: fck_colorselector.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_colorselector.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_colorselector.html 9 Feb 2008 12:53:57 -0000 1.4
--- fck_colorselector.html 5 May 2008 00:35:24 -0000 1.5
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 35,38 ****
--- 35,39 ----
.ColorCell { height: 15px ; width: 15px ; }
</style>
+ <script src="common/fck_dialog_common.js" type="text/javascript"></script>
<script type="text/javascript">
***************
*** 136,141 ****
function Ok()
{
! if ( typeof(window.parent.dialogArguments.CustomValue) == 'function' )
! window.parent.dialogArguments.CustomValue( document.getElementById('selcolor').value ) ;
return true ;
--- 137,142 ----
function Ok()
{
! if ( typeof(window.parent.Args().CustomValue) == 'function' )
! window.parent.Args().CustomValue( document.getElementById('selcolor').value ) ;
return true ;
Index: fck_textfield.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_textfield.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_textfield.html 9 Feb 2008 12:53:57 -0000 1.4
--- fck_textfield.html 5 May 2008 00:35:24 -0000 1.5
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 30,39 ****
<script type="text/javascript">
! var oEditor = window.parent.InnerDialogLoaded() ;
// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;
! var oActiveEl = oEditor.FCKSelection.GetSelectedElement() ;
window.onload = function()
--- 30,40 ----
<script type="text/javascript">
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;
! var oActiveEl = dialog.Selection.GetSelectedElement() ;
window.onload = function()
***************
*** 49,60 ****
GetE('txtMax').value = GetAttribute( oActiveEl, 'maxLength' ) ;
GetE('txtType').value = oActiveEl.type ;
-
- GetE('txtType').disabled = true ;
}
else
oActiveEl = null ;
! window.parent.SetOkButton( true ) ;
! window.parent.SetAutoSize( true ) ;
}
--- 50,60 ----
GetE('txtMax').value = GetAttribute( oActiveEl, 'maxLength' ) ;
GetE('txtType').value = oActiveEl.type ;
}
else
oActiveEl = null ;
! dialog.SetOkButton( true ) ;
! dialog.SetAutoSize( true ) ;
! SelectField( 'txtName' ) ;
}
***************
*** 74,86 ****
}
! if ( !oActiveEl )
! {
! oActiveEl = oEditor.FCK.EditorDocument.createElement( 'INPUT' ) ;
! oActiveEl.type = GetE('txtType').value ;
! oEditor.FCKUndo.SaveUndoStep() ;
! oActiveEl = oEditor.FCK.InsertElement( oActiveEl ) ;
! }
- oActiveEl.name = GetE('txtName').value ;
SetAttribute( oActiveEl, 'value' , GetE('txtValue').value ) ;
SetAttribute( oActiveEl, 'size' , GetE('txtSize').value ) ;
--- 74,81 ----
}
! oEditor.FCKUndo.SaveUndoStep() ;
!
! oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: GetE('txtType').value } ) ;
SetAttribute( oActiveEl, 'value' , GetE('txtValue').value ) ;
SetAttribute( oActiveEl, 'size' , GetE('txtSize').value ) ;
Index: fck_spellerpages.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_spellerpages.html 9 Feb 2008 12:53:57 -0000 1.4
--- fck_spellerpages.html 5 May 2008 00:35:24 -0000 1.5
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 27,30 ****
--- 27,31 ----
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta content="noindex, nofollow" name="robots">
+ <script src="common/fck_dialog_common.js" type="text/javascript"></script>
<script src="fck_spellerpages/spellerpages/spellChecker.js"></script>
<script type="text/javascript">
Index: fck_docprops.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_docprops.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fck_docprops.html 9 Feb 2008 12:53:57 -0000 1.5
--- fck_docprops.html 5 May 2008 00:35:24 -0000 1.6
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 375,383 ****
switch ( wich )
{
! case 'Back' : oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, SelectBackColor, window ) ; return ;
! case 'ColorText' : oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, SelectColorText, window ) ; return ;
! case 'ColorLink' : oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, SelectColorLink, window ) ; return ;
! case 'ColorVisited' : oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, SelectColorVisited, window ) ; return ;
! case 'ColorActive' : oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, SelectColorActive, window ) ; return ;
}
}
--- 375,383 ----
switch ( wich )
{
! case 'Back' : oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, SelectBackColor, window ) ; return ;
! case 'ColorText' : oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, SelectColorText, window ) ; return ;
! case 'ColorLink' : oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, SelectColorLink, window ) ; return ;
! case 'ColorVisited' : oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, SelectColorVisited, window ) ; return ;
! case 'ColorActive' : oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, SelectColorActive, window ) ; return ;
}
}
Index: fck_specialchar.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_specialchar.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_specialchar.html 9 Feb 2008 12:53:57 -0000 1.6
--- fck_specialchar.html 5 May 2008 00:35:24 -0000 1.7
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 34,37 ****
--- 34,38 ----
.Sample { font-size: 24px; }
</style>
+ <script src="common/fck_dialog_common.js" type="text/javascript"></script>
<script type="text/javascript">
***************
*** 82,86 ****
<table cellpadding="1" cellspacing="1" align="center" border="0" width="100%" height="100%">
<script type="text/javascript">
! var aChars = ["!",""","#","$","%","&","\\'","(",")","*","+","-",".","/","0","1","2","3","4","5","6","7","8","9",":",";","<","=",">","?","@","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","[","]","^","_","`","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","{","|","}","~","€","‘","’","’","“","”","–","—","¡","¢","£","¤","¥","¦","§","¨","©","ª","«","¬","®","¯","°","±","²","³","´","µ","¶","·","¸","¹","º","»","¼","½","¾","¿","À","Á","Â","Ã","Ä","Å","Æ","Ç","È","É","Ê","Ë","Ì","Í","Î","Ï","Ð","Ñ","Ò","Ó","Ô","&Otil
de;","Ö","×","Ø","Ù","Ú","Û","Ü","Ý","Þ","ß","à","á","â","ã","ä","å","æ","ç","è","é","ê","ë","ì","í","î","ï","ð","ñ","ò","ó","ô","õ","ö","÷","ø","ù","ú","û","ü","ü","ý","þ","ÿ","Œ","œ","‚","‛","„","…","™","►","•","→","⇒","⇔","♦","≈"] ;
var cols = 20 ;
--- 83,87 ----
<table cellpadding="1" cellspacing="1" align="center" border="0" width="100%" height="100%">
<script type="text/javascript">
! var aChars = ["!",""","#","$","%","&","\\'","(",")","*","+","-",".","/","0","1","2","3","4","5","6","7","8","9",":",";","<","=",">","?","@","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","[","]","^","_","`","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","{","|","}","~","€","‘","’","’","“","”","–","—","¡","¢","£","¤","¥","¦","§","¨","©","ª","«","¬","®","¯","°","±","²","³","´","µ","¶","·","¸","¹","º","»","¼","½","¾","¿","À","Á","Â","Ã","Ä","Å","Æ","Ç","È","É","Ê","Ë","Ì","Í","Î","Ï","Ð","Ñ","Ò","Ó","Ô","&Otil
de;","Ö","×","Ø","Ù","Ú","Û","Ü","Ý","Þ","ß","à","á","â","ã","ä","å","æ","ç","è","é","ê","ë","ì","í","î","ï","ð","ñ","ò","ó","ô","õ","ö","÷","ø","ù","ú","û","ü","ü","ý","þ","ÿ","Œ","œ","Ŵ","Ŷ","ŵ","ŷ","‚","‛","„","…","™","►","•","→","⇒","⇔","♦","≈"] ;
var cols = 20 ;
Index: fck_form.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_form.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_form.html 9 Feb 2008 12:53:57 -0000 1.4
--- fck_form.html 5 May 2008 00:35:24 -0000 1.5
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 30,39 ****
<script type="text/javascript">
! var oEditor = window.parent.InnerDialogLoaded() ;
// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;
! var oActiveEl = oEditor.FCKSelection.MoveToAncestorNode( 'FORM' ) ;
window.onload = function()
--- 30,40 ----
<script type="text/javascript">
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;
! var oActiveEl = dialog.Selection.GetSelection().MoveToAncestorNode( 'FORM' ) ;
window.onload = function()
***************
*** 51,56 ****
oActiveEl = null ;
! window.parent.SetOkButton( true ) ;
! window.parent.SetAutoSize( true ) ;
}
--- 52,58 ----
oActiveEl = null ;
! dialog.SetOkButton( true ) ;
! dialog.SetAutoSize( true ) ;
! SelectField( 'txtName' ) ;
}
Index: fck_select.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_select.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_select.html 9 Feb 2008 12:53:57 -0000 1.4
--- fck_select.html 5 May 2008 00:35:24 -0000 1.5
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 31,40 ****
<script type="text/javascript">
! var oEditor = window.parent.InnerDialogLoaded() ;
// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;
! var oActiveEl = oEditor.FCKSelection.GetSelectedElement() ;
var oListText ;
--- 31,41 ----
<script type="text/javascript">
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;
! var oActiveEl = dialog.Selection.GetSelectedElement() ;
var oListText ;
***************
*** 49,52 ****
--- 50,57 ----
oListValue = document.getElementById( 'cmbValue' ) ;
+ // Fix the lists widths. (Bug #970)
+ oListText.style.width = oListText.offsetWidth ;
+ oListValue.style.width = oListValue.offsetWidth ;
+
if ( oActiveEl && oActiveEl.tagName == 'SELECT' )
{
***************
*** 69,74 ****
oActiveEl = null ;
! window.parent.SetOkButton( true ) ;
! window.parent.SetAutoSize( true ) ;
}
--- 74,80 ----
oActiveEl = null ;
! dialog.SetOkButton( true ) ;
! dialog.SetAutoSize( true ) ;
! SelectField( 'txtName' ) ;
}
***************
*** 76,90 ****
{
oEditor.FCKUndo.SaveUndoStep() ;
!
var sSize = GetE('txtLines').value ;
if ( sSize == null || isNaN( sSize ) || sSize <= 1 )
sSize = '' ;
! if ( !oActiveEl )
! {
! oActiveEl = oEditor.FCK.InsertElement( 'select' ) ;
! }
- SetAttribute( oActiveEl, 'name' , GetE('txtName').value ) ;
SetAttribute( oActiveEl, 'size' , sSize ) ;
oActiveEl.multiple = ( sSize.length > 0 && GetE('chkMultiple').checked ) ;
--- 82,92 ----
{
oEditor.FCKUndo.SaveUndoStep() ;
!
var sSize = GetE('txtLines').value ;
if ( sSize == null || isNaN( sSize ) || sSize <= 1 )
sSize = '' ;
! oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'SELECT', {name: GetE('txtName').value} ) ;
SetAttribute( oActiveEl, 'size' , sSize ) ;
oActiveEl.multiple = ( sSize.length > 0 && GetE('chkMultiple').checked ) ;
Index: fck_textarea.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_textarea.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_textarea.html 9 Feb 2008 12:53:57 -0000 1.4
--- fck_textarea.html 5 May 2008 00:35:24 -0000 1.5
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 30,39 ****
<script type="text/javascript">
! var oEditor = window.parent.InnerDialogLoaded() ;
// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;
! var oActiveEl = oEditor.FCKSelection.GetSelectedElement() ;
window.onload = function()
--- 30,40 ----
<script type="text/javascript">
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;
! var oActiveEl = dialog.Selection.GetSelectedElement() ;
window.onload = function()
***************
*** 51,56 ****
oActiveEl = null ;
! window.parent.SetOkButton( true ) ;
! window.parent.SetAutoSize( true ) ;
}
--- 52,58 ----
oActiveEl = null ;
! dialog.SetOkButton( true ) ;
! dialog.SetAutoSize( true ) ;
! SelectField( 'txtName' ) ;
}
***************
*** 58,68 ****
{
oEditor.FCKUndo.SaveUndoStep() ;
-
- if ( !oActiveEl )
- {
- oActiveEl = oEditor.FCK.InsertElement( 'textarea' ) ;
- }
! oActiveEl.name = GetE('txtName').value ;
SetAttribute( oActiveEl, 'cols', GetE('txtCols').value ) ;
SetAttribute( oActiveEl, 'rows', GetE('txtRows').value ) ;
--- 60,66 ----
{
oEditor.FCKUndo.SaveUndoStep() ;
! oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'TEXTAREA', {name: GetE('txtName').value} ) ;
!
SetAttribute( oActiveEl, 'cols', GetE('txtCols').value ) ;
SetAttribute( oActiveEl, 'rows', GetE('txtRows').value ) ;
Index: fck_flash.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_flash.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_flash.html 9 Feb 2008 12:53:57 -0000 1.4
--- fck_flash.html 5 May 2008 00:35:24 -0000 1.5
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 29,33 ****
<script src="common/fck_dialog_common.js" type="text/javascript"></script>
<script src="fck_flash/fck_flash.js" type="text/javascript"></script>
! <link href="common/fck_dialog_common.css" type="text/css" rel="stylesheet">
</head>
<body scroll="no" style="OVERFLOW: hidden">
--- 29,37 ----
<script src="common/fck_dialog_common.js" type="text/javascript"></script>
<script src="fck_flash/fck_flash.js" type="text/javascript"></script>
! <script type="text/javascript">
!
! document.write( FCKTools.GetStyleHtml( GetCommonDialogCss() ) ) ;
!
! </script>
</head>
<body scroll="no" style="OVERFLOW: hidden">
***************
*** 93,97 ****
<br />
<input id="btnUpload" type="submit" value="Send it to the Server" fckLang="DlgLnkBtnUpload" />
! <iframe name="UploadWindow" style="DISPLAY: none" src="javascript:void(0)"></iframe>
</form>
</div>
--- 97,103 ----
<br />
<input id="btnUpload" type="submit" value="Send it to the Server" fckLang="DlgLnkBtnUpload" />
! <script type="text/javascript">
! document.write( '<iframe name="UploadWindow" style="DISPLAY: none" src="' + FCKTools.GetVoidUrl() + '"></iframe>' ) ;
! </script>
</form>
</div>
Index: fck_source.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_source.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_source.html 9 Feb 2008 12:53:57 -0000 1.4
--- fck_source.html 5 May 2008 00:35:24 -0000 1.5
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 27,31 ****
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="robots" content="noindex, nofollow">
! <link href="common/fck_dialog_common.css" rel="stylesheet" type="text/css" />
<script language="javascript">
--- 27,31 ----
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="robots" content="noindex, nofollow">
! <script src="common/fck_dialog_common.js" type="text/javascript"></script>
<script language="javascript">
***************
*** 33,36 ****
--- 33,39 ----
var FCK = oEditor.FCK ;
var FCKConfig = oEditor.FCKConfig ;
+ var FCKTools = oEditor.FCKTools ;
+
+ document.write( FCKTools.GetStyleHtml( GetCommonDialogCss() ) ) ;
window.onload = function()
Index: fck_paste.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_paste.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fck_paste.html 9 Feb 2008 12:53:57 -0000 1.5
--- fck_paste.html 5 May 2008 00:35:24 -0000 1.6
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 29,38 ****
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="robots" content="noindex, nofollow" />
!
<script type="text/javascript">
! var oEditor = window.parent.InnerDialogLoaded() ;
var FCK = oEditor.FCK;
var FCKTools = oEditor.FCKTools ;
var FCKConfig = oEditor.FCKConfig ;
window.onload = function ()
--- 29,40 ----
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="robots" content="noindex, nofollow" />
! <script src="common/fck_dialog_common.js" type="text/javascript"></script>
<script type="text/javascript">
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
var FCK = oEditor.FCK;
var FCKTools = oEditor.FCKTools ;
var FCKConfig = oEditor.FCKConfig ;
+ var FCKBrowserInfo = oEditor.FCKBrowserInfo ;
window.onload = function ()
***************
*** 41,45 ****
oEditor.FCKLanguageManager.TranslatePage(document) ;
! var sPastingType = window.parent.dialogArguments.CustomValue ;
if ( sPastingType == 'Word' || sPastingType == 'Security' )
--- 43,47 ----
oEditor.FCKLanguageManager.TranslatePage(document) ;
! var sPastingType = dialog.Args().CustomValue ;
if ( sPastingType == 'Word' || sPastingType == 'Security' )
***************
*** 48,67 ****
document.getElementById( 'xSecurityMsg' ).style.display = '' ;
! var oFrame = document.getElementById('frmData') ;
! oFrame.style.display = '' ;
! // Avoid errors if the pasted content has any script that fails: #389
! var oDoc = oFrame.contentWindow.document ;
! oDoc.open() ;
! oDoc.write('<html><head><script>window.onerror = function() { return true ; };<\/script><\/head><body><\/body><\/html>') ;
! oDoc.close() ;
!
! if ( oFrame.contentDocument )
! oFrame.contentDocument.designMode = 'on' ;
! else
! oFrame.contentWindow.document.body.contentEditable = true ;
! // Set the focus on the pasting area
! oFrame.contentWindow.focus();
}
else
--- 50,87 ----
document.getElementById( 'xSecurityMsg' ).style.display = '' ;
! // For document.domain compatibility (#123) we must do all the magic in
! // the URL for IE.
! var sFrameUrl = !oEditor.FCK_IS_CUSTOM_DOMAIN || !FCKBrowserInfo.IsIE ?
! 'javascript:void(0)' :
! 'javascript:void( (function(){' +
! 'document.open() ;' +
! 'document.domain=\'' + document.domain + '\' ;' +
! 'document.write(\'<html><head><script>window.onerror = function() { return true ; };<\/script><\/head><body><\/body><\/html>\') ;' +
! 'document.close() ;' +
! 'document.body.contentEditable = true ;' +
! 'window.focus() ;' +
! '})() )' ;
! var eFrameSpace = document.getElementById( 'xFrameSpace' ) ;
! eFrameSpace.innerHTML = '<iframe id="frmData" src="' + sFrameUrl + '" ' +
! 'height="98%" width="99%" frameborder="0" style="border: #000000 1px; background-color: #ffffff"></iframe>' ;
! var oFrame = eFrameSpace.firstChild ;
!
! if ( !oEditor.FCK_IS_CUSTOM_DOMAIN || !FCKBrowserInfo.IsIE )
! {
! // Avoid errors if the pasted content has any script that fails: #389
! var oDoc = oFrame.contentWindow.document ;
! oDoc.open() ;
! oDoc.write('<html><head><script>window.onerror = function() { return true ; };<\/script><\/head><body><\/body><\/html>') ;
! oDoc.close() ;
!
! if ( FCKBrowserInfo.IsIE )
! oDoc.body.contentEditable = true ;
! else
! oDoc.designMode = 'on' ;
!
! oFrame.contentWindow.focus();
! }
}
else
***************
*** 73,78 ****
document.getElementById('oWordCommands').style.display = 'none' ;
! window.parent.SetOkButton( true ) ;
! window.parent.SetAutoSize( true ) ;
}
--- 93,98 ----
document.getElementById('oWordCommands').style.display = 'none' ;
! dialog.SetOkButton( true ) ;
! dialog.SetAutoSize( true ) ;
}
***************
*** 84,88 ****
var sHtml ;
! var sPastingType = window.parent.dialogArguments.CustomValue ;
if ( sPastingType == 'Word' || sPastingType == 'Security' )
--- 104,108 ----
var sHtml ;
! var sPastingType = dialog.Args().CustomValue ;
if ( sPastingType == 'Word' || sPastingType == 'Security' )
***************
*** 120,123 ****
--- 140,144 ----
var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
var oDoc = oEditor.FCK.EditorDocument ;
+ dialog.Selection.EnsureSelection() ;
range.MoveToSelection() ;
range.DeleteContents() ;
***************
*** 158,172 ****
}
- function CleanUpBox()
- {
- var oFrame = document.getElementById('frmData') ;
-
- if ( oFrame.contentDocument )
- oFrame.contentDocument.body.innerHTML = '' ;
- else
- oFrame.contentWindow.document.body.innerHTML = '' ;
- }
-
-
// This function will be called from the PasteFromWord dialog (fck_paste.html)
// Input: oNode a DOM node that contains the raw paste from the clipboard
--- 179,182 ----
***************
*** 307,337 ****
</tr>
<tr>
! <td valign="top" height="100%" style="border-right: #000000 1px solid; border-top: #000000 1px solid;
! border-left: #000000 1px solid; border-bottom: #000000 1px solid">
<textarea id="txtData" cols="80" rows="5" style="border: #000000 1px; display: none;
width: 99%; height: 98%"></textarea>
- <iframe id="frmData" src="javascript:void(0)" height="98%" width="99%" frameborder="0"
- style="border-right: #000000 1px; border-top: #000000 1px; display: none; border-left: #000000 1px;
- border-bottom: #000000 1px; background-color: #ffffff"></iframe>
</td>
</tr>
<tr id="oWordCommands">
<td>
! <table border="0" cellpadding="0" cellspacing="0" width="100%">
! <tr>
! <td nowrap="nowrap">
! <input id="chkRemoveFont" type="checkbox" checked="checked" />
! <label for="chkRemoveFont" fcklang="DlgPasteIgnoreFont">
! Ignore Font Face definitions</label>
! <br />
! <input id="chkRemoveStyles" type="checkbox" />
! <label for="chkRemoveStyles" fcklang="DlgPasteRemoveStyles">
! Remove Styles definitions</label>
! </td>
! <td align="right" valign="top">
! <input type="button" fcklang="DlgPasteCleanBox" value="Clean Up Box" onclick="CleanUpBox()" />
! </td>
! </tr>
! </table>
</td>
</tr>
--- 317,336 ----
</tr>
<tr>
! <td id="xFrameSpace" valign="top" height="100%" style="border: #000000 1px solid">
<textarea id="txtData" cols="80" rows="5" style="border: #000000 1px; display: none;
width: 99%; height: 98%"></textarea>
</td>
</tr>
<tr id="oWordCommands">
<td>
!
! <input id="chkRemoveFont" type="checkbox" checked="checked" />
! <label for="chkRemoveFont" fcklang="DlgPasteIgnoreFont">
! Ignore Font Face definitions</label>
! <br />
! <input id="chkRemoveStyles" type="checkbox" />
! <label for="chkRemoveStyles" fcklang="DlgPasteRemoveStyles">
! Remove Styles definitions</label>
!
</td>
</tr>
Index: fck_anchor.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_anchor.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_anchor.html 9 Feb 2008 12:53:57 -0000 1.6
--- fck_anchor.html 5 May 2008 00:35:24 -0000 1.7
***************
*** 2,6 ****
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 30,43 ****
<script type="text/javascript">
! var oEditor = window.parent.InnerDialogLoaded() ;
! var FCK = oEditor.FCK ;
! var FCKBrowserInfo = oEditor.FCKBrowserInfo ;
! var FCKTools = oEditor.FCKTools ;
! var FCKRegexLib = oEditor.FCKRegexLib ;
! // Gets the document DOM
! var oDOM = oEditor.FCK.EditorDocument ;
- var oFakeImage = FCK.Selection.GetSelectedElement() ;
var oAnchor ;
--- 30,45 ----
<script type="text/javascript">
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
! var FCK = oEditor.FCK ;
! var FCKBrowserInfo = oEditor.FCKBrowserInfo ;
! var FCKTools = oEditor.FCKTools ;
! var FCKRegexLib = oEditor.FCKRegexLib ;
!
! var oDOM = FCK.EditorDocument ;
!
! var oFakeImage = dialog.Selection.GetSelectedElement() ;
var oAnchor ;
***************
*** 70,73 ****
--- 72,77 ----
window.parent.SetOkButton( true ) ;
window.parent.SetAutoSize( true ) ;
+
+ SelectField( 'txtName' ) ;
}
More information about the geeklog-cvs
mailing list