[otrs-cvs] otrs/var/httpd/htdocs/js/thirdparty/ckeditor-patches 2010-10-28-image-dialog.patch, NONE, 1.1 OTRS-PATCHES.txt, NONE, 1.1 2010-10-28-dialogui.patch, NONE, 1.1

Comments:
Update of /home/cvs/otrs/var/httpd/htdocs/js/thirdparty/ckeditor-patches
In directory lancelot:/tmp/cvs-serv16544/var/httpd/htdocs/js/thirdparty/ckeditor-patches

Added Files:
	2010-10-28-image-dialog.patch OTRS-PATCHES.txt 
	2010-10-28-dialogui.patch 
Log Message:
Upgraded CKEditor to version 4.0.

Author: mn

--- NEW FILE: 2010-10-28-image-dialog.patch ---
? 2010-10-28-image-dialog.patch
Index: image.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/thirdparty/ckeditor-3.4.1/_source/plugins/image/dialogs/image.js,v
retrieving revision 1.1
diff -u -r1.1 image.js
--- image.js	28 Oct 2010 08:43:01 -0000	1.1
+++ image.js	28 Oct 2010 08:52:59 -0000
@@ -798,63 +798,6 @@
 											[
 												{
 													type : 'text',
-													id : 'txtBorder',
-													width: '60px',
-													labelLayout : 'horizontal',
-													label : editor.lang.image.border,
-													'default' : '',
-													onKeyUp : function()
-													{
-														updatePreview( this.getDialog() );
-													},
-													onChange : function()
-													{
-														commitInternally.call( this, 'advanced:txtdlgGenStyle' );
-													},
-													validate : CKEDITOR.dialog.validate.integer( editor.lang.image.validateBorder ),
-													setup : function( type, element )
-													{
-														if ( type == IMAGE )
-														{
-															var value,
-																borderStyle = element.getStyle( 'border-width' );
-															borderStyle = borderStyle && borderStyle.match( /^(\d+px)(?: \1 \1 \1)?$/ );
-															value = borderStyle && parseInt( borderStyle[ 1 ], 10 );
-															isNaN ( parseInt( value, 10 ) ) && ( value = element.getAttribute( 'border' ) );
-															this.setValue( value );
-														}
-													},
-													commit : function( type, element, internalCommit )
-													{
-														var value = parseInt( this.getValue(), 10 );
-														if ( type == IMAGE || type == PREVIEW )
-														{
-															if ( !isNaN( value ) )
-															{
-																element.setStyle( 'border-width', CKEDITOR.tools.cssLength( value ) );
-																element.setStyle( 'border-style', 'solid' );
-															}
-															else if ( !value && this.isChanged() )
-															{
-																element.removeStyle( 'border-width' );
-																element.removeStyle( 'border-style' );
-																element.removeStyle( 'border-color' );
-															}
-
-															if ( !internalCommit && type == IMAGE )
-																element.removeAttribute( 'border' );
-														}
-														else if ( type == CLEANUP )
-														{
-															element.removeAttribute( 'border' );
-															element.removeStyle( 'border-width' );
-															element.removeStyle( 'border-style' );
-															element.removeStyle( 'border-color' );
-														}
-													}
-												},
-												{
-													type : 'text',
 													id : 'txtHSpace',
 													width: '60px',
 													labelLayout : 'horizontal',
@@ -1366,7 +1309,6 @@
 								commitInternally.call( this,
 									[ 'info:cmbFloat', 'info:cmbAlign',
 									  'info:txtVSpace', 'info:txtHSpace',
-									  'info:txtBorder',
 									  'info:txtWidth', 'info:txtHeight' ] );
 								updatePreview( this );
 							},

Author: mn

--- NEW FILE: OTRS-PATCHES.txt ---
# --
# $Id: OTRS-PATCHES.txt,v 1.1 2012/12/10 09:52:26 mn Exp $
# --
# A list of all patches applied to CKEditor for OTRS.
# --

Patches to be applied:

-   2010-10-28-image-dialog.patch: plugins/image/dialogs/
    OTRS Bug#4503: Removes Border Option from Image Dialog

-   2010-10-28-dialogui.patch: plugins/dialogui/
    Adds additional hidden fields to the image upload

Author: mn

--- NEW FILE: 2010-10-28-dialogui.patch ---
? 2010-10-28-dialogui.patch
Index: plugin.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/thirdparty/ckeditor-3.4.1/_source/plugins/dialogui/plugin.js,v
retrieving revision 1.1
diff -u -r1.1 plugin.js
--- plugin.js	28 Oct 2010 08:43:06 -0000	1.1
+++ plugin.js	28 Oct 2010 08:56:58 -0000
@@ -1434,7 +1434,13 @@
 								'<form enctype="multipart/form-data" method="POST" dir="' + langDir + '" lang="' + langCode + '" action="',
 								CKEDITOR.tools.htmlEncode( elementDefinition.action ),
 								'">',
-								'<input type="file" name="',
+                                '<input type="hidden" name="Action" value="',
+                                CKEDITOR.config.action,
+                                '" /><input type="hidden" name="FormID" value="',
+                                CKEDITOR.config.formID,
+                                '"/><input type="hidden" name="CKEditorFuncNum" value="',
+                                _.dialog._.editor._.filebrowserFn,
+                                '" /><input type="hidden" name="',
+                                Core.Config.Get('SessionName'),
+                                '" value="',
+                                Core.Config.Get('SessionID'),
+                                '" />',
+                                '<input type="file" name="',
 								CKEDITOR.tools.htmlEncode( elementDefinition.id || 'cke_upload' ),
 								'" size="',
 								CKEDITOR.tools.htmlEncode( size > 0 ? size : "" ),
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log