From 3253e3057ad8fb01fdc360fd4489407060d3c268 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 12 Nov 2007 13:49:05 +0000 Subject: [PATCH] =?UTF-8?q?Mise=20=E0=20jour=20de=20fckeditor=20=E0=20la?= =?UTF-8?q?=20version=202.5beta=20-=20r=E9installation=20compl=E8te=20car?= =?UTF-8?q?=20la=20structure=20des=20r=E9pertoires=20=E0=20chang=E9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/includes/fckeditor/_documentation.html | 16 +- htdocs/includes/fckeditor/_upgrade.html | 16 +- htdocs/includes/fckeditor/_whatsnew.html | 2949 +++-------------- .../includes/fckeditor/_whatsnew_history.html | 2804 ++++++++++++++++ .../includes/fckeditor/dolibarr_changes.txt | 2 +- .../editor/css/images/block_address.png | Bin 0 -> 288 bytes .../editor/css/images/block_blockquote.png | Bin 0 -> 293 bytes .../fckeditor/editor/css/images/block_div.png | Bin 0 -> 229 bytes .../fckeditor/editor/css/images/block_h1.png | Bin 0 -> 218 bytes .../fckeditor/editor/css/images/block_h2.png | Bin 0 -> 220 bytes .../fckeditor/editor/css/images/block_h3.png | Bin 0 -> 219 bytes .../fckeditor/editor/css/images/block_h4.png | Bin 0 -> 229 bytes .../fckeditor/editor/css/images/block_h5.png | Bin 0 -> 236 bytes .../fckeditor/editor/css/images/block_h6.png | Bin 0 -> 216 bytes .../fckeditor/editor/css/images/block_p.png | Bin 0 -> 205 bytes .../fckeditor/editor/css/images/block_pre.png | Bin 0 -> 223 bytes .../editor/css/images/fck_hiddenfield.gif | Bin 0 -> 105 bytes .../includes/fckeditor/editor/fckdebug.html | 52 +- .../includes/fckeditor/editor/fckdialog.html | 43 +- .../includes/fckeditor/editor/fckeditor.html | 51 +- .../fckeditor/editor/fckeditor.original.html | 79 +- htdocs/includes/fckeditor/fckconfig.js | 162 +- htdocs/includes/fckeditor/fckeditor.afp | 42 +- htdocs/includes/fckeditor/fckeditor.asp | 145 +- htdocs/includes/fckeditor/fckeditor.cfc | 202 +- htdocs/includes/fckeditor/fckeditor.cfm | 109 +- htdocs/includes/fckeditor/fckeditor.js | 62 +- htdocs/includes/fckeditor/fckeditor.lasso | 69 +- htdocs/includes/fckeditor/fckeditor.php | 34 +- htdocs/includes/fckeditor/fckeditor.pl | 25 +- htdocs/includes/fckeditor/fckeditor.py | 23 +- htdocs/includes/fckeditor/fckeditor_php4.php | 70 +- htdocs/includes/fckeditor/fckeditor_php5.php | 58 +- .../{editor/_packager.xml => fckpackager.xml} | 106 +- htdocs/includes/fckeditor/fckstyles.xml | 116 +- htdocs/includes/fckeditor/fcktemplates.xml | 25 +- htdocs/includes/fckeditor/htaccess.txt | 44 - 37 files changed, 4138 insertions(+), 3166 deletions(-) create mode 100644 htdocs/includes/fckeditor/_whatsnew_history.html create mode 100644 htdocs/includes/fckeditor/editor/css/images/block_address.png create mode 100644 htdocs/includes/fckeditor/editor/css/images/block_blockquote.png create mode 100644 htdocs/includes/fckeditor/editor/css/images/block_div.png create mode 100644 htdocs/includes/fckeditor/editor/css/images/block_h1.png create mode 100644 htdocs/includes/fckeditor/editor/css/images/block_h2.png create mode 100644 htdocs/includes/fckeditor/editor/css/images/block_h3.png create mode 100644 htdocs/includes/fckeditor/editor/css/images/block_h4.png create mode 100644 htdocs/includes/fckeditor/editor/css/images/block_h5.png create mode 100644 htdocs/includes/fckeditor/editor/css/images/block_h6.png create mode 100644 htdocs/includes/fckeditor/editor/css/images/block_p.png create mode 100644 htdocs/includes/fckeditor/editor/css/images/block_pre.png create mode 100644 htdocs/includes/fckeditor/editor/css/images/fck_hiddenfield.gif rename htdocs/includes/fckeditor/{editor/_packager.xml => fckpackager.xml} (76%) delete mode 100644 htdocs/includes/fckeditor/htaccess.txt diff --git a/htdocs/includes/fckeditor/_documentation.html b/htdocs/includes/fckeditor/_documentation.html index afac487445c..fe8f02bfa06 100644 --- a/htdocs/includes/fckeditor/_documentation.html +++ b/htdocs/includes/fckeditor/_documentation.html @@ -2,22 +2,22 @@ diff --git a/htdocs/includes/fckeditor/_upgrade.html b/htdocs/includes/fckeditor/_upgrade.html index 1af55d5d64a..8b95128cb96 100644 --- a/htdocs/includes/fckeditor/_upgrade.html +++ b/htdocs/includes/fckeditor/_upgrade.html @@ -2,22 +2,22 @@ diff --git a/htdocs/includes/fckeditor/_whatsnew.html b/htdocs/includes/fckeditor/_whatsnew.html index 1c02358fc30..4e61fe4045b 100644 --- a/htdocs/includes/fckeditor/_whatsnew.html +++ b/htdocs/includes/fckeditor/_whatsnew.html @@ -2,22 +2,22 @@ @@ -30,2543 +30,424 @@

