Index: /FCKeditor/trunk/_dev/lint.conf =================================================================== --- /FCKeditor/trunk/_dev/lint.conf (revision 1628) +++ /FCKeditor/trunk/_dev/lint.conf (revision 1629) @@ -45,5 +45,5 @@ +duplicate_case_in_switch # duplicate case in switch statements +default_not_at_end # the default case is not at the end of the switch statement -+legacy_cc_not_understood # couldn't understand control comment using /*@keyword@*/ syntax +-legacy_cc_not_understood # couldn't understand control comment using /*@keyword@*/ syntax +jsl_cc_not_understood # couldn't understand control comment using /*jsl:keyword*/ syntax +useless_comparison # useless comparison; comparing identical expressions Index: /FCKeditor/trunk/_dev/lint.mac.conf =================================================================== --- /FCKeditor/trunk/_dev/lint.mac.conf (revision 1628) +++ /FCKeditor/trunk/_dev/lint.mac.conf (revision 1629) @@ -45,5 +45,5 @@ +duplicate_case_in_switch # duplicate case in switch statements +default_not_at_end # the default case is not at the end of the switch statement -+legacy_cc_not_understood # couldn't understand control comment using /*@keyword@*/ syntax +-legacy_cc_not_understood # couldn't understand control comment using /*@keyword@*/ syntax +jsl_cc_not_understood # couldn't understand control comment using /*jsl:keyword*/ syntax +useless_comparison # useless comparison; comparing identical expressions Index: /FCKeditor/trunk/_samples/adobeair/package.bat =================================================================== --- /FCKeditor/trunk/_samples/adobeair/package.bat (revision 1628) +++ /FCKeditor/trunk/_samples/adobeair/package.bat (revision 1629) @@ -25,3 +25,2 @@ "C:\Adobe AIR SDK\bin\adt" -package -storetype pkcs12 -keystore sample01_cert.pfx -storepass 123abc FCKeditor.air application.xml -C ../../ . - Index: /FCKeditor/trunk/_test/manual/fckbrowserinfo/test1.html =================================================================== --- /FCKeditor/trunk/_test/manual/fckbrowserinfo/test1.html (revision 1628) +++ /FCKeditor/trunk/_test/manual/fckbrowserinfo/test1.html (revision 1629) @@ -42,4 +42,11 @@ + + + + + FCKBrowserInfo.IsIE6 + + Index: /FCKeditor/trunk/_whatsnew.html =================================================================== --- /FCKeditor/trunk/_whatsnew.html (revision 1628) +++ /FCKeditor/trunk/_whatsnew.html (revision 1629) @@ -38,6 +38,6 @@ New Features and Improvements:

