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 00000000000..8bbae6e5ad7 Binary files /dev/null and b/htdocs/includes/fckeditor/editor/css/images/block_address.png differ diff --git a/htdocs/includes/fckeditor/editor/css/images/block_blockquote.png b/htdocs/includes/fckeditor/editor/css/images/block_blockquote.png new file mode 100644 index 00000000000..cf065ba6b92 Binary files /dev/null and b/htdocs/includes/fckeditor/editor/css/images/block_blockquote.png differ diff --git a/htdocs/includes/fckeditor/editor/css/images/block_div.png b/htdocs/includes/fckeditor/editor/css/images/block_div.png new file mode 100644 index 00000000000..a2806b14022 Binary files /dev/null and b/htdocs/includes/fckeditor/editor/css/images/block_div.png differ diff --git a/htdocs/includes/fckeditor/editor/css/images/block_h1.png b/htdocs/includes/fckeditor/editor/css/images/block_h1.png new file mode 100644 index 00000000000..d43fbdbc051 Binary files /dev/null and b/htdocs/includes/fckeditor/editor/css/images/block_h1.png differ diff --git a/htdocs/includes/fckeditor/editor/css/images/block_h2.png b/htdocs/includes/fckeditor/editor/css/images/block_h2.png new file mode 100644 index 00000000000..27b547554b7 Binary files /dev/null and b/htdocs/includes/fckeditor/editor/css/images/block_h2.png differ 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 00000000000..3c3034faf54 Binary files /dev/null and b/htdocs/includes/fckeditor/editor/css/images/block_h3.png differ 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 00000000000..ab3f64de6b9 Binary files /dev/null and b/htdocs/includes/fckeditor/editor/css/images/block_h4.png differ diff --git a/htdocs/includes/fckeditor/editor/css/images/block_h5.png b/htdocs/includes/fckeditor/editor/css/images/block_h5.png new file mode 100644 index 00000000000..93477d083d2 Binary files /dev/null and b/htdocs/includes/fckeditor/editor/css/images/block_h5.png differ diff --git a/htdocs/includes/fckeditor/editor/css/images/block_h6.png b/htdocs/includes/fckeditor/editor/css/images/block_h6.png new file mode 100644 index 00000000000..11ea1c2bab9 Binary files /dev/null and b/htdocs/includes/fckeditor/editor/css/images/block_h6.png differ 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 00000000000..d055c514a6c Binary files /dev/null and b/htdocs/includes/fckeditor/editor/css/images/block_p.png differ 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 00000000000..be8ad26a75a Binary files /dev/null and b/htdocs/includes/fckeditor/editor/css/images/block_pre.png differ diff --git a/htdocs/includes/fckeditor/editor/css/images/fck_hiddenfield.gif b/htdocs/includes/fckeditor/editor/css/images/fck_hiddenfield.gif new file mode 100644 index 00000000000..953f643b600 Binary files /dev/null and b/htdocs/includes/fckeditor/editor/css/images/fck_hiddenfield.gif differ 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 - - + +