Project

General

Profile

« Previous | Next » 

Revision 1267

Added by Dietmar over 14 years ago

update fckeditor, forgotten to upload a file

View differences:

branches/2.8.x/CHANGELOG
12 12
 
13 13
------------------------------------- 2.8.1 -------------------------------------
14 14
22-Jan-2010 Dietmar Woellbrink (Luisehahne)
15
!	update fckeditor, forgotten to upload a file
16
22-Jan-2010 Dietmar Woellbrink (Luisehahne)
15 17
#	Ticket #917 Update backend themes 
16 18
22-Jan-2010 Dietmar Woellbrink (Luisehahne)
17 19
!	Ticket #909 WYSIWYG Editor width destroyes backend layout
branches/2.8.x/wb/admin/interface/version.php
55 55

  
56 56
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
57 57
if(!defined('VERSION')) define('VERSION', '2.8.1');
58
if(!defined('REVISION')) define('REVISION', '1266');
58
if(!defined('REVISION')) define('REVISION', '1267');
59 59

  
60 60
?>
branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_image/fck_image.js
191 191

  
192 192
		GetE('txtLnkUrl').value		= sLinkUrl ;
193 193
		GetE('cmbLnkTarget').value	= oLink.target ;
194
		GetE('cmbAttContentRel').value	= oLink.rel ;
195
		GetE('txtAttTitle').value		= oLink.title ;
196
		GetE('txtAttId').value			= oLink.id ;
194
		GetE('cmbLnkContentRel').value	= oLink.rel ;
195
		GetE('txtLnkTitle').value		= oLink.title ;
196
		GetE('txtLnkId').value			= oLink.id ;
197 197
	var sClass ;
198 198
	if ( oEditor.FCKBrowserInfo.IsIE )
199 199
	{
......
201 201
		// Clean up temporary classes for internal use:
202 202
		sClass = sClass.replace( FCKRegexLib.FCK_Class, '' ) ;
203 203

  
204
		GetE('txtAttStyle').value	= oLink.style.cssText ;
204
		GetE('txtLnkStyle').value	= oLink.style.cssText ;
205 205
	}
206 206
	else
207 207
	{
208 208
		sClass	= oLink.getAttribute('class',2) || '' ;
209
		GetE('txtAttStyle').value	= oLink.getAttribute('style',2) || '' ;
209
		GetE('txtLnkStyle').value	= oLink.getAttribute('style',2) || '' ;
210 210
	}
211
	GetE('txtAttClasses').value	= sClass ;
211
	GetE('txtLnkClasses').value	= sClass ;
212 212

  
213 213
		}
214 214

  
......
283 283

  
284 284
		SetAttribute( oLink, '_fcksavedurl', sLnkUrl ) ;
285 285
		SetAttribute( oLink, 'target', 	GetE('cmbLnkTarget').value ) ;
286
		SetAttribute( oLink, 'rel', 	GetE('cmbAttContentRel').value ) ;
287
		SetAttribute( oLink, 'id', 		GetE('txtAttId').value ) ;
288
		SetAttribute( oLink, 'title', 	GetE('txtAttTitle').value ) ;
286
		SetAttribute( oLink, 'rel', 	GetE('cmbLnkContentRel').value ) ;
287
		SetAttribute( oLink, 'id', 		GetE('txtLnkId').value ) ;
288
		SetAttribute( oLink, 'title', 	GetE('txtLnkTitle').value ) ;
289 289

  
290 290
		if ( oEditor.FCKBrowserInfo.IsIE )
291 291
		{
292 292
			var sClass = GetE('txtAttClasses').value ;
293 293
			// If it's also an anchor add an internal class
294
			if ( GetE('txtAttName').value.length != 0 )
294
			if ( GetE('txtLnkName').value.length != 0 )
295 295
				sClass += ' FCK__AnchorC' ;
296 296
			SetAttribute( oLink, 'className', sClass ) ;
297 297

  
298
			oLink.style.cssText = GetE('txtAttStyle').value ;
298
			oLink.style.cssText = GetE('txtLnkStyle').value ;
299 299
		}
300 300
		else
301 301
		{
302
			SetAttribute( oLink, 'class', GetE('txtAttClasses').value ) ;
303
			SetAttribute( oLink, 'style', GetE('txtAttStyle').value ) ;
302
			SetAttribute( oLink, 'class', GetE('txtLnkClasses').value ) ;
303
			SetAttribute( oLink, 'style', GetE('txtLnkStyle').value ) ;
304 304
		}
305 305
		
306 306
	}

Also available in: Unified diff