Context Navigation

← Previous Changeset
Next Changeset →

Changeset 361

Timestamp:

2007-06-03 23:57:27 (2 years ago)

Author:

fredck

Message:

Merged trunk r220:359 (except [302], [306], [308] and [358]) into branches/versions/2.4.x. Final commit for the pre-release of version 2.4.3 for public testing.

Location:

FCKeditor/branches/versions/2.4.x

Files:

: 72 modified
: 5 copied

_dev/browserbugs/firefox/unlink.html (copied) (copied from FCKeditor/trunk/_dev/browserbugs/firefox/unlink.html)
_dev/browserbugs/opera/embed (copied) (copied from FCKeditor/trunk/_dev/browserbugs/opera/embed)
_dev/browserbugs/opera/embed/embed.html (copied) (copied from FCKeditor/trunk/_dev/browserbugs/opera/embed/embed.html)
_dev/browserbugs/opera/embed/flash.swf (copied) (copied from FCKeditor/trunk/_dev/browserbugs/opera/embed/flash.swf)
_dev/build_release.bat (modified) (2 diffs)
_dev/releaser/fckreleaser.php (modified) (2 diffs)
editor/css/fck_internal.css (modified) (2 diffs)
editor/dialog/fck_anchor.html (modified) (1 diff)
editor/dialog/fck_flash/fck_flash.js (modified) (4 diffs)
editor/dialog/fck_image/fck_image.js (modified) (5 diffs)
editor/dialog/fck_link/fck_link.js (modified) (4 diffs)
editor/dialog/fck_listprop.html (modified) (1 diff)
editor/dialog/fck_paste.html (modified) (1 diff)
editor/dialog/fck_select/fck_select.js (modified) (3 diffs)
editor/dialog/fck_select.html (modified) (1 diff)
editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm (modified) (3 diffs)
editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php (modified) (1 diff)
editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl (modified) (1 diff)
editor/dialog/fck_table.html (modified) (2 diffs)
editor/filemanager/browser/default/connectors/asp/class_upload.asp (modified) (17 diffs)
editor/filemanager/browser/default/connectors/asp/config.asp (modified) (1 diff)
editor/filemanager/browser/default/connectors/aspx/connector.aspx (modified) (1 diff)
editor/filemanager/browser/default/connectors/cfm/config.cfm (modified) (1 diff)
editor/filemanager/browser/default/connectors/cfm/connector.cfm (modified) (3 diffs)
editor/filemanager/browser/default/connectors/lasso/config.lasso (modified) (2 diffs)
editor/filemanager/browser/default/connectors/php/basexml.php (modified) (3 diffs)
editor/filemanager/browser/default/connectors/php/config.php (modified) (1 diff)
editor/filemanager/browser/default/connectors/php/io.php (modified) (2 diffs)
editor/filemanager/browser/default/connectors/php/util.php (modified) (1 diff)
editor/filemanager/browser/default/connectors/py/connector.py (modified) (1 diff)
editor/filemanager/browser/default/frmresourceslist.html (modified) (2 diffs)
editor/filemanager/browser/default/js/fckxml.js (modified) (1 diff)
editor/filemanager/upload/asp/class_upload.asp (modified) (17 diffs)
editor/filemanager/upload/asp/config.asp (modified) (1 diff)
editor/filemanager/upload/aspx/upload.aspx (modified) (1 diff)
editor/filemanager/upload/cfm/config.cfm (modified) (2 diffs)
editor/filemanager/upload/cfm/upload.cfm (modified) (1 diff)
editor/filemanager/upload/lasso/config.lasso (modified) (1 diff)
editor/filemanager/upload/php/config.php (modified) (1 diff)
editor/filemanager/upload/php/upload.php (modified) (2 diffs)
editor/lang/ca.js (modified) (9 diffs)
editor/lang/et.js (modified) (10 diffs)
editor/lang/fa.js (modified) (8 diffs)
editor/lang/nb.js (modified) (1 diff)
editor/lang/no.js (modified) (1 diff)
editor/lang/sv.js (modified) (8 diffs)
editor/lang/_translationstatus.txt (modified) (3 diffs)
editor/lang/uk.js (modified) (2 diffs)
editor/plugins/placeholder/lang/fr.js (modified) (1 diff)
editor/_source/classes/fckcontextmenu.js (modified) (3 diffs)
editor/_source/classes/fckenterkey.js (modified) (2 diffs)
editor/_source/classes/fckicon.js (modified) (1 diff)
editor/_source/classes/fckpanel.js (modified) (1 diff)
editor/_source/classes/fckspecialcombo.js (modified) (1 diff)
editor/_source/commandclasses/fck_othercommands.js (modified) (2 diffs)
editor/_source/commandclasses/fcktextcolorcommand.js (modified) (1 diff)
editor/_source/internals/fckbrowserinfo.js (modified) (1 diff)
editor/_source/internals/fckconfig.js (modified) (1 diff)
editor/_source/internals/fck_contextmenu.js (modified) (1 diff)
editor/_source/internals/fckdocumentprocessor.js (modified) (2 diffs)
editor/_source/internals/fckdomtools.js (modified) (1 diff)
editor/_source/internals/fck_gecko.js (modified) (3 diffs)
editor/_source/internals/fck_ie.js (modified) (4 diffs)
editor/_source/internals/fck.js (modified) (5 diffs)
editor/_source/internals/fcklistslib.js (modified) (1 diff)
editor/_source/internals/fckregexlib.js (modified) (2 diffs)
editor/_source/internals/fckselection_ie.js (modified) (8 diffs)
editor/_source/internals/fcktoolbarset.js (modified) (2 diffs)
editor/_source/internals/fckxhtml_ie.js (modified) (1 diff)
editor/_source/internals/fckxhtml.js (modified) (1 diff)
fckconfig.js (modified) (4 diffs)
fckeditor.asp (modified) (1 diff)
fckeditor.cfc (modified) (1 diff)
fckeditor.cfm (modified) (1 diff)
fckeditor.js (modified) (1 diff)
htaccess.txt (copied) (copied from FCKeditor/trunk/htaccess.txt)
_whatsnew.html (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

FCKeditor/branches/versions/2.4.x/_dev/build_release.bat

r239	r361
26	26
27	27	:: Update this variable for each new release.
28		SET RELEASER_VERSION=2.4.2
	28	SET RELEASER_VERSION=2.4.3 Beta
29	29
30	30	CLS
…	…
39	39	IF (%RELEASER_PATH%)==() SET RELEASER_PATH=../../fckeditor.release/
40	40
41		php releaser/fckreleaser.php ../ "%~~FCK_~~RELEASER_PATH%" "%RELEASER_VERSION%"
	41	php releaser/fckreleaser.php ../ "%RELEASER_PATH%" "%RELEASER_VERSION%"
42	42
43	43	:End

FCKeditor/branches/versions/2.4.x/_dev/releaser/fckreleaser.php

r239	r361
1		#!/usr/bin/php -q
	1	#!/usr/bin/php -q
2	2	<?php
3	3	/*
…	…
768	768
769	769	// Each file terminates with a CRLF, even if compressed.
770		$outputData .= "\n" ;
	770	$outputData .= "\r\n" ;
771	771	}
772	772

FCKeditor/branches/versions/2.4.x/editor/css/fck_internal.css

r213	r361
43	43	.FCK__Flash
44	44	{
45		border: ~~darkgray~~ 1px solid;
	45	border: #a9a9a9 1px solid;
46	46	background-position: center center;
47	47	background-image: url(images/fck_flashlogo.gif);
…	…
67	67	{
68	68	border: 1px dotted #00F;
69		background-position: 1 center;
	69	background-position: 1px center;
70	70	background-image: url(images/fck_anchor.gif);
71	71	background-repeat: no-repeat;

FCKeditor/branches/versions/2.4.x/editor/dialog/fck_anchor.html

r133	r361
111	111
112	112	// Create a new anchor preserving the current selection
113		oAnchor = oEditor.FCK.CreateLink( '#' ) ;
114		if ( !oAnchor )
	113	var aNewAnchors = oEditor.FCK.CreateLink( '#' ) ;
	114
	115	if ( aNewAnchors.length == 0 )
115	116	{
116	117	// Nothing was selected, so now just create a normal A
117		~~oAnchor = oEditor.FCK.CreateElement( 'a'~~ ) ;
	118	aNewAnchors.push( oEditor.FCK.CreateElement( 'a' ) ) ;
118	119	}
119	120	else
120	121	{
121	122	// Remove the fake href
122		oAnchor.removeAttribute( 'href' ) ;
123		}
124		// Set the name
125		oAnchor.name = sNewName ;
126
127		// IE does require special processing to show the Anchor's image
128		// Opera doesn't allow to select empty anchors
129		if ( FCKBrowserInfo.IsIE \|\| FCKBrowserInfo.IsOpera )
130		{
131		if ( oAnchor.innerHTML != '' )
	123	for ( var i = 0 ; i < aNewAnchors.length ; i++ )
	124	aNewAnchors[i].removeAttribute( 'href' ) ;
	125	}
	126
	127	// More than one anchors may have been created, so interact through all of them (see #220).
	128	for ( var i = 0 ; i < aNewAnchors.length ; i++ )
	129	{
	130	oAnchor = aNewAnchors[i] ;
	131
	132	// Set the name
	133	oAnchor.name = sNewName ;
	134
	135	// IE does require special processing to show the Anchor's image
	136	// Opera doesn't allow to select empty anchors
	137	if ( FCKBrowserInfo.IsIE \|\| FCKBrowserInfo.IsOpera )
132	138	{
133		if ( FCKBrowserInfo.IsIE )
134		oAnchor.className += ' FCK__AnchorC' ;
	139	if ( oAnchor.innerHTML != '' )
	140	{
	141	if ( FCKBrowserInfo.IsIE )
	142	oAnchor.className += ' FCK__AnchorC' ;
	143	}
	144	else
	145	{
	146	// Create a fake image for both IE and Opera
	147	var oImg = oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__Anchor', oAnchor.cloneNode(true) ) ;
	148	oImg.setAttribute( '_fckanchor', 'true', 0 ) ;
	149
	150	oAnchor.parentNode.insertBefore( oImg, oAnchor ) ;
	151	oAnchor.parentNode.removeChild( oAnchor ) ;
	152	}
	153
135	154	}
136		~~else~~
137		{
138		~~// Create a fake image for both IE and Opera~~
139		~~var oImg = oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__Anchor', oAnchor.cloneNode(true) ) ;~~
140		~~oImg.setAttribute( '_fckanchor', 'true', 0 ) ;~~
141
142		~~oAnchor.parentNode.insertBefore( oImg, oAnchor ) ;~~
143		~~oAnchor.parentNode.removeChild( oAnchor ) ;~~
144		}
145
146	155	}
147	156

FCKeditor/branches/versions/2.4.x/editor/dialog/fck_flash/fck_flash.js

r133	r361
82	82	{
83	83	if ( ! oEmbed ) return ;
84
85		~~var sUrl = GetAttribute( oEmbed, 'src', '' ) ;~~
86	84
87	85	GetE('txtUrl').value = GetAttribute( oEmbed, 'src', '' ) ;
…	…
106	104	{
107	105	GetE('txtAttClasses').value = oEmbed.getAttribute('class',2) \|\| '' ;
108		GetE('txtAttStyle').value = oEmbed.getAttribute('style',2) ;
	106	GetE('txtAttStyle').value = oEmbed.getAttribute('style',2) \|\| '' ;
109	107	}
110	108
…	…
151	149	SetAttribute( e, 'pluginspage' , 'http://www.macromedia.com/go/getflashplayer' ) ;
152	150
153		~~e.src = GetE('txtUrl').value~~ ;
	151	SetAttribute( e, 'src', GetE('txtUrl').value ) ;
154	152	SetAttribute( e, "width" , GetE('txtWidth').value ) ;
155	153	SetAttribute( e, "height", GetE('txtHeight').value ) ;
…	…
203	201	var e = oDoc.createElement( 'EMBED' ) ;
204	202
205		~~e.src = GetE('txtUrl').value~~ ;
206		~~e.type = 'application/x-shockwave-flash'~~ ;
207		~~e.width = '100%'~~ ;
208		~~e.height = '100%'~~ ;
	203	SetAttribute( e, 'src', GetE('txtUrl').value ) ;
	204	SetAttribute( e, 'type', 'application/x-shockwave-flash' ) ;
	205	SetAttribute( e, 'width', '100%' ) ;
	206	SetAttribute( e, 'height', '100%' ) ;
209	207
210	208	ePreview.appendChild( e ) ;

FCKeditor/branches/versions/2.4.x/editor/dialog/fck_image/fck_image.js

r133	r361
144	144	iWidth = aMatchW[1] ;
145	145	oImage.style.width = '' ;
	146	SetAttribute( oImage, 'width' , iWidth ) ;
146	147	}
147	148	}
…	…
154	155	iHeight = aMatchH[1] ;
155	156	oImage.style.height = '' ;
	157	SetAttribute( oImage, 'height', iHeight ) ;
156	158	}
157	159	}
…	…
169	171	if ( oEditor.FCKBrowserInfo.IsIE )
170	172	{
171		GetE('txtAttClasses').value = oImage.~~getAttribute('className')~~ \|\| '' ;
	173	GetE('txtAttClasses').value = oImage.className \|\| '' ;
172	174	GetE('txtAttStyle').value = oImage.style.cssText ;
173	175	}
…	…
249	251	oEditor.FCKSelection.SelectNode( oImage ) ;
250	252
251		oLink = oEditor.FCK.CreateLink( sLnkUrl ) ;
	253	oLink = oEditor.FCK.CreateLink( sLnkUrl )[0] ;
252	254
253	255	if ( !bHasImage )
…	…
285	287	SetAttribute( e, 'lang' , GetE('txtAttLangCode').value ) ;
286	288	SetAttribute( e, 'title' , GetE('txtAttTitle').value ) ;
287		~~SetAttribute( e, 'class' , GetE('txtAttClasses').value ) ;~~
288	289	SetAttribute( e, 'longDesc' , GetE('txtLongDesc').value ) ;
289	290
290	291	if ( oEditor.FCKBrowserInfo.IsIE )
	292	{
	293	e.className = GetE('txtAttClasses').value ;
291	294	e.style.cssText = GetE('txtAttStyle').value ;
292		else
	295	}
	296	else
	297	{
	298	SetAttribute( e, 'class' , GetE('txtAttClasses').value ) ;
293	299	SetAttribute( e, 'style', GetE('txtAttStyle').value ) ;
	300	}
294	301	}
295	302

FCKeditor/branches/versions/2.4.x/editor/dialog/fck_link/fck_link.js

r213	r361
152	152	GetE('frmUpload').action = FCKConfig.LinkUploadURL ;
153	153
	154	// Set the default target (from configuration).
	155	SetDefaultTarget() ;
	156
154	157	// Activate the "OK" button.
155	158	window.parent.SetOkButton( true ) ;
…	…
500	503	}
501	504
502		// No link selected, so try to create one.
503		if ( !oLink )
504		oLink = oEditor.FCK.CreateLink( sUri ) ;
505
506		if ( oLink )
507		sInnerHtml = oLink.innerHTML ; // Save the innerHTML (IE changes it if it is like an URL).
508		else
509		{
510		// If no selection, use the uri as the link text (by dom, 2006-05-26)
511
	505	// If no link is selected, create a new one (it may result in more than one link creation - #220).
	506	var aLinks = oLink ? [ oLink ] : oEditor.FCK.CreateLink( sUri ) ;
	507
	508	// If no selection, no links are created, so use the uri as the link text (by dom, 2006-05-26)
	509	var aHasSelection = ( aLinks.length > 0 ) ;
	510	if ( !aHasSelection )
	511	{
512	512	sInnerHtml = sUri;
513	513
…	…
535	535
536	536	// Create a new (empty) anchor.
537		~~oLink = oEditor.FCK.CreateElement( 'a' )~~ ;
	537	aLinks = [ oEditor.FCK.CreateElement( 'a' ) ] ;
538	538	}
539	539
540	540	oEditor.FCKUndo.SaveUndoStep() ;
541	541
542		oLink.href = sUri ;
543		SetAttribute( oLink, '_fcksavedurl', sUri ) ;
544
545		// Accesible popups
546		if( GetE('cmbTarget').value == 'popup' )
547		{
548		SetAttribute( oLink, 'onclick_fckprotectedatt', " onclick=\"" + BuildOnClickPopup() + "\"") ;
549		}
550		else
551		{
552		// Check if the previous onclick was for a popup:
553		// In that case remove the onclick handler.
554		var onclick = oLink.getAttribute( 'onclick_fckprotectedatt' ) ;
555		if( oRegex.OnClickPopup.test( onclick ) )
556		SetAttribute( oLink, 'onclick_fckprotectedatt', '' ) ;
557		}
558
559		oLink.innerHTML = sInnerHtml ; // Set (or restore) the innerHTML
560
561		// Target
562		if( GetE('cmbTarget').value != 'popup' )
563		SetAttribute( oLink, 'target', GetE('txtTargetFrame').value ) ;
564		else
565		SetAttribute( oLink, 'target', null ) ;
566
567		// Advances Attributes
568		SetAttribute( oLink, 'id' , GetE('txtAttId').value ) ;
569		SetAttribute( oLink, 'name' , GetE('txtAttName').value ) ;
570		SetAttribute( oLink, 'dir' , GetE('cmbAttLangDir').value ) ;
571		SetAttribute( oLink, 'lang' , GetE('txtAttLangCode').value ) ;
572		SetAttribute( oLink, 'accesskey', GetE('txtAttAccessKey').value ) ;
573		SetAttribute( oLink, 'tabindex' , ( GetE('txtAttTabIndex').value > 0 ? GetE('txtAttTabIndex').value : null ) ) ;
574		SetAttribute( oLink, 'title' , GetE('txtAttTitle').value ) ;
575		SetAttribute( oLink, 'type' , GetE('txtAttContentType').value ) ;
576		SetAttribute( oLink, 'charset' , GetE('txtAttCharSet').value ) ;
577
578		if ( oEditor.FCKBrowserInfo.IsIE )
579		{
580		var sClass = GetE('txtAttClasses').value ;
581		// If it's also an anchor add an internal class
582		if ( GetE('txtAttName').value.length != 0 )
583		sClass += ' FCK__AnchorC' ;
584		SetAttribute( oLink, 'className', sClass ) ;
585
586		oLink.style.cssText = GetE('txtAttStyle').value ;
587		}
588		else
589		{
590		SetAttribute( oLink, 'class', GetE('txtAttClasses').value ) ;
591		SetAttribute( oLink, 'style', GetE('txtAttStyle').value ) ;
592		}
593
594		// Select the link.
595		oEditor.FCKSelection.SelectNode(oLink);
	542	for ( var i = 0 ; i < aLinks.length ; i++ )
	543	{
	544	oLink = aLinks[i] ;
	545
	546	if ( aHasSelection )
	547	sInnerHtml = oLink.innerHTML ; // Save the innerHTML (IE changes it if it is like an URL).
	548
	549	oLink.href = sUri ;
	550	SetAttribute( oLink, '_fcksavedurl', sUri ) ;
	551
	552	// Accesible popups
	553	if( GetE('cmbTarget').value == 'popup' )
	554	{
	555	SetAttribute( oLink, 'onclick_fckprotectedatt', " onclick=\"" + BuildOnClickPopup() + "\"") ;
	556	}
	557	else
	558	{
	559	// Check if the previous onclick was for a popup:
	560	// In that case remove the onclick handler.
	561	var onclick = oLink.getAttribute( 'onclick_fckprotectedatt' ) ;
	562	if( oRegex.OnClickPopup.test( onclick ) )
	563	SetAttribute( oLink, 'onclick_fckprotectedatt', '' ) ;
	564	}
	565
	566	oLink.innerHTML = sInnerHtml ; // Set (or restore) the innerHTML
	567
	568	// Target
	569	if( GetE('cmbTarget').value != 'popup' )
	570	SetAttribute( oLink, 'target', GetE('txtTargetFrame').value ) ;
	571	else
	572	SetAttribute( oLink, 'target', null ) ;
	573
	574	// Let's set the "id" only for the first link to avoid duplication.
	575	if ( i == 0 )
	576	SetAttribute( oLink, 'id', GetE('txtAttId').value ) ;
	577
	578	// Advances Attributes
	579	SetAttribute( oLink, 'name' , GetE('txtAttName').value ) ;
	580	SetAttribute( oLink, 'dir' , GetE('cmbAttLangDir').value ) ;
	581	SetAttribute( oLink, 'lang' , GetE('txtAttLangCode').value ) ;
	582	SetAttribute( oLink, 'accesskey', GetE('txtAttAccessKey').value ) ;
	583	SetAttribute( oLink, 'tabindex' , ( GetE('txtAttTabIndex').value > 0 ? GetE('txtAttTabIndex').value : null ) ) ;
	584	SetAttribute( oLink, 'title' , GetE('txtAttTitle').value ) ;
	585	SetAttribute( oLink, 'type' , GetE('txtAttContentType').value ) ;
	586	SetAttribute( oLink, 'charset' , GetE('txtAttCharSet').value ) ;
	587
	588	if ( oEditor.FCKBrowserInfo.IsIE )
	589	{
	590	var sClass = GetE('txtAttClasses').value ;
	591	// If it's also an anchor add an internal class
	592	if ( GetE('txtAttName').value.length != 0 )
	593	sClass += ' FCK__AnchorC' ;
	594	SetAttribute( oLink, 'className', sClass ) ;
	595
	596	oLink.style.cssText = GetE('txtAttStyle').value ;
	597	}
	598	else
	599	{
	600	SetAttribute( oLink, 'class', GetE('txtAttClasses').value ) ;
	601	SetAttribute( oLink, 'style', GetE('txtAttStyle').value ) ;
	602	}
	603	}
	604
	605	// Select the (first) link.
	606	oEditor.FCKSelection.SelectNode( aLinks[0] );
596	607
597	608	return true ;
…	…
663	674	return true ;
664	675	}
	676
	677	function SetDefaultTarget()
	678	{
	679	var target = FCKConfig.DefaultLinkTarget + '' ;
	680
	681	if ( oLink \|\| target.length == 0 )
	682	return ;
	683
	684	switch ( target )
	685	{
	686	case '_blank' :
	687	case '_self' :
	688	case '_parent' :
	689	case '_top' :
	690	GetE('cmbTarget').value = target ;
	691	break ;
	692	default :
	693	GetE('cmbTarget').value = 'frame' ;
	694	break ;
	695	}
	696
	697	GetE('txtTargetFrame').value = target ;
	698	}

FCKeditor/branches/versions/2.4.x/editor/dialog/fck_listprop.html

r133	r361
61	61	{
62	62	if ( oActiveEl.getAttribute('type') )
63		oActiveSel.value = oActiveEl.getAttribute('type')~~.toLowerCase()~~ ;
	63	oActiveSel.value = oActiveEl.getAttribute('type') ;
64	64	}
65	65

FCKeditor/branches/versions/2.4.x/editor/dialog/fck_paste.html

r179	r361
203	203
204	204	// Word likes to insert extra <font> tags, when using MSIE. (Wierd).
205		html = html.replace( /<(H\d)><FONT[^>]>(.?)<\/FONT><\/\1>/gi, '<$1>$2</$1>' );
206		html = html.replace( /<(H\d)><EM>(.*?)<\/EM><\/\1>/gi, '<$1>$2</$1>' );
	205	html = html.replace( /<(H\d)><FONT[^>]>(.?)<\/FONT><\/\1>/gi, '<$1>$2<\/$1>' );
	206	html = html.replace( /<(H\d)><EM>(.*?)<\/EM><\/\1>/gi, '<$1>$2<\/$1>' );
207	207	}
208	208	else

FCKeditor/branches/versions/2.4.x/editor/dialog/fck_select/fck_select.js

r133	r361
62	62	var oTxtValue = document.getElementById( "txtValue" ) ;
63	63
64		oListText.options[ iIndex ].innerHTML = ~~oTxtText.value~~ ;
	64	oListText.options[ iIndex ].innerHTML = HTMLEncode( oTxtText.value ) ;
65	65	oListText.options[ iIndex ].value = oTxtText.value ;
66	66
67		oListValue.options[ iIndex ].innerHTML = ~~oTxtValue.value~~ ;
	67	oListValue.options[ iIndex ].innerHTML = HTMLEncode( oTxtValue.value ) ;
68	68	oListValue.options[ iIndex ].value = oTxtValue.value ;
69	69
…	…
116	116
117	117	var oOption = combo.options[ iActualIndex ] ;
118		var sText = ~~oOption.innerHTML~~ ;
	118	var sText = HTMLDecode( oOption.innerHTML ) ;
119	119	var sValue = oOption.value ;
120	120
…	…
163	163	combo.options.add( oOption ) ;
164	164
165		oOption.innerHTML = optionText.length > 0 ? ~~optionText~~ : ' ' ;
	165	oOption.innerHTML = optionText.length > 0 ? HTMLEncode( optionText ) : ' ' ;
166	166	oOption.value = optionValue ;
167	167
168	168	return oOption ;
169	169	}
	170
	171	function HTMLEncode( text )
	172	{
	173	if ( !text )
	174	return '' ;
	175
	176	text = text.replace( /&/g, '&' ) ;
	177	text = text.replace( /</g, '<' ) ;
	178	text = text.replace( />/g, '>' ) ;
	179
	180	return text ;
	181	}
	182
	183
	184	function HTMLDecode( text )
	185	{
	186	if ( !text )
	187	return '' ;
	188
	189	text = text.replace( />/g, '>' ) ;
	190	text = text.replace( /</g, '<' ) ;
	191	text = text.replace( /&/g, '&' ) ;
	192
	193	return text ;
	194	}

FCKeditor/branches/versions/2.4.x/editor/dialog/fck_select.html

r133	r361
59	59	for ( var i = 0 ; i < oActiveEl.options.length ; i++ )
60	60	{
61		var sText = ~~oActiveEl.options[i].innerHTML~~ ;
	61	var sText = HTMLDecode( oActiveEl.options[i].innerHTML ) ;
62	62	var sValue = oActiveEl.options[i].value ;
63	63

FCKeditor/branches/versions/2.4.x/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm

r133	r361
13	13	The following variables values must reflect your installation needs.
14	14	--->
15		<cfset apsell_dir = "~~c:\a~~spell\bin">
	15	<cfset apsell_dir = "C:\Program Files\Aspell\bin">
16	16
17	17	<cfset lang = "en_US">
18		<cfset aspell_opts = "-a --lang=#lang# --encoding=utf-8 -H">
	18	<cfset aspell_opts = "-a --lang=#lang# --encoding=utf-8 -H --rem-sgml-check=alt">
19	19
20	20	<!--- Be sure the temporary folder exists --->
21		<cfset tempFolder = "~~c:\aspell\t~~emp">
	21	<cfset tempFolder = "C:\Windows\Temp">
22	22	<cfset tempfile = "spell_#randrange(1,10000)#">
23	23
…	…
71	71
72	72	<cfsavecontent variable="food">
73		<cfexecute name="C:\WINDOWS\SYSTEM32\cmd.exe" arguments=~~"/c type #tempFolder#\#tempfile#.txt \| #apsell_dir#\aspell #aspell_opts#"~~ timeout="100"></cfexecute>
	73	<cfexecute name="C:\WINDOWS\SYSTEM32\cmd.exe" arguments='/c type #tempFolder#\#tempfile#.txt \| "#apsell_dir#\aspell" #aspell_opts#' timeout="100"></cfexecute>
74	74	</cfsavecontent>
75	75
…	…
125	125
126	126	<cfif texts.words IS "">
127		<cfset texts.abort = "alert('Spell check complete.\n\nNo misspellings found.');#chrlf#top.window.close();">
	127	<cfset texts.abort = "alert('Spell check complete.\n\nNo misspellings found.');#crlf#top.window.close();">
128	128	</cfif>
129	129

FCKeditor/branches/versions/2.4.x/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php

r133	r361
8	8
9	9	$lang = 'en_US';
10		$aspell_opts = "-a --lang=$lang --encoding=utf-8 -H"; // by FredCK
	10	$aspell_opts = "-a --lang=$lang --encoding=utf-8 -H --rem-sgml-check=alt"; // by FredCK
11	11
12	12	$tempfiledir = "./";

FCKeditor/branches/versions/2.4.x/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl

r133	r361
13	13	my $lang = 'en_US';
14	14	# my $aspell_opts = "-a --lang=$lang --encoding=utf-8"; # by FredCK
15		my $aspell_opts = "-a --lang=$lang --encoding=utf-8 -H"; # by FredCK
	15	my $aspell_opts = "-a --lang=$lang --encoding=utf-8 -H --rem-sgml-check=alt"; # by FredCK
16	16	my $input_separator = "A";
17	17

FCKeditor/branches/versions/2.4.x/editor/dialog/fck_table.html

r133	r361
1		<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
	1	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
2	2	<!--
3	3	* FCKeditor - The text editor for Internet - http://www.fckeditor.net
…	…
131	131	}
132	132	else if ( bExists && eCaption )
133		eCaption.parentNode.removeChild( eCaption ) ;
	133	{
	134	if ( oEditor.FCKBrowserInfo.IsIE )
	135	eCaption.innerHTML = '' ; // TODO: It causes an IE internal error if using removeChild or table.deleteCaption().
	136	else
	137	eCaption.parentNode.removeChild( eCaption ) ;
	138	}
134	139
135	140	if (! bExists)

FCKeditor/branches/versions/2.4.x/editor/filemanager/browser/default/connectors/asp/class_upload.asp

r133	r361
25	25	'**********************************************
26	26	' File: NetRube_Upload.asp
27		' Version: NetRube Upload Class Version 2.~~1 Build 200502~~28
	27	' Version: NetRube Upload Class Version 2.3 Build 20070528
28	28	' Author: NetRube
29	29	' Email: NetRube@126.com
30		' Date: 0~~2/28/2005~~
	30	' Date: 05/28/2007
31	31	' Comments: The code for the Upload.
32	32	' This can free usage, but please
…	…
36	36	'**********************************************
37	37	' 文件名: NetRube_Upload.asp
38		' 版本: NetRube Upload Class Version 2.~~1 Build 200502~~28
	38	' 版本: NetRube Upload Class Version 2.3 Build 20070528
39	39	' 作者: NetRube(网络乡巴佬)
40	40	' 电子邮件: NetRube@126.com
41		' 日期: 200~~5年02~~月28日
	41	' 日期: 2007年05月28日
42	42	' 声明: 文件上传类
43	43	' 本上传类可以自由使用，但请保留此版权声明信息
…	…
51	51	Private oSourceData
52	52	Private nMaxSize, nErr, sAllowed, sDenied
53
	53
54	54	Private Sub Class_Initialize
55	55	nErr = 0
56	56	nMaxSize = 1048576
57
	57
58	58	Set File = Server.CreateObject("Scripting.Dictionary")
59	59	File.CompareMode = 1
60	60	Set Form = Server.CreateObject("Scripting.Dictionary")
61	61	Form.CompareMode = 1
62
	62
63	63	Set oSourceData = Server.CreateObject("ADODB.Stream")
64	64	oSourceData.Type = 1
…	…
66	66	oSourceData.Open
67	67	End Sub
68
	68
69	69	Private Sub Class_Terminate
70	70	Form.RemoveAll
…	…
72	72	File.RemoveAll
73	73	Set File = Nothing
74
	74
75	75	oSourceData.Close
76	76	Set oSourceData = Nothing
77	77	End Sub
78
	78
79	79	Public Property Get Version
80		Version = "NetRube Upload Class Version ~~1.0 Build 2004121~~8"
	80	Version = "NetRube Upload Class Version 2.3 Build 20070528"
81	81	End Property
82	82
…	…
84	84	ErrNum = nErr
85	85	End Property
86
	86
87	87	Public Property Let MaxSize(nSize)
88	88	nMaxSize = nSize
89	89	End Property
90
	90
91	91	Public Property Let Allowed(sExt)
92	92	sAllowed = sExt
93	93	End Property
94
	94
95	95	Public Property Let Denied(sExt)
96	96	sDenied = sExt
…	…
104	104	Exit Sub
105	105	End If
106
	106
107	107	Dim nTotalSize
108	108	nTotalSize = Request.TotalBytes
…	…
115	115	Exit Sub
116	116	End If
117
118		oSourceData.Write Request.BinaryRead(nTotalSize)
	117
	118	'Thankful long(yrl031715@163.com)
	119	'Fix upload large file.
	120	'**********************************************
	121	' 修正作者：long
	122	' 联系邮件: yrl031715@163.com
	123	' 修正时间：2007年5月6日
	124	' 修正说明：由于iis6的Content-Length 头信息中包含的请求长度超过了 AspMaxRequestEntityAllowed 的值（默认200K）, IIS 将返回一个 403 错误信息.
	125	' 直接导致在iis6下调试FCKeditor上传功能时，一旦文件超过200K,上传文件时文件管理器失去响应，受此影响，文件的快速上传功能也存在在缺陷。
	126	' 在参考宝玉的 Asp无组件上传带进度条演示程序后作出如下修改，以修正在iis6下的错误。
	127
	128	Dim nTotalBytes, nPartBytes, ReadBytes
	129	ReadBytes = 0
	130	nTotalBytes = Request.TotalBytes
	131	'循环分块读取
	132	Do While ReadBytes < nTotalBytes
	133	'分块读取
	134	nPartBytes = 64 * 1024 '分成每块64k
	135	If nPartBytes + ReadBytes > nTotalBytes Then
	136	nPartBytes = nTotalBytes - ReadBytes
	137	End If
	138	oSourceData.Write Request.BinaryRead(nPartBytes)
	139	ReadBytes = ReadBytes + nPartBytes
	140	Loop
	141	'**********************************************
119	142	oSourceData.Position = 0
120
	143
121	144	Dim oTotalData, oFormStream, sFormHeader, sFormName, bCrLf, nBoundLen, nFormStart, nFormEnd, nPosStart, nPosEnd, sBoundary
122
	145
123	146	oTotalData = oSourceData.Read
124	147	bCrLf = ChrB(13) & ChrB(10)
…	…
126	149	nBoundLen = LenB(sBoundary) + 2
127	150	nFormStart = nBoundLen
128
	151
129	152	Set oFormStream = Server.CreateObject("ADODB.Stream")
130
	153
131	154	Do While (nFormStart + 2) < nTotalSize
132	155	nFormEnd = InStrB(nFormStart, oTotalData, bCrLf & bCrLf) + 3
133
	156
134	157	With oFormStream
135	158	.Type = 1
…	…
144	167	.Close
145	168	End With
146
	169
147	170	nFormStart = InStrB(nFormEnd, oTotalData, sBoundary) - 1
148	171	nPosStart = InStr(22, sFormHeader, " name=", 1) + 7
149	172	nPosEnd = InStr(nPosStart, sFormHeader, """")
150	173	sFormName = Mid(sFormHeader, nPosStart, nPosEnd - nPosStart)
151
	174
152	175	If InStr(45, sFormHeader, " filename=", 1) > 0 Then
153	176	Set File(sFormName) = New NetRube_FileInfo
…	…
168	191	.Mode = 3
169	192	.Open
170		oSourceData.Position = n~~Pos~~End
	193	oSourceData.Position = nFormEnd
171	194	oSourceData.CopyTo oFormStream, nFormStart - nFormEnd - 2
172	195	.Position = 0
…	…
177	200	End With
178	201	End If
179
	202
180	203	nFormStart = nFormStart + nBoundLen
181	204	Loop
182
	205
183	206	oTotalData = ""
184	207	Set oFormStream = Nothing
…	…
190	213	Exit Sub
191	214	End If
192
	215
193	216	If Not IsAllowed(File(sItem).Ext) Then
194	217	nErr = 4
195	218	Exit Sub
196	219	End If
197
	220
198	221	Dim oFileStream
199	222	Set oFileStream = Server.CreateObject("ADODB.Stream")
…	…
210	233	Set oFileStream = Nothing
211	234	End Sub
212
	235
213	236	Private Function IsAllowed(sExt)
214	237	Dim oRE
…	…
216	239	oRE.IgnoreCase = True
217	240	oRE.Global = True
218
	241
219	242	If sDenied = "" Then
220	243	oRE.Pattern = sAllowed
…	…
224	247	IsAllowed = Not oRE.Test(sExt)
225	248	End If
226
	249
227	250	Set oRE = Nothing
228	251	End Function
…	…
232	255	Dim FormName, ClientPath, Path, Name, Ext, Content, Size, MIME, Start
233	256	End Class
234		%>
	257	%>

FCKeditor/branches/versions/2.4.x/editor/filemanager/browser/default/connectors/asp/config.asp

r133	r361
36	36
37	37	ConfigAllowedExtensions.Add "File", ""
38		ConfigDeniedExtensions.Add "File", "html\|htm\|php\|php2\|php3\|php4\|php5\|phtml\|pwml\|inc\|asp\|aspx\|ascx\|jsp\|cfm\|cfc\|pl\|bat\|exe\|com\|dll\|vbs\|js\|reg\|cgi\|htaccess\|asis"
	38	ConfigDeniedExtensions.Add "File", "html\|htm\|php\|php2\|php3\|php4\|php5\|phtml\|pwml\|inc\|asp\|aspx\|ascx\|jsp\|cfm\|cfc\|pl\|bat\|exe\|com\|dll\|vbs\|js\|reg\|cgi\|htaccess\|asis\|sh\|shtml\|shtm\|phtm"
39	39
40	40	ConfigAllowedExtensions.Add "Image", "jpg\|gif\|jpeg\|png\|bmp"

FCKeditor/branches/versions/2.4.x/editor/filemanager/browser/default/connectors/aspx/connector.aspx

r133	r361
1		<%@ Page language="c#" Inherits="FredCK.FCKeditorV2.FileBrowserConnector" AutoEventWireup="false" %>
	1	<%@ Page language="c#" Trace="false" Inherits="FredCK.FCKeditorV2.FileBrowserConnector" AutoEventWireup="false" %>
2	2	<%--
3	3	* FCKeditor - The text editor for Internet - http://www.fckeditor.net

FCKeditor/branches/versions/2.4.x/editor/filemanager/browser/default/connectors/cfm/config.cfm

r133	r361
35	35	// config.allowedExtensions["File"] = "doc,rtf,pdf,ppt,pps,xls,csv,vnd,zip";
36	36	config.allowedExtensions["File"] = "";
37		config.deniedExtensions["File"] = "html,htm,php,php2,php3,php4,php5,phtml,pwml,inc,asp,aspx,ascx,jsp,cfm,cfc,pl,bat,exe,com,dll,vbs,js,reg,cgi,htaccess,asis";
	37	config.deniedExtensions["File"] = "html,htm,php,php2,php3,php4,php5,phtml,pwml,inc,asp,aspx,ascx,jsp,cfm,cfc,pl,bat,exe,com,dll,vbs,js,reg,cgi,htaccess,asis,sh,shtml,shtm,phtm";
38	38
39	39	config.allowedExtensions["Image"] = "png,gif,jpg,jpeg,bmp";

FCKeditor/branches/versions/2.4.x/editor/filemanager/browser/default/connectors/cfm/connector.cfm

r179	r361
48	48	lDeniedExtensions = config.deniedExtensions[url.type];
49	49
	50	if ( userFilesPath eq "" ) {
	51	userFilesPath = "/userfiles/";
	52	}
	53
50	54	// make sure the user files path is correctly formatted
51	55	userFilesPath = replace(userFilesPath, "\", "/", "ALL");
…	…
75	79	if ( len(config.serverPath) ) {
76	80	serverPath = config.serverPath;
	81
	82	if ( right(serverPath,1) neq fs ) {
	83	serverPath = serverPath & fs;
	84	}
77	85	} else {
78		serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),"");
	86	serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),"") & replace(userFilesPath,"/",fs,"all");
79	87	}
80	88
…	…
361	369	<cfheader name="Cache-Control" value="no-cache, no-store, must-revalidate">
362	370	<cfcontent reset="true" type="text/xml; charset=UTF-8">
363		<cfoutput>#xmlHeader##xmlContent##xmlFooter#</cfoutput>
	371	<cfoutput>#xmlHeader##xmlContent##xmlFooter#</cfoutput>

FCKeditor/branches/versions/2.4.x/editor/filemanager/browser/default/connectors/lasso/config.lasso

r133	r361
42	42	*/
43	43	var('config') = map(
44		'Enabled' = ~~tru~~e,
	44	'Enabled' = false,
45	45	'UserFilesPath' = '/userfiles/',
46	46	'Subdirectories' = map(
…	…
57	57	),
58	58	'DeniedExtensions' = map(
59		'File' = array('html','htm','php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','lasso','lassoapp','htaccess','asis'),
	59	'File' = array('html','htm','php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','lasso','lassoapp','htaccess','asis','sh','shtml','shtm','phtm'),
60	60	'Image' = array(),
61	61	'Flash' = array(),

FCKeditor/branches/versions/2.4.x/editor/filemanager/browser/default/connectors/php/basexml.php

r133	r361
40	40
41	41	// Set the response format.
42		header( 'Content-Type:text/xml; charset=utf-8' ) ;
	42	header( 'Content-Type: text/xml; charset=utf-8' ) ;
43	43	}
44	44
…	…
55	55	// Add the current folder node.
56	56	echo '<CurrentFolder path="' . ConvertToXmlAttribute( $currentFolder ) . '" url="' . ConvertToXmlAttribute( GetUrlFromPath( $resourceType, $currentFolder ) ) . '" />' ;
	57
	58	$GLOBALS['HeaderSent'] = true ;
57	59	}
58	60
…	…
69	71	echo '<?xml version="1.0" encoding="utf-8" ?>' ;
70	72
71		echo '<Connector><Error number="' . $number . '" text="' . htmlspecialchars( $text ) . '" /></Connector>' ;
	73	echo '<Connector>' ;
	74
	75	SendErrorNode( $number, $text ) ;
	76
	77	echo '</Connector>' ;
72	78
73	79	exit ;
74	80	}
	81
	82	function SendErrorNode( $number, $text )
	83	{
	84	echo '<Error number="' . $number . '" text="' . htmlspecialchars( $text ) . '" />' ;
	85	}