- Version 2.4

+ Version 2.5 Beta

New Features and Improvements:

Fixed Bugs:

- * This version has been partially sponsored by Medical - Media Lab.

-

- Version 2.3.3

-

- New Features and Improvements:

- -

- Version 2.3.2

-

- New Features and Improvements:

- -

- Fixed Bugs:

- -

- Version 2.3.1

-

- Fixed Bugs:

- -

- Version 2.3

-

- New Features and Improvements:

- -

- Fixed Bugs:

- -

- * This version has been partially sponsored by Footsteps - and Kentico.

-

- Version 2.3 Beta

-

- New Features and Improvements:

- -

- Fixed Bugs:

- -

- * This version has been partially sponsored by Footsteps - and Kentico. -
- ** This version has been partially sponsored by Nextide.

-

- Version 2.2

-

- New Features and Improvements:

- -

- Fixed Bugs:

- -

- Special thanks to - Alfonso Martinez, who have provided many patches and suggestions for the - following features / fixes present in this version. I encourage all you to - donate to Alfonso, as a way to say thanks for his nice open source approach. - Thanks Alfonso!. Check out his contributions:

- -

- * This version has been partially sponsored by - Alkacon Software.

-

- Version 2.1.1

-

- New Features and Improvements:

- -

- Fixed Bugs:

- -

- * This version has been partially sponsored by - Acctive Software S.A..

-

- Version 2.1

-

- New Features and Improvements:

- -

- Fixed Bugs:

- -

- Version 2.0

-

- New Features and Improvements:

- -

- Fixed Bugs:

- -

- * This version has been partially sponsored by - Infineon Technologies AG.
- ** This version has been partially sponsored by - Visualsoft Web Solutions.
- *** This version has been partially sponsored by - Web Crossing, Inc.

-

- Version 2.0 FC (Final Candidate)

-

- New Features and Improvements:

- -

- Fixed Bugs:

- -

- * This version has been partially sponsored by the - Hamilton College.
- ** This version has been partially sponsored by - Infineon Technologies AG.

-

- Version 2.0 RC3 (Release Candidate 3)

-

- New Features and Improvements:

- -

- Fixed Bugs:

- -

- Version 2.0 RC2 (Release Candidate 2)

- -

- Version 2.0 RC1 (Release Candidate 1)

- -

- Version 2.0 Beta 2

- -

- Version 2.0 Beta 1

