Index: /FCKeditor/trunk/_dev/releaser/fckreleaser.php =================================================================== --- /FCKeditor/trunk/_dev/releaser/fckreleaser.php (revision 2286) +++ /FCKeditor/trunk/_dev/releaser/fckreleaser.php (revision 2287) @@ -82,8 +82,8 @@ { $dirPath = str_replace( '\\', '/', $dirPath ) ; - + if ( substr( $dirPath, -1, 1 ) != '/' ) $dirPath .= '/' ; - + return $dirPath ; } @@ -170,5 +170,5 @@ if ( isset( $releaseNode->Children[ 'IGNOREFILE' ] ) ) { - $ignoreNodes = $releaseNode->Children[ 'IGNOREFILE' ] ; + $ignoreNodes = $releaseNode->Children[ 'IGNOREFILE' ] ; foreach ( $ignoreNodes as $ignoreNode ) { @@ -181,8 +181,8 @@ if ( isset( $releaseNode->Children[ 'ORIGINALFILE' ] ) ) { - $originalNodes = $releaseNode->Children[ 'ORIGINALFILE' ] ; + $originalNodes = $releaseNode->Children[ 'ORIGINALFILE' ] ; foreach ( $originalNodes as $originalNode ) { - $this->OriginalFiles[] = (object)array( + $this->OriginalFiles[] = (object)array( 'Source' => $originalNode->Attributes[ 'SOURCEPATH' ], 'Target' => $originalNode->Attributes[ 'TARGETPATH' ] ) ; @@ -239,5 +239,5 @@ while ( $file = readdir( $sourceDirHandler ) ) { - // Skip ".", ".." and hidden fields (Unix). + // Skip ".", ".." and hidden fields (Unix). if ( substr( $file, 0, 1 ) == '.' ) continue ; @@ -327,7 +327,7 @@ // Project start time (registration at SourceForge, actually = 2003-03-01 18:20). $startTime = gmmktime( 18, 20, 0, 3, 1, 2003 ) ; - + $currentTime = time() ; - + // Get the number of seconds since the project startup. $seconds = $currentTime - $startTime ; @@ -606,5 +606,5 @@ '/\/\/.*$/m', '', $script ) ; - + // Remove spaces before the ";" at the end of the lines $script = preg_replace( Index: /FCKeditor/trunk/_samples/html/assets/swfobject.js =================================================================== --- /FCKeditor/trunk/_samples/html/assets/swfobject.js (revision 2286) +++ /FCKeditor/trunk/_samples/html/assets/swfobject.js (revision 2287) @@ -15,3 +15,4 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*jsl:ignoreall*/ if(typeof deconcept=="undefined"){var deconcept=new Object();}if(typeof deconcept.util=="undefined"){deconcept.util=new Object();}if(typeof deconcept.SWFObjectUtil=="undefined"){deconcept.SWFObjectUtil=new Object();}deconcept.SWFObject=function(_1,id,w,h,_5,c,_7,_8,_9,_a){if(!document.getElementById){return;}this.DETECT_KEY=_a?_a:"detectflash";this.skipDetect=deconcept.util.getRequestParameter(this.DETECT_KEY);this.params=new Object();this.variables=new Object();this.attributes=new Array();if(_1){this.setAttribute("swf",_1);}if(id){this.setAttribute("id",id);}if(w){this.setAttribute("width",w);}if(h){this.setAttribute("height",h);}if(_5){this.setAttribute("version",new deconcept.PlayerVersion(_5.toString().split(".")));}this.installedVer=deconcept.SWFObjectUtil.getPlayerVersion();if(!window.opera&&document.all&&this.installedVer.major>7){deconcept.SWFObject.doPrepUnload=true;}if(c){this.addParam("bgcolor",c);}var q=_7?_7:"high";this.addParam("quality",q);this.setAttribute("useExpressInstall",false);this.setAttribute("doExpressInstall",false);var _c=(_8)?_8:window.location;this.setAttribute("xiRedirectUrl",_c);this.setAttribute("redirectUrl","");if(_9){this.setAttribute("redirectUrl",_9);}};deconcept.SWFObject.prototype={useExpressInstall:function(_d){this.xiSWFPath=!_d?"expressinstall.swf":_d;this.setAttribute("useExpressInstall",true);},setAttribute:function(_e,_f){this.attributes[_e]=_f;},getAttribute:function(_10){return this.attributes[_10];},addParam:function(_11,_12){this.params[_11]=_12;},getParams:function(){return this.params;},addVariable:function(_13,_14){this.variables[_13]=_14;},getVariable:function(_15){return this.variables[_15];},getVariables:function(){return this.variables;},getVariablePairs:function(){var _16=new Array();var key;var _18=this.getVariables();for(key in _18){_16[_16.length]=key+"="+_18[key];}return _16;},getSWFHTML:function(){var _19="";if(navigator.plugins&&navigator.mimeTypes&&navigator.mimeTypes.length){if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","PlugIn");this.setAttribute("swf",this.xiSWFPath);}_19="0){_19+="flashvars=\""+_1c+"\"";}_19+="/>";}else{if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","ActiveX");this.setAttribute("swf",this.xiSWFPath);}_19="";_19+="";var _1d=this.getParams();for(var key in _1d){_19+="";}var _1f=this.getVariablePairs().join("&");if(_1f.length>0){_19+="";}_19+="";}return _19;},write:function(_20){if(this.getAttribute("useExpressInstall")){var _21=new deconcept.PlayerVersion([6,0,65]);if(this.installedVer.versionIsValid(_21)&&!this.installedVer.versionIsValid(this.getAttribute("version"))){this.setAttribute("doExpressInstall",true);this.addVariable("MMredirectURL",escape(this.getAttribute("xiRedirectUrl")));document.title=document.title.slice(0,47)+" - Flash Player Installation";this.addVariable("MMdoctitle",document.title);}}if(this.skipDetect||this.getAttribute("doExpressInstall")||this.installedVer.versionIsValid(this.getAttribute("version"))){var n=(typeof _20=="string")?document.getElementById(_20):_20;n.innerHTML=this.getSWFHTML();return true;}else{if(this.getAttribute("redirectUrl")!=""){document.location.replace(this.getAttribute("redirectUrl"));}}return false;}};deconcept.SWFObjectUtil.getPlayerVersion=function(){var _23=new deconcept.PlayerVersion([0,0,0]);if(navigator.plugins&&navigator.mimeTypes.length){var x=navigator.plugins["Shockwave Flash"];if(x&&x.description){_23=new deconcept.PlayerVersion(x.description.replace(/([a-zA-Z]|\s)+/,"").replace(/(\s+r|\s+b[0-9]+)/,".").split("."));}}else{if(navigator.userAgent&&navigator.userAgent.indexOf("Windows CE")>=0){var axo=1;var _26=3;while(axo){try{_26++;axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash."+_26);_23=new deconcept.PlayerVersion([_26,0,0]);}catch(e){axo=null;}}}else{try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");}catch(e){try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");_23=new deconcept.PlayerVersion([6,0,21]);axo.AllowScriptAccess="always";}catch(e){if(_23.major==6){return _23;}}try{axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");}catch(e){}}if(axo!=null){_23=new deconcept.PlayerVersion(axo.GetVariable("$version").split(" ")[1].split(","));}}}return _23;};deconcept.PlayerVersion=function(_29){this.major=_29[0]!=null?parseInt(_29[0]):0;this.minor=_29[1]!=null?parseInt(_29[1]):0;this.rev=_29[2]!=null?parseInt(_29[2]):0;};deconcept.PlayerVersion.prototype.versionIsValid=function(fv){if(this.majorfv.major){return true;}if(this.minorfv.minor){return true;}if(this.rev=0;i--){_2f[i].style.display="none";for(var x in _2f[i]){if(typeof _2f[i][x]=="function"){_2f[i][x]=function(){};}}}};if(deconcept.SWFObject.doPrepUnload){if(!deconcept.unloadSet){deconcept.SWFObjectUtil.prepUnload=function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){};window.attachEvent("onunload",deconcept.SWFObjectUtil.cleanupSWFs);};window.attachEvent("onbeforeunload",deconcept.SWFObjectUtil.prepUnload);deconcept.unloadSet=true;}}if(!document.getElementById&&document.all){document.getElementById=function(id){return document.all[id];};}var getQueryParamValue=deconcept.util.getRequestParameter;var FlashObject=deconcept.SWFObject;var SWFObject=deconcept.SWFObject; Index: /FCKeditor/trunk/_samples/html/sample15.html =================================================================== --- /FCKeditor/trunk/_samples/html/sample15.html (revision 2286) +++ /FCKeditor/trunk/_samples/html/sample15.html (revision 2287) Index: /FCKeditor/trunk/_whatsnew.html =================================================================== --- /FCKeditor/trunk/_whatsnew.html (revision 2286) +++ /FCKeditor/trunk/_whatsnew.html (revision 2287) @@ -38,17 +38,20 @@ New Features and Improvements:

    -
  • [#439] Added a new - right-click menu option for opening links in the editor.
    • -
  • [#2220] Email links - from the Link dialog are now encoded by default to prevent being harvested by spammers. - (Kudos to asuter for proposing the patch)
    • -
  • [#2234] Added the - ability to create, modify and remove Div containers.
    • -
  • [#2252] It's now possible to enable the - browsers default menu using the configuration file (FCKConfig.BrowserContextMenu option).
    • -
  • [#2032] Added HTML samples - for legacy HTML and Flash-embedded HTML code.
    • -
  • [#2247] The SHIFT+SPACE - keystroke will now produce a   character.
    • +
  • [#439] Added a + new context menu option for opening links in the editor.
    • +
  • [#2220] + Email links from the Link dialog are now encoded by default + to prevent being harvested by spammers. (Kudos to asuter for proposing the patch) +
    • +
  • [#2234] Added + the ability to create, modify and remove DIV containers.
    • +
  • [#2247] The + SHIFT+SPACE keystroke will now produce a   character. +
    • +
  • [#2252] It's + now possible to enable the browsers default menu using the configuration file (FCKConfig.BrowserContextMenu + option).
    • +
  • [#2032] Added + HTML samples for legacy HTML and Flash HTML.
  • [#234] Introduced the "PreventSubmitHandler" setting, which makes it possible to instruct the editor @@ -58,64 +61,66 @@ Fixed Bugs:

      -
    • [#2316] The sample - posted data page has now the table fixed at 100% width.
    • [#2319] On Opera and Firefox 3, the entire page was scrolling on SHIFT+ENTER, or when EnterMode='br'.
      • -
    • [#692] Added some hints in - editor/css/fck_editorarea.css on how to handle style items that would break the style combo. -
      • -
    • [#2263] Fixed a JavaScript - error in IE which occurs when there are placeholder elements in the document and the user - has pressed the Source button.
      • -
    • [#2314] Corrected - mixed up Chinese translations for the blockquote command.
    • [#2321] On Firefox 3, the entire page was scrolling when inserting block elements with the FCK.InsertElement function, used by the Table and Horizontal Rule buttons..
      • -
    • [#2323] Fixed the issue - where the show blocks command loses the current selection from the view area when editing - a long document.
      • -
    • [#2322] Fixed the issue - where the fit window command loses the current selection and scroll position in the - editing area.
      • -
    • [#1917] Fixed the issue - where the merge down command for tables cells does not work in IE for more than two - cells.
      • -
    • [#2320] Fixed the issue - where the Find/Replace dialog scrolls the entire page.
      • -
    • [#1645] Added warning message - about Firefox 3's strict origin policy.
      • -
    • [#2272] Improved the - garbage filter in Paste from Word dialog.
      • -
    • [#2327] Fixed invalid HTML - in the Paste dialog.
      • -
    • [#1907] Fixed sporadic - "FCKeditorAPI is not defined" errors in Firefox 3.
      • -
    • [#2356] Fixed access denied - error in IE7 when FCKeditor is launched from local filesystem.
      • -
    • [#1150] Fixed the type="_moz" attribute - that sometimes appear in <br> tags in non-IE browsers.
      • +
    • [#692] Added some + hints in editor/css/fck_editorarea.css on how to handle style items that would break + the style combo.
      • +
    • [#2263] Fixed + a JavaScript error in IE which occurs when there are placeholder elements in the + document and the user has pressed the Source button.
      • +
    • [#2314] Corrected + mixed up Chinese translations for the blockquote command.
      • +
    • [#2323] Fixed + the issue where the show blocks command loses the current selection from the view + area when editing a long document.
      • +
    • [#2322] Fixed + the issue where the fit window command loses the current selection and scroll position + in the editing area.
      • +
    • [#1917] Fixed + the issue where the merge down command for tables cells does not work in IE for + more than two cells.
      • +
    • [#2320] Fixed + the issue where the Find/Replace dialog scrolls the entire page.
      • +
    • [#1645] Added + warning message about Firefox 3's strict origin policy.
      • +
    • [#2272] Improved + the garbage filter in Paste from Word dialog.
      • +
    • [#2327] Fixed + invalid HTML in the Paste dialog.
      • +
    • [#1907] Fixed + sporadic "FCKeditorAPI is not defined" errors in Firefox 3.
      • +
    • [#2356] Fixed + access denied error in IE7 when FCKeditor is launched from local filesystem.
      • +
    • [#1150] Fixed + the type="_moz" attribute that sometimes appear in <br> tags in non-IE browsers.
    • [#1229] Converting - multiple contiguous paragraphs to Formatted will now be merged into a single - <PRE> block.
      • + multiple contiguous paragraphs to Formatted will now be merged into a single <PRE> + block.
    • [#2363] There were some sporadic "Permission Denied" errors with IE on some situations.
      • -
    • [#2135] Fixed a - data loss bug in IE when there are @import statements in the editor's CSS files, +
    • [#2135] Fixed + a data loss bug in IE when there are @import statements in the editor's CSS files, and IE's cache is set to "Check for newer versions on every visit".
    • [#2376] FCK.InsertHtml() - will now insert to the last selected position after the user has selected things outside - of FCKeditor, in IE.
      • -
    • [#2368] Fixed broken protect - source logic for comments in IE.
      • -
    • [#2387] Fixed JavaScript - error with list commands when the editable document is selected with Ctrl-A.
      • -
    • [#2390] Fixed the issue where - indent styles in JavaScript-generated <p> blocks are erased in IE.
      • -
    • [#2394] Fixed JavaScript - error with the "split vertically" command in IE when attempting to split cells in the last - row of a table.
      • + will now insert to the last selected position after the user has selected things + outside of FCKeditor, in IE. +
    • [#2368] Fixed + broken protect source logic for comments in IE.
      • +
    • [#2387] Fixed + JavaScript error with list commands when the editable document is selected with + Ctrl-A.
      • +
    • [#2390] Fixed + the issue where indent styles in JavaScript-generated <p> blocks are erased + in IE.
      • +
    • [#2394] Fixed + JavaScript error with the "split vertically" command in IE when attempting to split + cells in the last row of a table.
      • +
    • [#2316] The sample + posted data page has now the table fixed at 100% width.
    • [#2396] SpellerPages - was causing a "Permission Denied" error in some situations.
      • + was causing a "Permission Denied" error in some situations.

    Index: /FCKeditor/trunk/editor/_source/classes/fckeditingarea.js =================================================================== --- /FCKeditor/trunk/editor/_source/classes/fckeditingarea.js (revision 2286) +++ /FCKeditor/trunk/editor/_source/classes/fckeditingarea.js (revision 2287) @@ -152,10 +152,10 @@ { var editArea = this ; - + // Using a IE alternative for DOMContentLoaded, similar to the // solution proposed at http://javascript.nwbox.com/IEContentLoaded/ setTimeout( function() { - try + try { editArea.Window.document.documentElement.doScroll("left") ; Index: /FCKeditor/trunk/editor/_source/classes/fckstyle.js =================================================================== --- /FCKeditor/trunk/editor/_source/classes/fckstyle.js (revision 2286) +++ /FCKeditor/trunk/editor/_source/classes/fckstyle.js (revision 2287) @@ -889,5 +889,5 @@ var cursor = newBlock.firstChild ; - + // We are not splitting

    at the beginning of the block, so // we'll start from the second child. @@ -959,8 +959,8 @@ var newBlockIsPre = newBlock.nodeName.IEquals( 'pre' ) ; var blockIsPre = block.nodeName.IEquals( 'pre' ) ; - + var toPre = newBlockIsPre && !blockIsPre ; var fromPre = !newBlockIsPre && blockIsPre ; - + // Move everything from the current node to the new one. if ( toPre ) Index: /FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js =================================================================== --- /FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js (revision 2286) +++ /FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js (revision 2287) @@ -580,5 +580,5 @@ { } -FCKDeleteDivCommand.prototype = +FCKDeleteDivCommand.prototype = { GetState : function() @@ -599,5 +599,5 @@ // Find out the nodes to delete. var nodes = FCKDomTools.GetSelectedDivContainers() ; - + // Remember the current selection position. var range = new FCKDomRange( FCK.EditorWindow ) ; Index: /FCKeditor/trunk/editor/_source/internals/fck.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fck.js (revision 2286) +++ /FCKeditor/trunk/editor/_source/internals/fck.js (revision 2287) @@ -416,5 +416,5 @@ // Save the resetIsDirty for later use (async) this._ForceResetIsDirty = ( resetIsDirty === true ) ; - + // Protect parts of the code that must remain untouched (and invisible) // during editing. Index: /FCKeditor/trunk/editor/_source/internals/fck_contextmenu.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fck_contextmenu.js (revision 2286) +++ /FCKeditor/trunk/editor/_source/internals/fck_contextmenu.js (revision 2287) @@ -309,5 +309,5 @@ } }} ; - + // @Packager.Remove.Start default : Index: /FCKeditor/trunk/editor/_source/internals/fckxhtml_ie.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fckxhtml_ie.js (revision 2286) +++ /FCKeditor/trunk/editor/_source/internals/fckxhtml_ie.js (revision 2287) @@ -83,5 +83,5 @@ } - // IE loses the style attribute in JavaScript-created elements tags. (#2390) + // IE loses the style attribute in JavaScript-created elements tags. (#2390) if ( bHasStyle || htmlNode.style.cssText.length > 0 ) { Index: /FCKeditor/trunk/editor/dialog/fck_anchor.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_anchor.html (revision 2286) +++ /FCKeditor/trunk/editor/dialog/fck_anchor.html (revision 2287) @@ -126,6 +126,7 @@ else { - var n ; - aNewAnchors.push( ( n = oEditor.FCK.InsertElement( 'a' ), n.name = sNewName, n ) ) ; + var n = oEditor.FCK.InsertElement( 'a' ) ; + n.name = sNewName ; + aNewAnchors.push( n ) ; } } Index: /FCKeditor/trunk/editor/dialog/fck_div.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_div.html (revision 2286) +++ /FCKeditor/trunk/editor/dialog/fck_div.html (revision 2287) @@ -279,5 +279,5 @@ else CurrentContainers[i].removeAttribute( 'dir' ) ; - + if ( styleName ) FCKStyles.GetStyle( styleName ).ApplyToObject( CurrentContainers[i] ) ; Index: /FCKeditor/trunk/editor/dialog/fck_link/fck_link.js =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_link/fck_link.js (revision 2286) +++ /FCKeditor/trunk/editor/dialog/fck_link/fck_link.js (revision 2287) @@ -82,5 +82,5 @@ oParser.SortNumerical = function(a, b) { - return parseInt( a ) - parseInt( b ) ; + return parseInt( a, 10 ) - parseInt( b, 10 ) ; } @@ -142,5 +142,5 @@ { // Escape special chars. - func = func.replace( /([/^$*+.?()\[\]])/g, '\\$1' ) ; + func = func.replace( /([\/^$*+.?()\[\]])/g, '\\$1' ) ; // Define the possible keys. @@ -240,6 +240,7 @@ func = func.replace(/SUBJECT/g, "'" + encodeURIComponent( subject ).replace(/'/g, '\\\'') + "'") ; func = func.replace(/BODY/g, "'" + encodeURIComponent( body ).replace(/'/g, '\\\'') + "'") ; + return 'javascript:' + func ; - break ; + case 'encode' : var aParams = [] ; @@ -254,20 +255,22 @@ return 'javascript:location.href=\'mailto:\'+String.fromCharCode(' + aAddressCode.join( ',' ) + ')+\'?' + aParams.join( '&' ) + '\'' ; - default : // 'none' - var sBaseUri = 'mailto:' + address ; - - var sParams = '' ; - - if ( subject.length > 0 ) - sParams = '?subject=' + encodeURIComponent( subject ) ; - - if ( body.length > 0 ) - { - sParams += ( sParams.length == 0 ? '?' : '&' ) ; - sParams += 'body=' + encodeURIComponent( body ) ; - } - - return sBaseUri + sParams ; - } + } + + // EMailProtection 'none' + + var sBaseUri = 'mailto:' + address ; + + var sParams = '' ; + + if ( subject.length > 0 ) + sParams = '?subject=' + encodeURIComponent( subject ) ; + + if ( body.length > 0 ) + { + sParams += ( sParams.length == 0 ? '?' : '&' ) ; + sParams += 'body=' + encodeURIComponent( body ) ; + } + + return sBaseUri + sParams ; }