75	86	?>

FCKeditor/branches/versions/2.4.x/editor/filemanager/browser/default/connectors/php/config.php

r192	r361
47	47
48	48	$Config['AllowedExtensions']['File'] = array() ;
49		$Config['DeniedExtensions']['File'] = array('html','htm','php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','htaccess','asis') ;
	49	$Config['DeniedExtensions']['File'] = array('html','htm','php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','htaccess','asis','sh','shtml','shtm','phtm') ;
50	50
51	51	$Config['AllowedExtensions']['Image'] = array('jpg','gif','jpeg','png') ;

FCKeditor/branches/versions/2.4.x/editor/filemanager/browser/default/connectors/php/io.php

r133	r361
42	42
43	43	// Ensure that the directory exists.
44		CreateServerFolder( $sResourceTypePath ) ;
	44	$sErrorMsg = CreateServerFolder( $sResourceTypePath ) ;
	45	if ( $sErrorMsg != '' )
	46	{
	47	if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
	48	{
	49	SendErrorNode( 1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})" ) ;
	50	CreateXmlFooter() ;
	51	exit ;
	52	}
	53	else
	54	{
	55	SendError( 1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})" ) ;
	56	}
	57	}
45	58
46	59	// Return the resource type directory combined with the required path.
…	…
97	110	$sSelfPath = substr( $sSelfPath, 0, strrpos( $sSelfPath, '/' ) ) ;
98	111
99		return substr( $sRealPath, 0, strlen( $sRealPath ) - strlen( $sSelfPath ) ) ;
	112	// Get the slash according to the filesystem
	113	$slash = ( strpos( $sRealPath, '/' ) === false ) ? '\\' : '/' ;
	114	$sSelfPath = str_replace( '/', $slash, $sSelfPath ) ;
	115
	116	$position = strpos( $sRealPath, $sSelfPath ) ;
	117
	118	// This can check only that this script isn't run from a virtual dir
	119	// But it avoids problems the problems that arise if it isn't checked
	120	if ( $position === false \|\| $position <> strlen( $sRealPath ) - strlen( $sSelfPath ) )
	121	SendError( 1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/browser/default/connectors/php/config.php".' ) ;
	122
	123	return substr( $sRealPath, 0, $position ) ;
100	124	}
101	125	?>