-

- This is the first beta of the 2.x series. It brings a lot of new and important things. - Beta versions will be released until all features available on version 1.x will - be introduced in the 2.0.
-
- Note: As it is a beta, it is not yet completely developed. Future - versions can bring new features that can break backward compatibility with this - version. + # This version has been partially sponsored + by the Council of Europe.

- -

- Version 1.6.1

-

- * This version has been partially sponsored by Genuitec, - LLC.

-

- Version 1.6

- -

- * This version has been partially sponsored by Genuitec, - LLC.

-

- Version 1.5

- -

- Version 1.4

- -

- Version 1.3.1

- -

- Version 1.3

- -

- Version 1.2.4

- -

- Version 1.2.2

- -

- Version 1.2

- -

- Version 1.1

- -

- Version 1.0

- -

- Version 1.0 Final Candidate

- -

- Version 1.0 Release Candidate 1 (RC1)

- -

- Version 0.9.5 beta

- -

- Version 0.9.4 beta

- + See previous versions history +

diff --git a/htdocs/includes/fckeditor/_whatsnew_history.html b/htdocs/includes/fckeditor/_whatsnew_history.html new file mode 100644 index 00000000000..84350c23db9 --- /dev/null +++ b/htdocs/includes/fckeditor/_whatsnew_history.html @@ -0,0 +1,2804 @@ + + + + + FCKeditor - What's New? + + + + +

+ Version 2.4.3

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ Version 2.4.2

+

+ Fixed Bugs:

+ +

+ Version 2.4.1

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ Version 2.4

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ * This version has been partially sponsored by Medical + Media Lab.

+

+ Version 2.3.3

+

+ New Features and Improvements:

+ +

+ Version 2.3.2

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ Version 2.3.1

+

+ Fixed Bugs:

+ +

+ Version 2.3

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ * This version has been partially sponsored by Footsteps + and Kentico.

+

+ Version 2.3 Beta

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ * This version has been partially sponsored by Footsteps + and Kentico. +
+ ** This version has been partially sponsored by Nextide.

+

+ Version 2.2

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ Special thanks to + Alfonso Martinez, who have provided many patches and suggestions for the + following features / fixes present in this version. I encourage all you to + donate to Alfonso, as a way to say thanks for his nice open source approach. + Thanks Alfonso!. Check out his contributions:

+ +

+ * This version has been partially sponsored by + Alkacon Software.

+

+ Version 2.1.1

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ * This version has been partially sponsored by + Acctive Software S.A..

+

+ Version 2.1

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ Version 2.0

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ * This version has been partially sponsored by + Infineon Technologies AG.
+ ** This version has been partially sponsored by + Visualsoft Web Solutions.
+ *** This version has been partially sponsored by + Web Crossing, Inc.

+

+ Version 2.0 FC (Final Candidate)

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ * This version has been partially sponsored by the + Hamilton College.
+ ** This version has been partially sponsored by + Infineon Technologies AG.

+

+ Version 2.0 RC3 (Release Candidate 3)

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ Version 2.0 RC2 (Release Candidate 2)

+ +

+ Version 2.0 RC1 (Release Candidate 1)

+ +

+ Version 2.0 Beta 2

+ +

+ Version 2.0 Beta 1

+

+ This is the first beta of the 2.x series. It brings a lot of new and important things. + Beta versions will be released until all features available on version 1.x will + be introduced in the 2.0.
+
+ Note: As it is a beta, it is not yet completely developed. Future + versions can bring new features that can break backward compatibility with this + version. +

+ +

+ Version 1.6.1

+ +

+ * This version has been partially sponsored by Genuitec, + LLC.

+

+ Version 1.6

+ +

+ * This version has been partially sponsored by Genuitec, + LLC.

+

+ Version 1.5

+ +

+ Version 1.4

+ +

+ Version 1.3.1

+ +

+ Version 1.3

+ +

+ Version 1.2.4

+ +

+ Version 1.2.2

+ +

+ Version 1.2

+ +

+ Version 1.1

+ +

+ Version 1.0

+ +