Index: /FCKeditor/trunk/editor/_source/classes/fckcontextmenu.js =================================================================== --- /FCKeditor/trunk/editor/_source/classes/fckcontextmenu.js (revision 1628) +++ /FCKeditor/trunk/editor/_source/classes/fckcontextmenu.js (revision 1629) @@ -59,5 +59,5 @@ /** - The customData parameter is just a value that will be send to the command that is executed, + The customData parameter is just a value that will be send to the command that is executed, so it's possible to reuse the same command for several items just by assigning different data for each one. */ Index: /FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js =================================================================== --- /FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js (revision 1628) +++ /FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js (revision 1629) @@ -408,5 +408,5 @@ { var enabled = false ; - + if ( FCKBrowserInfo.IsIE ) { @@ -415,11 +415,11 @@ // only if the security settings enabled the command to execute. - var onEvent = function() - { - enabled = true ; + var onEvent = function() + { + enabled = true ; } ; var eventName = 'on' + this.Name.toLowerCase() ; - + FCK.EditorDocument.body.attachEvent( eventName, onEvent ) ; FCK.ExecuteNamedCommand( this.Name ) ; @@ -428,5 +428,5 @@ else { - try + try { // Other browsers throw an error if the command is disabled. Index: /FCKeditor/trunk/editor/_source/internals/fck.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fck.js (revision 1628) +++ /FCKeditor/trunk/editor/_source/internals/fck.js (revision 1629) @@ -971,5 +971,5 @@ function _FCK_GetEditorAreaStyleTags() { - return FCKTools.GetStyleHtml( FCKConfig.EditorAreaCSS ) + + return FCKTools.GetStyleHtml( FCKConfig.EditorAreaCSS ) + FCKTools.GetStyleHtml( FCKConfig.EditorAreaStyles ) ; } Index: /FCKeditor/trunk/editor/_source/internals/fckbrowserinfo.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fckbrowserinfo.js (revision 1628) +++ /FCKeditor/trunk/editor/_source/internals/fckbrowserinfo.js (revision 1629) @@ -27,6 +27,6 @@ { IsIE : /*@cc_on!@*/false, - IsIE7 : /*@cc_on!@*/false && ( parseInt( s.match( /msie (\d+)/ )[1] ) >= 7 ), - IsIE6 : /*@cc_on!@*/false && ( parseInt( s.match( /msie (\d+)/ )[1] ) >= 6 ), + IsIE7 : /*@cc_on!@*/false && ( parseInt( s.match( /msie (\d+)/ )[1], 10 ) >= 7 ), + IsIE6 : /*@cc_on!@*/false && ( parseInt( s.match( /msie (\d+)/ )[1], 10 ) >= 6 ), IsGecko : s.Contains('gecko/'), IsSafari : s.Contains(' applewebkit/'), // Read "IsWebKit" Index: /FCKeditor/trunk/editor/_source/internals/fckdomtools.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fckdomtools.js (revision 1628) +++ /FCKeditor/trunk/editor/_source/internals/fckdomtools.js (revision 1629) @@ -525,5 +525,5 @@ for ( var i = 0 ; i < aAttributes.length ; i++ ) this.RemoveAttribute( element, aAttributes[i] ); - }, + }, GetAttributeValue : function( element, att ) Index: /FCKeditor/trunk/editor/_source/internals/fcktools.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fcktools.js (revision 1628) +++ /FCKeditor/trunk/editor/_source/internals/fcktools.js (revision 1629) @@ -56,5 +56,5 @@ { var match = cssStyles.match( /^([^|]+)\|([\s\S]*)/ ) ; - + if ( match ) return FCKTools.FixCssUrls( match[1], match[2] ) ; @@ -106,8 +106,8 @@ return '' ; - var temp = markTemp ? ' _fcktemp="true"' : '' ; + var temp = markTemp ? ' _fcktemp="true"' : '' ; return '<' + 'style type="text/css"' + temp + '>' + styleDef + '<' + '/style>' ; } - + var getLink = function( cssFileUrl, markTemp ) { @@ -115,5 +115,5 @@ return '' ; - var temp = markTemp ? ' _fcktemp="true"' : '' ; + var temp = markTemp ? ' _fcktemp="true"' : '' ; return '<' + 'link href="' + cssFileUrl + '" type="text/css" rel="stylesheet" ' + temp + '/>' ; } Index: /FCKeditor/trunk/editor/_source/internals/fcktools_gecko.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fcktools_gecko.js (revision 1628) +++ /FCKeditor/trunk/editor/_source/internals/fcktools_gecko.js (revision 1629) @@ -53,5 +53,5 @@ { if ( !cssStyles ) - return ; + return null ; var e = documentElement.createElement( "STYLE" ) ; Index: /FCKeditor/trunk/editor/_source/internals/fcktools_ie.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fcktools_ie.js (revision 1628) +++ /FCKeditor/trunk/editor/_source/internals/fcktools_ie.js (revision 1629) @@ -37,5 +37,5 @@ { if ( !cssStyles ) - return ; + return null ; var s = documentElement.createStyleSheet( "" ) ; Index: /FCKeditor/trunk/editor/dialog/common/fck_dialog_common.js =================================================================== --- /FCKeditor/trunk/editor/dialog/common/fck_dialog_common.js (revision 1628) +++ /FCKeditor/trunk/editor/dialog/common/fck_dialog_common.js (revision 1629) @@ -336,3 +336,2 @@ oDest.style.cssText = oSource.style.cssText ; } - Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/connector.cfm =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/cfm/connector.cfm (revision 1628) +++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/connector.cfm (revision 1629) Index: /FCKeditor/trunk/editor/filemanager/connectors/perl/io.pl =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/perl/io.pl (revision 1628) +++ /FCKeditor/trunk/editor/filemanager/connectors/perl/io.pl (revision 1629) @@ -100,5 +100,5 @@ } } - + return(0); } else { Index: /FCKeditor/trunk/editor/filemanager/connectors/perl/upload_fck.pl =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/perl/upload_fck.pl (revision 1628) +++ /FCKeditor/trunk/editor/filemanager/connectors/perl/upload_fck.pl (revision 1629) @@ -146,5 +146,5 @@ mkdir("$img_dir",0777); } - } + } undef $img_data_exists; Index: /FCKeditor/trunk/editor/filemanager/connectors/php/commands.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/php/commands.php (revision 1628) +++ /FCKeditor/trunk/editor/filemanager/connectors/php/commands.php (revision 1629) @@ -193,5 +193,5 @@ if ( isset( $Config['HtmlExtensions'] ) ) { - if ( !IsHtmlExtension( $sExtension, $Config['HtmlExtensions'] ) && + if ( !IsHtmlExtension( $sExtension, $Config['HtmlExtensions'] ) && ( $detectHtml = DetectHtml( $oFile['tmp_name'] ) ) === true ) { @@ -225,12 +225,12 @@ break ; } - + $permissions = 0777; - + if ( isset( $Config['ChmodOnUpload'] ) && $Config['ChmodOnUpload'] ) { $permissions = $Config['ChmodOnUpload'] ; } - + $oldumask = umask(0) ; chmod( $sFilePath, $permissions ) ; @@ -241,5 +241,5 @@ } } - + if ( file_exists( $sFilePath ) ) { @@ -253,5 +253,5 @@ { @unlink( $sFilePath ) ; - $sErrorNumber = '202' ; + $sErrorNumber = '202' ; } } Index: /FCKeditor/trunk/editor/filemanager/connectors/php/io.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/php/io.php (revision 1628) +++ /FCKeditor/trunk/editor/filemanager/connectors/php/io.php (revision 1629) @@ -119,10 +119,10 @@ // Enable error tracking to catch the error. ini_set( 'track_errors', '1' ) ; - + if ( isset( $Config['ChmodOnFolderCreate'] ) && !$Config['ChmodOnFolderCreate'] ) { mkdir( $folderPath ) ; } - else + else { $permissions = 0777 ; @@ -134,6 +134,6 @@ $oldumask = umask(0) ; mkdir( $folderPath, $permissions ) ; - umask( $oldumask ) ; - } + umask( $oldumask ) ; + } $sErrorMsg = $php_errormsg ; Index: /FCKeditor/trunk/editor/filemanager/connectors/php/util.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/php/util.php (revision 1628) +++ /FCKeditor/trunk/editor/filemanager/connectors/php/util.php (revision 1629) @@ -88,5 +88,5 @@ { $fp = @fopen( $filePath, 'rb' ) ; - + //open_basedir restriction, see #1906 if ( $fp === false || !flock( $fp, LOCK_SH ) ) @@ -94,5 +94,5 @@ return -1 ; } - + $chunk = fread( $fp, 1024 ) ; flock( $fp, LOCK_UN ) ; @@ -161,5 +161,5 @@ return -1; } - + $imageCheckExtensions = array('gif', 'jpeg', 'jpg', 'png', 'swf', 'psd', 'bmp', 'iff'); Index: /FCKeditor/trunk/editor/filemanager/connectors/py/fckcommands.py =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/py/fckcommands.py (revision 1628) +++ /FCKeditor/trunk/editor/filemanager/connectors/py/fckcommands.py (revision 1629) @@ -111,16 +111,16 @@ "Purpose: physically creates a folder on the server" # No need to check if the parent exists, just create all hierachy - + try: permissions = Config.ChmodOnFolderCreate if not permissions: - os.makedirs(folderPath) + os.makedirs(folderPath) except AttributeError: #ChmodOnFolderCreate undefined permissions = 0755 - + if permissions: oldumask = os.umask(0) os.makedirs(folderPath,mode=0755) - os.umask( oldumask ) + os.umask( oldumask ) class UploadFileCommandMixin (object): Index: /FCKeditor/trunk/editor/js/fckadobeair.js =================================================================== --- /FCKeditor/trunk/editor/js/fckadobeair.js (revision 1628) +++ /FCKeditor/trunk/editor/js/fckadobeair.js (revision 1629) @@ -30,5 +30,5 @@ */ - function _GetDocumentHead( doc ) + var getDocumentHead = function( doc ) { var head ; @@ -73,5 +73,5 @@ { // Inject the HTML inside a

. - // Do that before _GetDocumentHead because WebKit moves + // Do that before getDocumentHead because WebKit moves // elements to the at this point. var div = doc.createElement( 'div' ) ; @@ -79,5 +79,5 @@ // Move the
nodes to . - FCKDomTools.MoveChildren( div, _GetDocumentHead( doc ) ) ; + FCKDomTools.MoveChildren( div, getDocumentHead( doc ) ) ; } @@ -94,5 +94,5 @@ Panel_Contructor : function( doc, baseLocation ) { - var head = _GetDocumentHead( doc ) ; + var head = getDocumentHead( doc ) ; // Set the href. @@ -120,5 +120,5 @@ ToolbarSet_InitOutFrame : function( doc ) { - var head = _GetDocumentHead( doc ) ; + var head = getDocumentHead( doc ) ; head.appendChild( doc.createElement('base') ).href = window.document.location ; @@ -164,5 +164,5 @@ panel._focusTimer = FCKTools.SetTimeout( _Original_FCKPanel_Window_OnBlur, 100, this, [ e, panel ] ) ; } - + FCK.StartEditor = function() { Index: /FCKeditor/trunk/editor/lang/_translationstatus.txt =================================================================== --- /FCKeditor/trunk/editor/lang/_translationstatus.txt (revision 1628) +++ /FCKeditor/trunk/editor/lang/_translationstatus.txt (revision 1629) @@ -1,3 +1,3 @@ -/* +/* * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2008 Frederico Caldeira Knabben Index: /FCKeditor/trunk/editor/plugins/placeholder/lang/es.js =================================================================== --- /FCKeditor/trunk/editor/plugins/placeholder/lang/es.js (revision 1628) +++ /FCKeditor/trunk/editor/plugins/placeholder/lang/es.js (revision 1629) @@ -1,3 +1,3 @@ -?/* +/* * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2008 Frederico Caldeira Knabben Index: /FCKeditor/trunk/fckconfig.js =================================================================== --- /FCKeditor/trunk/fckconfig.js (revision 1628) +++ /FCKeditor/trunk/fckconfig.js (revision 1629) @@ -193,5 +193,5 @@ FCKConfig.RemoveFormatTags = 'b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var' ; -// Attributes that will be removed +// Attributes that will be removed FCKConfig.RemoveAttributes = 'class,style,lang,width,height,align,hspace,valign' ; Index: /FCKeditor/trunk/fckeditor.php =================================================================== --- /FCKeditor/trunk/fckeditor.php (revision 1628) +++ /FCKeditor/trunk/fckeditor.php (revision 1629) @@ -47,5 +47,5 @@ } } - + if ( strpos($sAgent, 'MSIE') !== false && strpos($sAgent, 'mac') === false && strpos($sAgent, 'Opera') === false ) {