FCKeditor/branches/versions/2.4.x/editor/filemanager/browser/default/connectors/php/util.php

r133	r361
37	37	function ConvertToXmlAttribute( $value )
38	38	{
39		return ~~utf8_encode( htmlspecialchars( $value )~~ ) ;
	39	return htmlspecialchars( $value ) ;
40	40	}
41	41	?>

FCKeditor/branches/versions/2.4.x/editor/filemanager/browser/default/connectors/py/connector.py

r133	r361
178	178	}
179	179	self.deniedExtensions = {
180		"File": [ "html","htm","php","php2","php3","php4","php5","phtml","pwml","inc","asp","aspx","ascx","jsp","cfm","cfc","pl","bat","exe","com","dll","vbs","js","reg","cgi","htaccess","asis" ],
181		"Image": [ "html","htm","php","php2","php3","php4","php5","phtml","pwml","inc","asp","aspx","ascx","jsp","cfm","cfc","pl","bat","exe","com","dll","vbs","js","reg","cgi","htaccess","asis" ],
182		"Flash": [ "html","htm","php","php2","php3","php4","php5","phtml","pwml","inc","asp","aspx","ascx","jsp","cfm","cfc","pl","bat","exe","com","dll","vbs","js","reg","cgi","htaccess","asis" ],
183		"Media": [ "html","htm","php","php2","php3","php4","php5","phtml","pwml","inc","asp","aspx","ascx","jsp","cfm","cfc","pl","bat","exe","com","dll","vbs","js","reg","cgi","htaccess","asis" ]
	180	"File": [ "html","htm","php","php2","php3","php4","php5","phtml","pwml","inc","asp","aspx","ascx","jsp","cfm","cfc","pl","bat","exe","com","dll","vbs","js","reg","cgi","htaccess","asis","sh","shtml","shtm","phtm" ],
	181	"Image": [ "html","htm","php","php2","php3","php4","php5","phtml","pwml","inc","asp","aspx","ascx","jsp","cfm","cfc","pl","bat","exe","com","dll","vbs","js","reg","cgi","htaccess","asis","sh","shtml","shtm","phtm" ],
	182	"Flash": [ "html","htm","php","php2","php3","php4","php5","phtml","pwml","inc","asp","aspx","ascx","jsp","cfm","cfc","pl","bat","exe","com","dll","vbs","js","reg","cgi","htaccess","asis","sh","shtml","shtm","phtm" ],
	183	"Media": [ "html","htm","php","php2","php3","php4","php5","phtml","pwml","inc","asp","aspx","ascx","jsp","cfm","cfc","pl","bat","exe","com","dll","vbs","js","reg","cgi","htaccess","asis","sh","shtml","shtm","phtm" ]
184	184	}
185	185