+ Version 1.0 Final Candidate

+ +

+ Version 1.0 Release Candidate 1 (RC1)

+ +

+ Version 0.9.5 beta

+ +

+ Version 0.9.4 beta

+ + + diff --git a/htdocs/includes/fckeditor/dolibarr_changes.txt b/htdocs/includes/fckeditor/dolibarr_changes.txt index 9e1ae107386..ea4cad1aebb 100644 --- a/htdocs/includes/fckeditor/dolibarr_changes.txt +++ b/htdocs/includes/fckeditor/dolibarr_changes.txt @@ -9,7 +9,7 @@ FCKConfig.ImageUpload = false ; FCKConfig.FlashUpload = false ; -* Edit htdocs\includes\fckeditor\editor\filemanager\browser\default\connectors\php\config.php to set: +* Edit htdocs\includes\fckeditor\editor\filemanager\connectors\php\config.php to set: ***************************************************************************************************** //require_once("../../../../../../../../master.inc.php"); diff --git a/htdocs/includes/fckeditor/editor/css/images/block_address.png b/htdocs/includes/fckeditor/editor/css/images/block_address.png new file mode 100644 index 0000000000000000000000000000000000000000..8bbae6e5ad708d9023696ab3a227b227d38c52ea GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^xfDwCDYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>FdgVokNUIi-}jvbvIB*w!}4}#5q4VH#M(>!MP|ku_QG` zp**uBLm?z1Rl(iUH{gAWY93Hwi>HfYNX4zUQx5VSP~dRx{&@K3=eH?N92=}Qr?6Kk z`FBP+EV$~Wdb4R&+$t??vzRw>)1t*bYTP&SdiUV*jrdtN#h)@9SP|pLck7X~8s}k# zgu1KcJ~!VwYr9#-PJMR8^1S%x;(*XRk+p(qw-{3`tj(>{&Q30}_x)8>@{N0MZhzS7 bugrH3X)o?w_h=nA&^-*Eu6{1-oD!MFdgVos*TFNyzr0pfylPw!}4}#5q4VH#M(>!MP|ku_QG` zp**uBLm?z1Rl(iUH{gAWY93Hwr>Bc!NX4zUAs6`$7_cn4+5Wq@I!mpot?w?t)rv0ck=8q5%o&#@Y@$HwKqC9;r#L3y=m ziRsztKF1z%ByZo+y0Dc0{nfR0_f|d%uGXE?oWDi2{@M1Jhh_EN`6`PdviA!qhc4Xp hQvA|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sfbq+B;VIeuy8>v7c*%H@?66gHf+|;}h2Ir#G#FEq$ zh4Rdj426)4R0VfW-+=cis(C<#o}Mm_Ar-fh6C_xfS*4_;{v9^hWnt8-=cko$DA7_` z@zuj%uAbQJW)`z=fuH#7cLy|5bu5|dL`v|$E%gIE?u$Va$`Kp$iREekWp&q RKOdl>44$rjF6*2UngAfwM|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sfbq+B;ZT-MY8vQ^a*%H@?66gHf+|;}h2Ir#G#FEq$ zh4Rdj426)4R0VfW-+=cis(C<#cAhSdAr-fh6C_xfS*4_;{v{_TKMrP^aiUOQuWs6s zWk+?se2~3pmzR-|uw)zmNxoN%n|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sfbq+B;eQ6OcNjspBY>8_`iF1B#Zfaf$gL6@8Vo7R> zLV0FMhC)b2s)DC!}47L6$^@kkgTe~ HDWM4fvNb)= literal 0 HcmV?d00001 diff --git a/htdocs/includes/fckeditor/editor/css/images/block_h3.png b/htdocs/includes/fckeditor/editor/css/images/block_h3.png new file mode 100644 index 0000000000000000000000000000000000000000..3c3034faf54dfb53b179f58317baae85250b233c GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^azM<_!3HEh@2Z~zq}Y|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sfbq+B;9eugU`#gX`vL&t&CC>S|xv6<249-QVi6yBi z3gww4844j8sS56%z5(x3RP%re?LA!_Ln>}1CrGd|vr0)x{d=6G{P|^)q2BQTrWqY2 zJjz>bPdJ^p9#M1NbP0 Hl+XkKqp?E8 literal 0 HcmV?d00001 diff --git a/htdocs/includes/fckeditor/editor/css/images/block_h4.png b/htdocs/includes/fckeditor/editor/css/images/block_h4.png new file mode 100644 index 0000000000000000000000000000000000000000..ab3f64de6b97f8b53891b931b353eb2e66a959cd GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^azM<_!3HEh@2Z~zq}Y|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sfbq+B;U2f~{>>EHK*%H@?66gHf+|;}h2Ir#G#FEq$ zh4Rdj426)4R0VfW-+=cis(C<#o}Mm_Ar-fh6C_xfS*4_;{v{_L{_!H|36olo%#{ll z4tVJD8}Wvm*d)M}7xhDIdB3!jl*C0{r@r{CqsA9IyJt-^>V5V&(BKUNgX(m(maolf RN|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sfbq+B;eX*?Fsm(wk*%H@?66gHf+|;}h2Ir#G#FEq$ zh4Rdj426)4R0VfW-+=cis(C<#0iG_7Ar-fh6C_xfS*4_;{w>}t4J4J5vu+%AYHF5P z`O;A>$f+r6-_e)JIbsKDcuE|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sfbq+B;UCYlgRuMoU*%H@?66gHf+|;}h2Ir#G#FEq$ zh4Rdj426)4R0VfW-+=cis(C<#Hl8kyAr-fh6C_xfS*4_;{yk1o{`@k@Q15sE(~J`Z z63V7JX^Ky>b@rvpL^}HF9&pOpbIE3f`$3HbVhju`%(R>8GXp^GX7F_Nb6Mw<&;$T| CZaz%_ literal 0 HcmV?d00001 diff --git a/htdocs/includes/fckeditor/editor/css/images/block_p.png b/htdocs/includes/fckeditor/editor/css/images/block_p.png new file mode 100644 index 0000000000000000000000000000000000000000..d055c514a6c77c69bea7ef2994e060e2d908a722 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^azM<_!3HEh@2Z~zq}Y|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sfbq+B;E#A2+BeZ}*vL&t&CC>S|xv6<249-QVi6yBi z3gww4844j8sS56%z5(x3RP%re4Lw~PLn>}1CrGfCF!j7(;^pQ2fAL38Ng=0L_y5a> sd~`QfF^0PPoCyaGIUJ?R>F8HBd8yr>mdKI;Vst07*(dMF0Q* literal 0 HcmV?d00001 diff --git a/htdocs/includes/fckeditor/editor/css/images/block_pre.png b/htdocs/includes/fckeditor/editor/css/images/block_pre.png new file mode 100644 index 0000000000000000000000000000000000000000..be8ad26a75ad27b456dd0835d4667ed92fc17cf2 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^azM<_!3HEh@2Z~zq}Y|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sfbq+B;E%`hF%_N|ZY>8_`iF1B#Zfaf$gL6@8Vo7R> zLV0FMhC)b2s)DU|`SzVg`^n1Cx_W&+?fM`5zlEy44+e;LbT+ zkH8h7N-kQ@I;_|Q}>&=&Wsxvt_U!{00zr0#2QD@sN HCI)K&$9F25 literal 0 HcmV?d00001 diff --git a/htdocs/includes/fckeditor/editor/fckdebug.html b/htdocs/includes/fckeditor/editor/fckdebug.html index 1696e1c388d..2bc173d8323 100644 --- a/htdocs/includes/fckeditor/editor/fckdebug.html +++ b/htdocs/includes/fckeditor/editor/fckdebug.html @@ -2,29 +2,25 @@ @@ -51,10 +47,10 @@ function Output( message, color, noParse ) { if ( !noParse && message != null && isNaN( message ) ) message = message.replace(/' + message + '<\/font>' ; - + window.FCKMessages[ window.FCKMessages.length ] = message ; StartTimer() ; } @@ -62,18 +58,18 @@ function Output( message, color, noParse ) function OutputObject( anyObject, color ) { var message ; - - if ( anyObject != null ) + + if ( anyObject != null ) { message = 'Properties of: ' + anyObject + '
' ; - + for (var prop in anyObject) { - try + try { var sVal = anyObject[ prop ] != null ? anyObject[ prop ] + '' : '[null]' ; message += '' + prop + ' : ' + sVal.replace(/' ; - } + } catch (e) { try @@ -87,10 +83,10 @@ function OutputObject( anyObject, color ) } } - message += '
' ; + message += '' ; } else message = 'OutputObject : Object is "null".' ; - + Output( message, color, true ) ; } @@ -105,18 +101,18 @@ function CheckMessages() { // Get the first item in the queue var sMessage = window.FCKMessages[0] ; - + // Removes the first item from the queue var oTempArray = new Array() ; for ( i = 1 ; i < window.FCKMessages.length ; i++ ) oTempArray[ i - 1 ] = window.FCKMessages[ i ] ; window.FCKMessages = oTempArray ; - + var d = new Date() ; - var sTime = - ( d.getHours() + 100 + '' ).substr( 1,2 ) + ':' + - ( d.getMinutes() + 100 + '' ).substr( 1,2 ) + ':' + - ( d.getSeconds() + 100 + '' ).substr( 1,2 ) + ':' + + var sTime = + ( d.getHours() + 100 + '' ).substr( 1,2 ) + ':' + + ( d.getMinutes() + 100 + '' ).substr( 1,2 ) + ':' + + ( d.getSeconds() + 100 + '' ).substr( 1,2 ) + ':' + ( d.getMilliseconds() + 1000 + '' ).substr( 1,3 ) ; var oMsgDiv = oWindow.document.createElement( 'div' ) ; diff --git a/htdocs/includes/fckeditor/editor/fckdialog.html b/htdocs/includes/fckeditor/editor/fckdialog.html index bf3c6b74fcf..e7d5e777d98 100644 --- a/htdocs/includes/fckeditor/editor/fckdialog.html +++ b/htdocs/includes/fckeditor/editor/fckdialog.html @@ -2,28 +2,24 @@ @@ -111,6 +107,18 @@ function RefreshSize() } } +// Kludge for #1316: Safari seems to have a bug with the time when RefreshSize() is executed - it thinks frmMain's innerHeight +// is 0 if we query the value too soon after the page is loaded in some circumstances. +if ( window.dialogArguments.Editor.FCKBrowserInfo.IsSafari ) +{ + window.OriginalRefreshSize = RefreshSize ; + + RefreshSize = function() + { + window.setTimeout( window.OriginalRefreshSize, 1 ); + } +} + function Ok() { if ( window.frames["frmMain"].Ok && window.frames["frmMain"].Ok() ) @@ -119,7 +127,7 @@ function Ok() function Cancel( dontFireChange ) { - if ( !dontFireChange ) + if ( !dontFireChange && !window.dialogArguments.Editor.FCK.EditMode ) { // All dialog windows, by default, will fire the "OnSelectionChange" // event, no matter the Ok or Cancel button has been pressed. @@ -215,7 +223,7 @@ function SetOnKeyDown( targetDocument ) { case 13 : // ENTER var oTarget = e.srcElement || e.target ; - if ( oTarget.tagName == 'TEXTAREA' ) + if ( oTarget.tagName == 'TEXTAREA' ) return true ; Ok() ; return false ; @@ -315,8 +323,9 @@ document.write( sTitle ) ;   -   + +   + @@ -324,4 +333,4 @@ document.write( sTitle ) ; - \ No newline at end of file + diff --git a/htdocs/includes/fckeditor/editor/fckeditor.html b/htdocs/includes/fckeditor/editor/fckeditor.html index 9e9f5c082de..37de86ba397 100644 --- a/htdocs/includes/fckeditor/editor/fckeditor.html +++ b/htdocs/includes/fckeditor/editor/fckeditor.html @@ -2,34 +2,30 @@ - + FCKeditor - - + +