FCKeditor/branches/versions/2.4.x/editor/filemanager/browser/default/frmresourceslist.html

r133	r361
81	81	function OpenFile( fileUrl )
82	82	{
83		window.top.opener.SetUrl( ~~fileUrl~~ ) ;
	83	window.top.opener.SetUrl( encodeURI( fileUrl ) ) ;
84	84	window.top.close() ;
85	85	window.top.opener.focus() ;
…	…
108	108	if ( oFolderNode == null )
109	109	{
110		alert( 'The server didn\'t reply with a proper XML ~~file\r\nC~~heck your configuration.' ) ;
	110	alert( 'The server didn\'t reply with a proper XML data. Please check your configuration.' ) ;
111	111	return ;
112	112	}

FCKeditor/branches/versions/2.4.x/editor/filemanager/browser/default/js/fckxml.js

r133	r361
62	62	if ( oXmlHttp.readyState == 4 )
63	63	{
64		if ( ~~oXmlHttp.responseXML == null \|\| oXmlHttp.responseXML.firstChild == null~~)
	64	if ( ( oXmlHttp.status != 200 && oXmlHttp.status != 304 ) \|\| oXmlHttp.responseXML == null \|\| oXmlHttp.responseXML.firstChild == null )
65	65	{
66		alert( 'The server didn\'t send back a proper XML response.\r\n\r\n' +
67		'Requested URL: ' + urlToCall + '\r\n' +
68		'Response text:\r\n' + oXmlHttp.responseText ) ;
	66	alert( 'The server didn\'t send back a proper XML response. Please contact your system administrator.\n\n' +
	67	'XML request error: ' + oXmlHttp.statusText + ' (' + oXmlHttp.status + ')\n\n' +
	68	'Requested URL:\n' + urlToCall + '\n\n' +
	69	'Response text:\n' + oXmlHttp.responseText ) ;
69	70	return ;
70	71	}
	72
71	73	oFCKXml.DOMDocument = oXmlHttp.responseXML ;
72		if ( oXmlHttp.status == 200 \|\| oXmlHttp.status == 304 )
73		asyncFunctionPointer( oFCKXml ) ;
74		else
75		alert( 'XML request error: ' + oXmlHttp.statusText + ' (' + oXmlHttp.status + ')' ) ;
	74	asyncFunctionPointer( oFCKXml ) ;
76	75	}
77	76	}

FCKeditor/branches/versions/2.4.x/editor/filemanager/upload/asp/class_upload.asp

r133	r361
25	25	'**********************************************
26	26	' File: NetRube_Upload.asp
27		' Version: NetRube Upload Class Version 2.~~1 Build 200502~~28
	27	' Version: NetRube Upload Class Version 2.3 Build 20070528
28	28	' Author: NetRube
29	29	' Email: NetRube@126.com
30		' Date: 0~~2/28/2005~~
	30	' Date: 05/28/2007
31	31	' Comments: The code for the Upload.
32	32	' This can free usage, but please
…	…
36	36	'**********************************************
37	37	' 文件名: NetRube_Upload.asp
38		' 版本: NetRube Upload Class Version 2.~~1 Build 200502~~28
	38	' 版本: NetRube Upload Class Version 2.3 Build 20070528
39	39	' 作者: NetRube(网络乡巴佬)
40	40	' 电子邮件: NetRube@126.com
41		' 日期: 200~~5年02~~月28日
	41	' 日期: 2007年05月28日
42	42	' 声明: 文件上传类
43	43	' 本上传类可以自由使用，但请保留此版权声明信息
…	…
51	51	Private oSourceData
52	52	Private nMaxSize, nErr, sAllowed, sDenied
53
	53
54	54	Private Sub Class_Initialize
55	55	nErr = 0
56	56	nMaxSize = 1048576
57
	57
58	58	Set File = Server.CreateObject("Scripting.Dictionary")
59	59	File.CompareMode = 1
60	60	Set Form = Server.CreateObject("Scripting.Dictionary")
61	61	Form.CompareMode = 1
62
	62
63	63	Set oSourceData = Server.CreateObject("ADODB.Stream")
64	64	oSourceData.Type = 1
…	…
66	66	oSourceData.Open
67	67	End Sub
68
	68
69	69	Private Sub Class_Terminate
70	70	Form.RemoveAll
…	…
72	72	File.RemoveAll
73	73	Set File = Nothing
74
	74
75	75	oSourceData.Close
76	76	Set oSourceData = Nothing
77	77	End Sub
78
	78
79	79	Public Property Get Version
80		Version = "NetRube Upload Class Version ~~1.0 Build 2004121~~8"
	80	Version = "NetRube Upload Class Version 2.3 Build 20070528"
81	81	End Property
82	82
…	…
84	84	ErrNum = nErr
85	85	End Property
86
	86
87	87	Public Property Let MaxSize(nSize)
88	88	nMaxSize = nSize
89	89	End Property
90
	90
91	91	Public Property Let Allowed(sExt)
92	92	sAllowed = sExt
93	93	End Property
94
	94
95	95	Public Property Let Denied(sExt)
96	96	sDenied = sExt
…	…
104	104	Exit Sub
105	105	End If
106
	106
107	107	Dim nTotalSize
108	108	nTotalSize = Request.TotalBytes
…	…
115	115	Exit Sub
116	116	End If
117
118		oSourceData.Write Request.BinaryRead(nTotalSize)
	117
	118	'Thankful long(yrl031715@163.com)
	119	'Fix upload large file.
	120	'**********************************************
	121	' 修正作者：long
	122	' 联系邮件: yrl031715@163.com
	123	' 修正时间：2007年5月6日
	124	' 修正说明：由于iis6的Content-Length 头信息中包含的请求长度超过了 AspMaxRequestEntityAllowed 的值（默认200K）, IIS 将返回一个 403 错误信息.
	125	' 直接导致在iis6下调试FCKeditor上传功能时，一旦文件超过200K,上传文件时文件管理器失去响应，受此影响，文件的快速上传功能也存在在缺陷。
	126	' 在参考宝玉的 Asp无组件上传带进度条演示程序后作出如下修改，以修正在iis6下的错误。
	127
	128	Dim nTotalBytes, nPartBytes, ReadBytes
	129	ReadBytes = 0
	130	nTotalBytes = Request.TotalBytes
	131	'循环分块读取
	132	Do While ReadBytes < nTotalBytes
	133	'分块读取
	134	nPartBytes = 64 * 1024 '分成每块64k
	135	If nPartBytes + ReadBytes > nTotalBytes Then
	136	nPartBytes = nTotalBytes - ReadBytes
	137	End If
	138	oSourceData.Write Request.BinaryRead(nPartBytes)
	139	ReadBytes = ReadBytes + nPartBytes
	140	Loop
	141	'**********************************************
119	142	oSourceData.Position = 0
120
	143
121	144	Dim oTotalData, oFormStream, sFormHeader, sFormName, bCrLf, nBoundLen, nFormStart, nFormEnd, nPosStart, nPosEnd, sBoundary
122
	145
123	146	oTotalData = oSourceData.Read
124	147	bCrLf = ChrB(13) & ChrB(10)
…	…
126	149	nBoundLen = LenB(sBoundary) + 2
127	150	nFormStart = nBoundLen
128
	151
129	152	Set oFormStream = Server.CreateObject("ADODB.Stream")
130
	153
131	154	Do While (nFormStart + 2) < nTotalSize
132	155	nFormEnd = InStrB(nFormStart, oTotalData, bCrLf & bCrLf) + 3
133
	156
134	157	With oFormStream
135	158	.Type = 1
…	…
144	167	.Close
145	168	End With
146
	169
147	170	nFormStart = InStrB(nFormEnd, oTotalData, sBoundary) - 1
148	171	nPosStart = InStr(22, sFormHeader, " name=", 1) + 7
149	172	nPosEnd = InStr(nPosStart, sFormHeader, """")
150	173	sFormName = Mid(sFormHeader, nPosStart, nPosEnd - nPosStart)
151
	174
152	175	If InStr(45, sFormHeader, " filename=", 1) > 0 Then
153	176	Set File(sFormName) = New NetRube_FileInfo
…	…
168	191	.Mode = 3
169	192	.Open
170		oSourceData.Position = n~~Pos~~End
	193	oSourceData.Position = nFormEnd
171	194	oSourceData.CopyTo oFormStream, nFormStart - nFormEnd - 2
172	195	.Position = 0
…	…
177	200	End With
178	201	End If
179
	202
180	203	nFormStart = nFormStart + nBoundLen
181	204	Loop
182
	205
183	206	oTotalData = ""
184	207	Set oFormStream = Nothing
…	…
190	213	Exit Sub
191	214	End If
192
	215
193	216	If Not IsAllowed(File(sItem).Ext) Then
194	217	nErr = 4
195	218	Exit Sub
196	219	End If
197
	220
198	221	Dim oFileStream
199	222	Set oFileStream = Server.CreateObject("ADODB.Stream")
…	…
210	233	Set oFileStream = Nothing
211	234	End Sub
212
	235
213	236	Private Function IsAllowed(sExt)
214	237	Dim oRE
…	…
216	239	oRE.IgnoreCase = True
217	240	oRE.Global = True
218
	241
219	242	If sDenied = "" Then
220	243	oRE.Pattern = sAllowed
…	…
224	247	IsAllowed = Not oRE.Test(sExt)
225	248	End If
226
	249
227	250	Set oRE = Nothing
228	251	End Function
…	…
232	255	Dim FormName, ClientPath, Path, Name, Ext, Content, Size, MIME, Start
233	256	End Class
234		%>
	257	%>

FCKeditor/branches/versions/2.4.x/editor/filemanager/upload/asp/config.asp

r133	r361
42	42
43	43	ConfigAllowedExtensions.Add "File", ""
44		ConfigDeniedExtensions.Add "File", "html\|htm\|php\|php2\|php3\|php4\|php5\|phtml\|pwml\|inc\|asp\|aspx\|ascx\|jsp\|cfm\|cfc\|pl\|bat\|exe\|com\|dll\|vbs\|js\|reg\|cgi\|htaccess\|asis"
	44	ConfigDeniedExtensions.Add "File", "html\|htm\|php\|php2\|php3\|php4\|php5\|phtml\|pwml\|inc\|asp\|aspx\|ascx\|jsp\|cfm\|cfc\|pl\|bat\|exe\|com\|dll\|vbs\|js\|reg\|cgi\|htaccess\|asis\|sh\|shtml\|shtm\|phtm"
45	45
46	46	ConfigAllowedExtensions.Add "Image", "jpg\|gif\|jpeg\|png\|bmp"

FCKeditor/branches/versions/2.4.x/editor/filemanager/upload/aspx/upload.aspx

r133	r361
1		<%@ Page language="c#" Inherits="FredCK.FCKeditorV2.Uploader" AutoEventWireup="false" %>
	1	<%@ Page language="c#" Trace="false" Inherits="FredCK.FCKeditorV2.Uploader" AutoEventWireup="false" %>
2	2	<%--
3	3	* FCKeditor - The text editor for Internet - http://www.fckeditor.net

FCKeditor/branches/versions/2.4.x/editor/filemanager/upload/cfm/config.cfm

r133	r361
37	37
38	38	config.allowedExtensions["File"] = "";
39		config.deniedExtensions["File"] = "html,htm,php,php2,php3,php4,php5,phtml,pwml,inc,asp,aspx,ascx,jsp,cfm,cfc,pl,bat,exe,com,dll,vbs,js,reg,cgi,htaccess,asis";
	39	config.deniedExtensions["File"] = "html,htm,php,php2,php3,php4,php5,phtml,pwml,inc,asp,aspx,ascx,jsp,cfm,cfc,pl,bat,exe,com,dll,vbs,js,reg,cgi,htaccess,asis,sh,shtml,shtm,phtm";
40	40
41	41	config.allowedExtensions["Image"] = "png,gif,jpg,jpeg,bmp";
…	…
61	61	</cfif>
62	62
63		<!--- look for config struct in request, application and server scopes --->
64		<cfif isDefined("request.FCKeditor") and isStruct(request.FCKeditor)>
65
66		<cfset variables.FCKeditor = request.FCKeditor>
67
68		<cfelseif isDefined("application.FCKeditor") and isStruct(application.FCKeditor)>
	63	<!--- look for config struct in application and server scopes --->
	64	<cfif isDefined("application.FCKeditor") and isStruct(application.FCKeditor)>
69	65
70	66	<cflock scope="application" type="readonly" timeout="5">

FCKeditor/branches/versions/2.4.x/editor/filemanager/upload/cfm/upload.cfm

r133	r361
89	89	<cfset currentFolderPath = userFilesServerPath & url.type & fs>
90	90
	91	<cfif not directoryExists(currentFolderPath)>
	92	<cfdirectory action="create" directory="#currentFolderPath#"/>
	93	</cfif>
	94
91	95	<!--- TODO: upload to a temp directory and move file if extension is allowed --->
92	96

FCKeditor/branches/versions/2.4.x/editor/filemanager/upload/lasso/config.lasso

r133	r361
57	57	),
58	58	'DeniedExtensions' = map(
59		'File' = array('html','htm','php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','lasso','lassoapp','htaccess','asis'),
	59	'File' = array('html','htm','php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','lasso','lassoapp','htaccess','asis','sh','shtml','shtm','phtm'),
60	60	'Image' = array(),
61	61	'Flash' = array(),

FCKeditor/branches/versions/2.4.x/editor/filemanager/upload/php/config.php

r133	r361
46	46
47	47	$Config['AllowedExtensions']['File'] = array() ;
48		$Config['DeniedExtensions']['File'] = array('html','htm','php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','htaccess','asis') ;
	48	$Config['DeniedExtensions']['File'] = array('html','htm','php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','htaccess','asis','sh','shtml','shtm','phtm') ;
49	49
50	50	$Config['AllowedExtensions']['Image'] = array('jpg','gif','jpeg','png') ;

FCKeditor/branches/versions/2.4.x/editor/filemanager/upload/php/upload.php

r133	r361
87	87
88	88	if ( $Config['UseFileType'] )
89		$sServerDir .= $sType . '/' ;
	89	$sServerDir .= strtolower($sType) . '/' ;
	90
	91	//check for the directory before uploading the file
	92	if(!is_dir($sServerDir))
	93	{
	94	mkdir($sServerDir);
	95	}
90	96
91	97	while ( true )
…	…
113	119
114	120	if ( $Config['UseFileType'] )
115		$sFileUrl = $Config["UserFilesPath"] . ~~$sType~~ . '/' . $sFileName ;
	121	$sFileUrl = $Config["UserFilesPath"] . strtolower($sType) . '/' . $sFileName ;
116	122	else
117	123	$sFileUrl = $Config["UserFilesPath"] . $sFileName ;

FCKeditor/branches/versions/2.4.x/editor/lang/ca.js

r179	r361
223	223	DlgLnkTypeURL : "URL",
224	224	DlgLnkTypeAnchor : "Àncora en aquesta pàgina",
225		DlgLnkTypeEMail : "~~E-Mail~~",
	225	DlgLnkTypeEMail : "Correu electrònic",
226	226	DlgLnkProto : "Protocol",
227	227	DlgLnkProtoOther : "<altra>",
…	…
230	230	DlgLnkAnchorByName : "Per nom d'àncora",
231	231	DlgLnkAnchorById : "Per Id d'element",
232		DlgLnkNoAnchors : "~~<No hi ha àncores disponibles en aquest document>~~", //REVIEW : Change < and > with ( and )
233		DlgLnkEMail : "Adreça d~~'E-Mail~~",
	232	DlgLnkNoAnchors : "(No hi ha àncores disponibles en aquest document)", //REVIEW : Change < and > with ( and )
	233	DlgLnkEMail : "Adreça de correu electrònic",
234	234	DlgLnkEMailSubject : "Assumpte del missatge",
235	235	DlgLnkEMailBody : "Cos del missatge",
…	…
261	261
262	262	DlnLnkMsgNoUrl : "Si us plau, escrigui l'enllaç URL",
263		DlnLnkMsgNoEMail : "Si us plau, escrigui l'adreça ~~e-mail~~",
	263	DlnLnkMsgNoEMail : "Si us plau, escrigui l'adreça correu electrònic",
264	264	DlnLnkMsgNoAnchor : "Si us plau, escrigui l'àncora",
265	265	DlnLnkMsgInvPopName : "El nom de la finestra emergent ha de començar amb una lletra i no pot tenir espais",
…	…
281	281	DlgTableRows : "Files",
282	282	DlgTableColumns : "Columnes",
283		DlgTableBorder : "~~Tamany~~ vora",
	283	DlgTableBorder : "Mida vora",
284	284	DlgTableAlign : "Alineació",
285	285	DlgTableAlignNotSet : "<No Definit>",
…	…
332	332	DlgReplaceFindLbl : "Cerca:",
333	333	DlgReplaceReplaceLbl : "Remplaça amb:",
334		DlgReplaceCaseChk : "~~Sensible a maj~~úscules",
	334	DlgReplaceCaseChk : "Distingeix majúscules/minúscules",
335	335	DlgReplaceReplaceBtn : "Reemplaça",
336		DlgReplaceReplAllBtn : "Reemplaça~~'ls tots~~",
337		DlgReplaceWordChk : "~~Cerca paraula completa~~",
	336	DlgReplaceReplAllBtn : "Reemplaça-ho tot",
	337	DlgReplaceWordChk : "Només paraules completes",
338	338
339	339	// Paste Operations / Dialog
…	…
341	341	PasteErrorCopy : "La seguretat del vostre navegador no permet executar automàticament les operacions de copiar. Si us plau, utilitzeu el teclat (Ctrl+C).",
342	342
343		PasteAsText : "Enganxa com a text ~~sense form~~at",
	343	PasteAsText : "Enganxa com a text no formatat",
344	344	PasteFromWord : "Enganxa com a Word",
345	345
346	346	DlgPasteMsg2 : "Si us plau, enganxeu dins del següent camp utilitzant el teclat (<STRONG>Ctrl+V</STRONG>) i premeu <STRONG>OK</STRONG>.",
347		DlgPasteSec : "~~Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.", //MISSING~~
	347	DlgPasteSec : "A causa de la configuració de seguretat del vostre navegador, l'editor no pot accedir al porta-retalls directament. Enganxeu-ho un altre cop en aquesta finestra.",
348	348	DlgPasteIgnoreFont : "Ignora definicions de font",
349	349	DlgPasteRemoveStyles : "Elimina definicions d'estil",
…	…
399	399	DlgSelectName : "Nom",
400	400	DlgSelectValue : "Valor",
401		DlgSelectSize : "~~Tamany~~",
	401	DlgSelectSize : "Mida",
402	402	DlgSelectLines : "Línies",
403	403	DlgSelectChkMulti : "Permet múltiples seleccions",
…	…
451	451
452	452	DlgDocPageTitle : "Títol de la pàgina",
453		DlgDocLangDir : "Direcció ~~llenguatge~~",
	453	DlgDocLangDir : "Direcció idioma",
454	454	DlgDocLangDirLTR : "Esquerra a dreta (LTR)",
455	455	DlgDocLangDirRTL : "Dreta a esquerra (RTL)",
456		DlgDocLangCode : "Codi d~~e llenguatge~~",
	456	DlgDocLangCode : "Codi d'idioma",
457	457	DlgDocCharSet : "Codificació de conjunt de caràcters",
458	458	DlgDocCharSetCE : "Centreeuropeu",
…	…
468	468
469	469	DlgDocDocType : "Capçalera de tipus de document",
470		DlgDocDocTypeOther : "~~Altra C~~apçalera de tipus de document",
	470	DlgDocDocTypeOther : "Un altra capçalera de tipus de document",
471	471	DlgDocIncXHTML : "Incloure declaracions XHTML",
472	472	DlgDocBgColor : "Color de fons",

FCKeditor/branches/versions/2.4.x/editor/lang/et.js

r179	r361
135	135	FormProp : "Vormi omadused",
136	136
137		FontFormats : "Tavaline;Vormindatud;Aadress;Pealkiri 1;Pealkiri 2;Pealkiri 3;Pealkiri 4;Pealkiri 5;Pealkiri 6", //REVIEW : Check _getfontformat.html
	137	FontFormats : "Tavaline;Vormindatud;Aadress;Pealkiri 1;Pealkiri 2;Pealkiri 3;Pealkiri 4;Pealkiri 5;Pealkiri 6;Tavaline (DIV)", //REVIEW : Check _getfontformat.html
138	138
139	139	// Alerts and Messages
…	…
146	146	NotImplemented : "Käsku ei täidetud",
147	147	UnknownToolbarSet : "Tööriistariba \"%1\" ei eksisteeri",
148		NoActiveX : "Sinu ~~interneti~~ sirvija turvalisuse seaded võivad limiteerida mõningaid tekstirdaktori kasutus võimalusi. Sa peaksid võimaldama valiku \"Run ActiveX controls and plug-ins\" oma sirvija seadetes. Muidu võid sa täheldada vigu tekstiredaktori töös ja märgata puuduvaid funktsioone.",
	148	NoActiveX : "Sinu veebisirvija turvalisuse seaded võivad limiteerida mõningaid tekstirdaktori kasutus võimalusi. Sa peaksid võimaldama valiku \"Run ActiveX controls and plug-ins\" oma sirvija seadetes. Muidu võid sa täheldada vigu tekstiredaktori töös ja märgata puuduvaid funktsioone.",
149	149	BrowseServerBlocked : "Ressursside sirvija avamine ebaõnnestus. Võimalda pop-up akende avanemine.",
150	150	DialogBlocked : "Ei olenud võimalik avada dialoogi akent. Võimalda pop-up akende avanemine.",
…	…
230	230	DlgLnkAnchorByName : "Ankru nime järgi",
231	231	DlgLnkAnchorById : "Elemendi id järgi",
232		DlgLnkNoAnchors : "~~<Selles dokumendis ei ole ankruid>~~", //REVIEW : Change < and > with ( and )
	232	DlgLnkNoAnchors : "(Selles dokumendis ei ole ankruid)", //REVIEW : Change < and > with ( and )
233	233	DlgLnkEMail : "E-posti aadress",
234	234	DlgLnkEMailSubject : "Sõnumi teema",
…	…
263	263	DlnLnkMsgNoEMail : "Palun kirjuta E-Posti aadress",
264	264	DlnLnkMsgNoAnchor : "Palun vali ankur",
265		DlnLnkMsgInvPopName : "~~The popup name must begin with an alphabetic character and must not contain spaces", //MISSING~~
	265	DlnLnkMsgInvPopName : "Hüpikakna nimi peab algama alfabeetilise tähega ja ei tohi sisaldada tühikuid",
266	266
267	267	// Color Dialog
…	…
338	338
339	339	// Paste Operations / Dialog
340		PasteErrorCut : "Sinu ~~interneti~~ sirvija turvaseaded ei luba redaktoril automaatselt lõigata. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl+X).",
341		PasteErrorCopy : "Sinu ~~interneti~~ sirvija turvaseaded ei luba redaktoril automaatselt kopeerida. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl+C).",
	340	PasteErrorCut : "Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt lõigata. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl+X).",
	341	PasteErrorCopy : "Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt kopeerida. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl+C).",
342	342
343	343	PasteAsText : "Kleebi tavalise tekstina",
…	…
345	345
346	346	DlgPasteMsg2 : "Palun kleebi järgnevasse kasti kasutades klaviatuuri klahvikombinatsiooni (<STRONG>Ctrl+V</STRONG>) ja vajuta seejärel <STRONG>OK</STRONG>.",
347		DlgPasteSec : "~~Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.", //MISSING~~
	347	DlgPasteSec : "Sinu veebisirvija turvaseadete tõttu, ei oma redaktor otsest ligipääsu lõikelaua andmetele. Sa pead kleepima need uuesti siia aknasse.",
348	348	DlgPasteIgnoreFont : "Ignoreeri kirja definitsioone",
349	349	DlgPasteRemoveStyles : "Eemalda stiilide definitsioonid",
…	…
382	382	DlgButtonText : "Tekst (väärtus)",
383	383	DlgButtonType : "Tüüp",
384		DlgButtonTypeBtn : "~~Button", //MISSING~~
385		DlgButtonTypeSbm : "S~~ubmit", //MISSING~~
386		DlgButtonTypeRst : "~~Reset", //MISSING~~
	384	DlgButtonTypeBtn : "Nupp",
	385	DlgButtonTypeSbm : "Saada",
	386	DlgButtonTypeRst : "Lähtesta",
387	387
388	388	// Checkbox and Radio Button Dialogs
…	…
433	433	BulletedListProp : "Täpitud loetelu omadused",
434	434	NumberedListProp : "Nummerdatud loetelu omadused",
435		DlgLstStart : "~~Start", //MISSING~~
	435	DlgLstStart : "Alusta",
436	436	DlgLstType : "Tüüp",
437	437	DlgLstTypeCircle : "Ring",
…	…
456	456	DlgDocLangCode : "Keele kood",
457	457	DlgDocCharSet : "Märgistiku kodeering",
458		DlgDocCharSetCE : "~~Central European", //MISSING~~
459		DlgDocCharSetCT : "~~Chinese Traditional (Big5)", //MISSING~~
460		DlgDocCharSetCR : "~~Cyrillic", //MISSING~~
461		DlgDocCharSetGR : "~~Greek", //MISSING~~
462		DlgDocCharSetJP : "Ja~~panese", //MISSING~~
463		DlgDocCharSetKR : "Korea~~n", //MISSING~~
464		DlgDocCharSetTR : "T~~urkish", //MISSING~~
465		DlgDocCharSetUN : "Unicode (UTF-8)", ~~//MISSING~~
466		DlgDocCharSetWE : "~~Western European", //MISSING~~
	458	DlgDocCharSetCE : "Kesk-Euroopa",
	459	DlgDocCharSetCT : "Hiina traditsiooniline (Big5)",
	460	DlgDocCharSetCR : "Kirillisa",
	461	DlgDocCharSetGR : "Kreeka",
	462	DlgDocCharSetJP : "Jaapani",
	463	DlgDocCharSetKR : "Korea",
	464	DlgDocCharSetTR : "Türgi",
	465	DlgDocCharSetUN : "Unicode (UTF-8)",
	466	DlgDocCharSetWE : "Lääne-Euroopa",
467	467	DlgDocCharSetOther : "Ülejäänud märgistike kodeeringud",
468	468
…	…
494	494	DlgTemplatesLoading : "Laen šabloonide nimekirja. Palun oota...",
495	495	DlgTemplatesNoTpl : "(Ühtegi šablooni ei ole defineeritud)",
496		DlgTemplatesReplace : "~~Replace actual contents", //MISSING~~
	496	DlgTemplatesReplace : "Asenda tegelik sisu",
497	497
498	498	// About Dialog
499	499	DlgAboutAboutTab : "Teave",
500		DlgAboutBrowserInfoTab : "~~Interneti~~ sirvija info",
	500	DlgAboutBrowserInfoTab : "Veebisirvija info",
501	501	DlgAboutLicenseTab : "Litsents",
502	502	DlgAboutVersion : "versioon",

FCKeditor/branches/versions/2.4.x/editor/lang/fa.js

r179	r361
140	140	ProcessingXHTML : "پردازش XHTML. لطفا صبر کنید...",
141	141	Done : "انجام شد",
142		PasteWordConfirm : "کپی شده است. آیا می‌خواهید قبل از چسباندن آن را پاک‌سازی کنید؟ Word متنی که می‌خواهید بچسبانید به نظر می‌رسد از",
	142	PasteWordConfirm : "متنی که می‌خواهید بچسبانید به نظر می‌رسد از Word کپی شده است. آیا می‌خواهید قبل از چسباندن آن را پاک‌سازی کنید؟",
143	143	NotCompatiblePaste : "این فرمان برای مرورگر Internet Explorer از نگارش 5.5 یا بالاتر در دسترس است. آیا می‌خواهید بدون پاک‌سازی، متن را بچسبانید؟",
144	144	UnknownToolbarItem : "فقرهٴ نوارابزار ناشناخته \"%1\"",
…	…
230	230	DlgLnkAnchorByName : "با نام لنگر",
231	231	DlgLnkAnchorById : "با شناسهٴ المان",
232		DlgLnkNoAnchors : "~~<در این سند لنگری دردسترس نیست>~~", //REVIEW : Change < and > with ( and )
	232	DlgLnkNoAnchors : "(در این سند لنگری دردسترس نیست)", //REVIEW : Change < and > with ( and )
233	233	DlgLnkEMail : "نشانی پست الکترونیکی",
234	234	DlgLnkEMailSubject : "موضوع پیام",
…	…
247	247	DlgLnkPopWinName : "نام پنجرهٴ پاپاپ",
248	248	DlgLnkPopWinFeat : "ویژگیهای پنجرهٴ پاپاپ",
249		DlgLnkPopResize : "قابل تغیر اندازه",
	249	DlgLnkPopResize : "قابل تغییر اندازه",
250	250	DlgLnkPopLocation : "نوار موقعیت",
251	251	DlgLnkPopMenu : "نوار منو",
…	…
345	345
346	346	DlgPasteMsg2 : "لطفا متن را با کلیدهای (<STRONG>Ctrl+V</STRONG>) در این جعبهٴ متنی بچسبانید و <STRONG>پذیرش</STRONG> را بزنید.",
347		DlgPasteSec : "~~Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.", //MISSING~~
	347	DlgPasteSec : "به خاطر تنظیمات امنیتی مرورگر شما، ویرایشگر نمی‌تواند دسترسی مستقیم به داده‌های clipboard داشته باشد. شما باید دوباره آنرا در این پنجره بچسبانید.",
348	348	DlgPasteIgnoreFont : "چشم‌پوشی از تعاریف نوع قلم",
349	349	DlgPasteRemoveStyles : "چشم‌پوشی از تعاریف سبک (style)",
…	…
363	363
364	364	// Speller Pages Dialog
365		DlgSpellNotInDic : "در واژه‌نامه ~~موجود نیست~~",
366		DlgSpellChangeTo : "تغیر به",
	365	DlgSpellNotInDic : "در واژه‌نامه یافت نشد",
	366	DlgSpellChangeTo : "تغییر به",
367	367	DlgSpellBtnIgnore : "چشم‌پوشی",
368	368	DlgSpellBtnIgnoreAll : "چشم‌پوشی همه",
…	…
373	373	DlgSpellProgress : "بررسی املا در حال انجام...",
374	374	DlgSpellNoMispell : "بررسی املا انجام شد. هیچ غلط‌املائی یافت نشد",
375		DlgSpellNoChanges : "بررسی املا انجام شد. هیچ واژه‌ای تغیر نیافت",
376		DlgSpellOneChange : "بررسی املا انجام شد. یک واژه تغیر یافت",
377		DlgSpellManyChanges : "بررسی املا انجام شد. %1 واژه تغیر یافت",
	375	DlgSpellNoChanges : "بررسی املا انجام شد. هیچ واژه‌ای تغییر نیافت",
	376	DlgSpellOneChange : "بررسی املا انجام شد. یک واژه تغییر یافت",
	377	DlgSpellManyChanges : "بررسی املا انجام شد. %1 واژه تغییر یافت",
378	378
379	379	IeSpellDownload : "بررسی‌کنندهٴ املا نصب نشده است. آیا می‌خواهید آن را هم‌اکنون دریافت کنید؟",
…	…
393	393	// Form Dialog
394	394	DlgFormName : "نام",
395		DlgFormAction : "~~اقدام~~",
	395	DlgFormAction : "رویداد",
396	396	DlgFormMethod : "متد",
397	397
…	…
402	402	DlgSelectLines : "خطوط",
403	403	DlgSelectChkMulti : "گزینش چندگانه فراهم باشد",
404		DlgSelectOpAvail : "گزینه‌های ~~موجود~~",
	404	DlgSelectOpAvail : "گزینه‌های دردسترس",
405	405	DlgSelectOpText : "متن",
406	406	DlgSelectOpValue : "مقدار",
407		DlgSelectBtnAdd : "ا~~ضافه~~",
	407	DlgSelectBtnAdd : "افزودن",
408	408	DlgSelectBtnModify : "ویرایش",
409	409	DlgSelectBtnUp : "بالا",
410	410	DlgSelectBtnDown : "پائین",
411	411	DlgSelectBtnSetValue : "تنظیم به عنوان مقدار ِبرگزیده",
412		DlgSelectBtnDelete : "~~حذف~~",
	412	DlgSelectBtnDelete : "پاک‌کردن",
413	413
414	414	// Textarea Dialog

FCKeditor/branches/versions/2.4.x/editor/lang/nb.js

r221	r361
40	40	PasteWord : "Lim inn fra Word",
41	41	Print : "Skriv ut",
42		SelectAll : "~~Velg alle~~",
	42	SelectAll : "Merk alt",
43	43	RemoveFormat : "Fjern format",
44	44	InsertLinkLbl : "Lenke",

FCKeditor/branches/versions/2.4.x/editor/lang/no.js

r221	r361
40	40	PasteWord : "Lim inn fra Word",
41	41	Print : "Skriv ut",
42		SelectAll : "~~Velg alle~~",
	42	SelectAll : "Merk alt",
43	43	RemoveFormat : "Fjern format",
44	44	InsertLinkLbl : "Lenke",

FCKeditor/branches/versions/2.4.x/editor/lang/sv.js

r179	r361
103	103	ImageButton : "Bildknapp",
104	104
105		FitWindow : "~~Maximize the editor size", //MISSING~~
	105	FitWindow : "Anpassa till fönstrets storlek",
106	106
107	107	// Context Menu
108	108	EditLink : "Redigera länk",
109		CellCM : "Cell", ~~//MISSING~~
110		RowCM : "R~~ow", //MISSING~~
111		ColumnCM : "~~Column", //MISSING~~
	109	CellCM : "Cell",
	110	RowCM : "Rad",
	111	ColumnCM : "Kolumn",
112	112	InsertRow : "Infoga rad",
113	113	DeleteRows : "Radera rad",
…	…
135	135	FormProp : "Egenskaper för formulär",
136	136
137		FontFormats : "Normal;Formaterad;Adress;Rubrik 1;Rubrik 2;Rubrik 3;Rubrik 4;Rubrik 5;Rubrik 6", //REVIEW : Check _getfontformat.html
	137	FontFormats : "Normal;Formaterad;Adress;Rubrik 1;Rubrik 2;Rubrik 3;Rubrik 4;Rubrik 5;Rubrik 6;Normal (DIV)", //REVIEW : Check _getfontformat.html
138	138
139	139	// Alerts and Messages
…	…
230	230	DlgLnkAnchorByName : "efter ankarnamn",
231	231	DlgLnkAnchorById : "efter objektid",
232		DlgLnkNoAnchors : "~~<Inga ankare kunde hittas>~~", //REVIEW : Change < and > with ( and )
	232	DlgLnkNoAnchors : "(Inga ankare kunde hittas)", //REVIEW : Change < and > with ( and )
233	233	DlgLnkEMail : "E-postadress",
234	234	DlgLnkEMailSubject : "Ämne",
…	…
263	263	DlnLnkMsgNoEMail : "Var god ange E-postadress",
264	264	DlnLnkMsgNoAnchor : "Var god ange ett ankare",
265		DlnLnkMsgInvPopName : "~~The popup name must begin with an alphabetic character and must not contain spaces", //MISSING~~
	265	DlnLnkMsgInvPopName : "Popup-rutans namn måste börja med en alfabetisk bokstav och får inte innehålla mellanslag",
266	266
267	267	// Color Dialog
…	…
345	345
346	346	DlgPasteMsg2 : "Var god och klistra in Er text i rutan nedan genom att använda (<STRONG>Ctrl+V</STRONG>) klicka sen på <STRONG>OK</STRONG>.",
347		DlgPasteSec : "~~Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.", //MISSING~~
	347	DlgPasteSec : "På grund av din webläsares säkerhetsinställningar kan verktyget inte få åtkomst till urklippsdatan. Var god och använd detta fönster istället.",
348	348	DlgPasteIgnoreFont : "Ignorera typsnittsdefinitioner",
349	349	DlgPasteRemoveStyles : "Radera Stildefinitioner",
…	…
382	382	DlgButtonText : "Text (Värde)",
383	383	DlgButtonType : "Typ",
384		DlgButtonTypeBtn : "~~Button", //MISSING~~
385		DlgButtonTypeSbm : "S~~ubmit", //MISSING~~
386		DlgButtonTypeRst : "~~Reset", //MISSING~~
	384	DlgButtonTypeBtn : "Knapp",
	385	DlgButtonTypeSbm : "Skicka",
	386	DlgButtonTypeRst : "Återställ",
387	387
388	388	// Checkbox and Radio Button Dialogs
…	…
456	456	DlgDocLangCode : "Språkkod",
457	457	DlgDocCharSet : "Teckenuppsättningar",
458		DlgDocCharSetCE : "Central Europ~~ean", //MISSING~~
459		DlgDocCharSetCT : "~~Chinese Traditional (Big5)", //MISSING~~
460		DlgDocCharSetCR : "~~Cyrillic", //MISSING~~
461		DlgDocCharSetGR : "Gre~~ek", //MISSING~~
462		DlgDocCharSetJP : "Japan~~ese", //MISSING~~
463		DlgDocCharSetKR : "Korean~~", //MISSING~~
464		DlgDocCharSetTR : "Turkis~~h", //MISSING~~
465		DlgDocCharSetUN : "Unicode (UTF-8)", ~~//MISSING~~
466		DlgDocCharSetWE : "~~Western European", //MISSING~~
	458	DlgDocCharSetCE : "Central Europa",
	459	DlgDocCharSetCT : "Traditionell Kinesisk (Big5)",
	460	DlgDocCharSetCR : "Kyrillisk",
	461	DlgDocCharSetGR : "Grekiska",
	462	DlgDocCharSetJP : "Japanska",
	463	DlgDocCharSetKR : "Koreanska",
	464	DlgDocCharSetTR : "Turkiska",
	465	DlgDocCharSetUN : "Unicode (UTF-8)",
	466	DlgDocCharSetWE : "Väst Europa",
467	467	DlgDocCharSetOther : "Övriga teckenuppsättningar",
468	468
…	…
494	494	DlgTemplatesLoading : "Laddar mallar. Var god vänta...",
495	495	DlgTemplatesNoTpl : "(Ingen mall är vald)",
496		DlgTemplatesReplace : "~~Replace actual contents", //MISSING~~
	496	DlgTemplatesReplace : "Ersätt aktuellt innehåll",
497	497
498	498	// About Dialog
499	499	DlgAboutAboutTab : "Om",
500	500	DlgAboutBrowserInfoTab : "Webläsare",
501		DlgAboutLicenseTab : "Licens~~e", //MISSING~~
	501	DlgAboutLicenseTab : "Licens",
502	502	DlgAboutVersion : "version",
503	503	DlgAboutInfo : "För mer information se"

FCKeditor/branches/versions/2.4.x/editor/lang/_translationstatus.txt

r221	r361
27	27	bn.js Found: 386 Missing: 16
28	28	bs.js Found: 230 Missing: 172
29		ca.js Found: 40~~1 Missing: 1~~
	29	ca.js Found: 402 Missing: 0
30	30	cs.js Found: 386 Missing: 16
31	31	da.js Found: 386 Missing: 16
…	…
37	37	eo.js Found: 350 Missing: 52
38	38	es.js Found: 386 Missing: 16
39		et.js Found: ~~386 Missing: 16~~
	39	et.js Found: 402 Missing: 0
40	40	eu.js Found: 386 Missing: 16
41		fa.js Found: 40~~1 Missing: 1~~
	41	fa.js Found: 402 Missing: 0
42	42	fi.js Found: 386 Missing: 16
43	43	fo.js Found: 401 Missing: 1
…	…
68	68	sr-latn.js Found: 373 Missing: 29
69	69	sr.js Found: 373 Missing: 29
70		sv.js Found: ~~381 Missing: 2~~1
	70	sv.js Found: 401 Missing: 1
71	71	th.js Found: 398 Missing: 4
72	72	tr.js Found: 401 Missing: 1
73		uk.js Found: 40~~1 Missing: 1~~
	73	uk.js Found: 402 Missing: 0
74	74	vi.js Found: 401 Missing: 1
75	75	zh-cn.js Found: 401 Missing: 1

FCKeditor/branches/versions/2.4.x/editor/lang/uk.js

r179	r361
135	135	FormProp : "Властивості форми",
136	136
137		FontFormats : "Нормальний;Форматований;Адреса;Заголовок 1;Заголовок 2;Заголовок 3;Заголовок 4;Заголовок 5;Заголовок 6", //REVIEW : Check _getfontformat.html
	137	FontFormats : "Нормальний;Форматований;Адреса;Заголовок 1;Заголовок 2;Заголовок 3;Заголовок 4;Заголовок 5;Заголовок 6;Нормальний (DIV)", //REVIEW : Check _getfontformat.html
138	138
139	139	// Alerts and Messages
…	…
345	345
346	346	DlgPasteMsg2 : "Будь-ласка, вставте з буфера обміну в цю область, користуючись комбінацією клавіш (<STRONG>Ctrl+V</STRONG>) та натисніть <STRONG>OK</STRONG>.",
347		DlgPasteSec : "~~Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.", //MISSING~~
	347	DlgPasteSec : "Редактор не може отримати прямий доступ до буферу обміну у зв'язку з налаштуваннями вашого браузера. Вам потрібно вставити інформацію повторно в це вікно.",
348	348	DlgPasteIgnoreFont : "Ігнорувати налаштування шрифтів",
349	349	DlgPasteRemoveStyles : "Видалити налаштування стилів",

FCKeditor/branches/versions/2.4.x/editor/plugins/placeholder/lang/fr.js

r133	r361
19	19	* == END LICENSE ==
20	20	*
21		* Plac~~holder Italian~~ language file.
	21	* Placeholder French language file.
22	22	*/
23		FCKLang.PlaceholderBtn = ~~'Insérer/Modifier Substitut'~~ ;
24		FCKLang.PlaceholderDlgTitle = ~~'Propriétés de Substitut'~~ ;
25		FCKLang.PlaceholderDlgName = ~~'Nom de Substitut'~~ ;
26		FCKLang.PlaceholderErrNoName = ~~'Veuillez saisir le nom de Substitut'~~ ;
27		FCKLang.PlaceholderErrNameInUse = ~~'Ce nom est déjà utilisé'~~ ;
	23	FCKLang.PlaceholderBtn = "Insérer/Modifier l'Espace réservé" ;
	24	FCKLang.PlaceholderDlgTitle = "Propriétés de l'Espace réservé" ;
	25	FCKLang.PlaceholderDlgName = "Nom de l'Espace réservé" ;
	26	FCKLang.PlaceholderErrNoName = "Veuillez saisir le nom de l'Espace réservé" ;
	27	FCKLang.PlaceholderErrNameInUse = "Ce nom est déjà utilisé" ;

FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckcontextmenu.js

r179	r361
24	24	var FCKContextMenu = function( parentWindow, langDir )
25	25	{
26		var oPanel = this._Panel = new FCKPanel( parentWindow, true ) ;
	26	this.CtrlDisable = false ;
	27
	28	var oPanel = this._Panel = new FCKPanel( parentWindow ) ;
27	29	oPanel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ;
28	30	oPanel.IsContextMenu = true ;
…	…
88	90	if ( el._FCKContextMenu )
89	91	{
	92	if ( el._FCKContextMenu.CtrlDisable && ( e.ctrlKey \|\| e.metaKey ) )
	93	return true ;
	94
90	95	FCKTools.CancelEvent( e ) ;
91	96	FCKContextMenu_AttachedElement_OnContextMenu( e, el._FCKContextMenu, el ) ;
…	…
101	106	// if ( iButton != 2 )
102	107	// return ;
	108
	109	if ( fckContextMenu.CtrlDisable && ( ev.ctrlKey \|\| ev.metaKey ) )
	110	return true ;
103	111
104	112	var eTarget = el \|\| this ;

FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckenterkey.js

r221	r361
177	177
178	178	// We could be in a nested LI.
179		if ( !previous && currentBlock.nodeName.IEquals( 'LI' ) && currentBlock.parentNode.parentNode.nodeName.IEquals( 'LI' ) )
	179	if ( !previous && currentBlock && currentBlock.nodeName.IEquals( 'LI' ) && currentBlock.parentNode.parentNode.nodeName.IEquals( 'LI' ) )
180	180	{
181	181	this._OutdentWithSelection( currentBlock, range ) ;
…	…
267	267
268	268	// There is just one special case for collapsed selections at the end of a block.
269		if ( oRange.CheckIsCollapsed() && oRange.CheckEndOfBlock( FCKBrowserInfo.IsGecko ) )
	269	if ( oRange.CheckIsCollapsed() && oRange.CheckEndOfBlock( FCKBrowserInfo.IsGeckoLike ) )
270	270	{
271	271	var oCurrentBlock = oRange.StartBlock ;

FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckicon.js

r133	r361
80	80	else // It is using a single icon image.
81	81	{
82		// This is not working well with IE. See notes bellow.
83		// <img class="TB_Button_Image" src="smiley.gif">
84		// eIcon = document.createElement( 'IMG' ) ;
85		// eIcon.src = this.Path ? this.Path : FCK_SPACER_PATH ;
	82	if ( FCKBrowserInfo.IsIE )
	83	{
	84	// IE makes the button 1px higher if using the <img> directly, so we
	85	// are changing to the <div> system to clip the image correctly.
	86	eIcon = document.createElement( 'DIV' ) ;
86	87
87		// IE makes the button 1px higher if using the <img> directly, so we
88		// are changing to the <div> system to clip the image correctly.
89		eIcon = document.createElement( 'DIV' ) ;
90
91		eIconImage = eIcon.appendChild( document.createElement( 'IMG' ) ) ;
92		eIconImage.src = this.Path ? this.Path : FCK_SPACER_PATH ;
	88	eIconImage = eIcon.appendChild( document.createElement( 'IMG' ) ) ;
	89	eIconImage.src = this.Path ? this.Path : FCK_SPACER_PATH ;
	90	}
	91	else
	92	{
	93	// This is not working well with IE. See notes above.
	94	// <img class="TB_Button_Image" src="smiley.gif">
	95	eIcon = document.createElement( 'IMG' ) ;
	96	eIcon.src = this.Path ? this.Path : FCK_SPACER_PATH ;
	97	}
93	98	}
94	99

FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckpanel.js

r133	r361
254	254	var oWindow = this._Popup ? FCKTools.GetDocumentWindow( this.Document ) : this._Window ;
255	255
256		var oChildPanel = new FCKPanel( oWindow~~, true~~ ) ;
	256	var oChildPanel = new FCKPanel( oWindow ) ;
257	257	oChildPanel.ParentPanel = this ;
258	258

FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckspecialcombo.js

r133	r361
37	37	this.Items = new Object() ;
38	38
39		this._Panel = new FCKPanel( parentWindow \|\| window~~, true~~ ) ;
	39	this._Panel = new FCKPanel( parentWindow \|\| window ) ;
40	40	this._Panel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ;
41	41	this._PanelBox = this._Panel.MainNode.appendChild( this._Panel.Document.createElement( 'DIV' ) ) ;

FCKeditor/branches/versions/2.4.x/editor/_source/commandclasses/fck_othercommands.js

r179	r361
169	169
170	170	// Submit the form.
171		oForm.submit() ;
	171	// If there's a button named "submit" then the form.submit() function is masked and
	172	// can't be called in Mozilla, so we call the click() method of that button.
	173	if ( typeof( oForm.submit ) == 'function' )
	174	oForm.submit() ;
	175	else
	176	oForm.submit.click() ;
172	177	}
173	178
…	…
299	304	{
300	305	var oLink = FCK.Selection.MoveToAncestorNode( 'A' ) ;
	306	// The unlink command can generate a span in Firefox, so let's do it our way. See #430
301	307	if ( oLink )
302		FCK.Selection.SelectNode( oLink ) ;
303		}
304
	308	FCKTools.RemoveOuterTags( oLink ) ;
	309
	310	return ;
	311	}
	312
305	313	FCK.ExecuteNamedCommand( this.Name ) ;
306
307		~~if ( FCKBrowserInfo.IsGecko )~~
308		~~FCK.Selection.Collapse( true ) ;~~
309	314	}
310	315

FCKeditor/branches/versions/2.4.x/editor/_source/commandclasses/fcktextcolorcommand.js

r133	r361
39	39	oWindow = window.parent ;
40	40
41		this._Panel = new FCKPanel( oWindow~~, true~~ ) ;
	41	this._Panel = new FCKPanel( oWindow ) ;
42	42	this._Panel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ;
43	43	this._Panel.MainNode.className = 'FCK_Panel' ;

FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckbrowserinfo.js

r133	r361
42	42	{
43	43	var geckoVersion = s.match( /gecko\/(\d+)/ )[1] ;
44		browserInfo.IsGecko10 = geckoVersion < 20051111 ; // Actually "10" refers to Gecko versions before Firefox 1.5, where Gecko 20051111 has been released.
	44
	45	// Actually "10" refers to Gecko versions before Firefox 1.5, when
	46	// Gecko 1.8 (build 20051111) has been released.
	47
	48	// Some browser (like Mozilla 1.7.13) may have a Gecko build greater
	49	// than 20051111, so we must also check for the revision number not to
	50	// be 1.7 (we are assuming that rv < 1.7 will not have build > 20051111).
	51
	52	// TODO: Future versions may consider the rv number only, but it is
	53	// still to check that all Gecko based browser present the rv number.
	54	browserInfo.IsGecko10 = ( ( geckoVersion < 20051111 ) \|\| ( /rv:1\.7/.test(s) ) ) ;
45	55	}
46	56	else

FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckconfig.js

r133	r361
163	163
164	164	// <noscript> tags (get lost in IE and messed up in FF).
165		/<noscript[\s\S]*?<\/noscript>/gi
	165	/<noscript[\s\S]*?<\/noscript>/gi,
	166
	167	// Protect <object> tags. See #359.
	168	/<object[\s\S]+?<\/object>/gi
166	169	] ;
167	170

FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck_contextmenu.js

r213	r361
35	35	{
36	36	var oInnerContextMenu = FCK.ContextMenu._InnerContextMenu = new FCKContextMenu( FCKBrowserInfo.IsIE ? window : window.parent, FCKLang.Dir ) ;
	37	oInnerContextMenu.CtrlDisable = FCKConfig.BrowserContextMenuOnCtrl ;
37	38	oInnerContextMenu.OnBeforeOpen = FCK_ContextMenu_OnBeforeOpen ;
38	39	oInnerContextMenu.OnItemClick = FCK_ContextMenu_OnItemClick ;

FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckdocumentprocessor.js

r213	r361
65	65	{
66	66	//if the anchor has some content then we just add a temporary class
67		if ( oLink.innerHTML != '' )
	67	if ( oLink.innerHTML !== '' )
68	68	{
69	69	if ( FCKBrowserInfo.IsIE )
…	…
173	173	}
174	174
175		FCKFlashProcessor.RefreshView = function( placholderImage, originalEmbed )
176		{
177		if ( originalEmbed.~~width~~ > 0 )
178		plac~~holderImage.style.width = FCKTools.ConvertHtmlSizeToStyle( originalEmbed.width~~ ) ;
179
180		if ( originalEmbed.~~height~~ > 0 )
181		plac~~holderImage.style.height = FCKTools.ConvertHtmlSizeToStyle( originalEmbed.height~~ ) ;
	175	FCKFlashProcessor.RefreshView = function( placeHolderImage, originalEmbed )
	176	{
	177	if ( originalEmbed.getAttribute( 'width' ) > 0 )
	178	placeHolderImage.style.width = FCKTools.ConvertHtmlSizeToStyle( originalEmbed.getAttribute( 'width' ) ) ;
	179
	180	if ( originalEmbed.getAttribute( 'height' ) > 0 )
	181	placeHolderImage.style.height = FCKTools.ConvertHtmlSizeToStyle( originalEmbed.getAttribute( 'height' ) ) ;
182	182	}
183	183

FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckdomtools.js

r221	r361
78	78	if ( eChildNode.nodeName.toUpperCase() == 'BR' && ( ignoreEndBRs \|\| eChildNode.getAttribute( 'type', 2 ) == '_moz' ) )
79	79	{
80		node.removeChild( eChildNode ) ;
	80	// Use "eChildNode.parentNode" instead of "node" to avoid IE bug (#324).
	81	eChildNode.parentNode.removeChild( eChildNode ) ;
81	82	continue ;
82	83	}

FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck_gecko.js

r179	r361
123	123	FCK.ExecuteNamedCommand( commandName, commandParameter ) ;
124	124	}
125		}
126
127		~~FCK.AttachToOnSelectionChange = function( functionPointer )~~
128		{
129		~~this.Events.AttachEvent( 'OnSelectionChange', functionPointer ) ;~~
130	125	}
131	126
…	…
231	226	FCK.CreateLink = function( url )
232	227	{
	228	// Creates the array that will be returned. It contains one or more created links (see #220).
	229	var aCreatedLinks = new Array() ;
	230
233	231	FCK.ExecuteNamedCommand( 'Unlink' ) ;
234	232
…	…
241	239	FCK.ExecuteNamedCommand( 'CreateLink', sTempUrl ) ;
242	240
243		// Retrieve the just created link using XPath.
244		var oLink = this.EditorDocument.evaluate("//a[@href='" + sTempUrl + "']", this.EditorDocument.body, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue ;
245
246		if ( oLink )
	241	// Retrieve the just created links using XPath.
	242	var oLinksInteractor = this.EditorDocument.evaluate("//a[@href='" + sTempUrl + "']", this.EditorDocument.body, null, XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE, null) ;
	243
	244	// Add all links to the returning array.
	245	for ( var i = 0 ; i < oLinksInteractor.snapshotLength ; i++ )
247	246	{