- #5432 : Dutch; Index: /CKEditor/trunk/_source/plugins/colordialog/dialogs/colordialog.js =================================================================== --- /CKEditor/trunk/_source/plugins/colordialog/dialogs/colordialog.js (revision 5503) +++ /CKEditor/trunk/_source/plugins/colordialog/dialogs/colordialog.js (revision 5504) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license @@ -29,6 +29,6 @@ { var color = new $el( event.data.getTarget() ).getAttribute( 'title' ); - $doc.getById( 'hicolor' ).setStyle( 'background-color', color ); - $doc.getById( 'hicolortext' ).setHtml( color ); + $doc.getById( hicolorId ).setStyle( 'background-color', color ); + $doc.getById( hicolorTextId ).setHtml( color ); }; @@ -98,5 +98,5 @@ function clear() { - $doc.getById( 'selhicolor' ).removeStyle( 'background-color' ); + $doc.getById( selHiColorId ).removeStyle( 'background-color' ); dialog.getContentElement( 'picker', 'selectedColor' ).setValue( '' ); } @@ -104,7 +104,12 @@ var clearActual = $tools.addFunction( function() { - $doc.getById( 'hicolor' ).removeStyle( 'background-color' ); - $doc.getById( 'hicolortext' ).setHtml( ' ' ); + $doc.getById( hicolorId ).removeStyle( 'background-color' ); + $doc.getById( hicolorTextId ).setHtml( ' ' ); } ); + + var numbering = function( id ){ return id + CKEDITOR.tools.getNextNumber(); }, + hicolorId = numbering( 'hicolor' ), + hicolorTextId = numbering( 'hicolortext' ), + selHiColorId = numbering( 'selhicolor' ); return { @@ -150,8 +155,8 @@ type : 'html', html : '' + lang.highlight +'\ - \ -
' + CKEDITOR.tools.htmlEncode( editor.lang.common.preview ) +'
' + - '' + - '
';
+ '' +
+ '';
return {
Index: /CKEditor/trunk/_source/plugins/image/dialogs/image.js
===================================================================
--- /CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 5503)
+++ /CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 5504)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -6,205 +6,205 @@
(function()
{
- // Load image preview.
- var IMAGE = 1,
- LINK = 2,
- PREVIEW = 4,
- CLEANUP = 8,
- regexGetSize = /^\s*(\d+)((px)|\%)?\s*$/i,
- regexGetSizeOrEmpty = /(^\s*(\d+)((px)|\%)?\s*$)|^$/i,
- pxLengthRegex = /^\d+px$/;
-
- var onSizeChange = function()
+ var imageDialog = function( editor, dialogType )
{
- var value = this.getValue(), // This = input element.
- dialog = this.getDialog(),
- aMatch = value.match( regexGetSize ); // Check value
- if ( aMatch )
+ // Load image preview.
+ var IMAGE = 1,
+ LINK = 2,
+ PREVIEW = 4,
+ CLEANUP = 8,
+ regexGetSize = /^\s*(\d+)((px)|\%)?\s*$/i,
+ regexGetSizeOrEmpty = /(^\s*(\d+)((px)|\%)?\s*$)|^$/i,
+ pxLengthRegex = /^\d+px$/;
+
+ var onSizeChange = function()
{
- if ( aMatch[2] == '%' ) // % is allowed - > unlock ratio.
- switchLockRatio( dialog, false ); // Unlock.
- value = aMatch[1];
+ var value = this.getValue(), // This = input element.
+ dialog = this.getDialog(),
+ aMatch = value.match( regexGetSize ); // Check value
+ if ( aMatch )
+ {
+ if ( aMatch[2] == '%' ) // % is allowed - > unlock ratio.
+ switchLockRatio( dialog, false ); // Unlock.
+ value = aMatch[1];
+ }
+
+ // Only if ratio is locked
+ if ( dialog.lockRatio )
+ {
+ var oImageOriginal = dialog.originalElement;
+ if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' )
+ {
+ if ( this.id == 'txtHeight' )
+ {
+ if ( value && value != '0' )
+ value = Math.round( oImageOriginal.$.width * ( value / oImageOriginal.$.height ) );
+ if ( !isNaN( value ) )
+ dialog.setValueOf( 'info', 'txtWidth', value );
+ }
+ else //this.id = txtWidth.
+ {
+ if ( value && value != '0' )
+ value = Math.round( oImageOriginal.$.height * ( value / oImageOriginal.$.width ) );
+ if ( !isNaN( value ) )
+ dialog.setValueOf( 'info', 'txtHeight', value );
+ }
+ }
+ }
+ updatePreview( dialog );
+ };
+
+ var updatePreview = function( dialog )
+ {
+ //Don't load before onShow.
+ if ( !dialog.originalElement || !dialog.preview )
+ return 1;
+
+ // Read attributes and update imagePreview;
+ dialog.commitContent( PREVIEW, dialog.preview );
+ return 0;
+ };
+
+ // Custom commit dialog logic, where we're intended to give inline style
+ // field (txtdlgGenStyle) higher priority to avoid overwriting styles contribute
+ // by other fields.
+ function commitContent()
+ {
+ var args = arguments;
+ var inlineStyleField = this.getContentElement( 'advanced', 'txtdlgGenStyle' );
+ inlineStyleField && inlineStyleField.commit.apply( inlineStyleField, args );
+
+ this.foreach( function( widget )
+ {
+ if ( widget.commit && widget.id != 'txtdlgGenStyle' )
+ widget.commit.apply( widget, args );
+ });
}
- // Only if ratio is locked
- if ( dialog.lockRatio )
+ // Avoid recursions.
+ var incommit;
+
+ // Synchronous field values to other impacted fields is required, e.g. border
+ // size change should alter inline-style text as well.
+ function commitInternally( targetFields )
+ {
+ if ( incommit )
+ return;
+
+ incommit = 1;
+
+ var dialog = this.getDialog(),
+ element = dialog.imageElement;
+ if ( element )
+ {
+ // Commit this field and broadcast to target fields.
+ this.commit( IMAGE, element );
+
+ targetFields = [].concat( targetFields );
+ var length = targetFields.length,
+ field;
+ for ( var i = 0; i < length; i++ )
+ {
+ field = dialog.getContentElement.apply( dialog, targetFields[ i ].split( ':' ) );
+ // May cause recursion.
+ field && field.setup( IMAGE, element );
+ }
+ }
+
+ incommit = 0;
+ }
+
+ var switchLockRatio = function( dialog, value )
+ {
+ var oImageOriginal = dialog.originalElement;
+
+ // Dialog may already closed. (#5505)
+ if( !oImageOriginal )
+ return;
+
+ var ratioButton = CKEDITOR.document.getById( btnLockSizesId );
+
+ if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' )
+ {
+ if ( value == 'check' ) // Check image ratio and original image ratio.
+ {
+ var width = dialog.getValueOf( 'info', 'txtWidth' ),
+ height = dialog.getValueOf( 'info', 'txtHeight' ),
+ originalRatio = oImageOriginal.$.width * 1000 / oImageOriginal.$.height,
+ thisRatio = width * 1000 / height;
+ dialog.lockRatio = false; // Default: unlock ratio
+
+ if ( !width && !height )
+ dialog.lockRatio = true;
+ else if ( !isNaN( originalRatio ) && !isNaN( thisRatio ) )
+ {
+ if ( Math.round( originalRatio ) == Math.round( thisRatio ) )
+ dialog.lockRatio = true;
+ }
+ }
+ else if ( value != undefined )
+ dialog.lockRatio = value;
+ else
+ dialog.lockRatio = !dialog.lockRatio;
+ }
+ else if ( value != 'check' ) // I can't lock ratio if ratio is unknown.
+ dialog.lockRatio = false;
+
+ if ( dialog.lockRatio )
+ ratioButton.removeClass( 'cke_btn_unlocked' );
+ else
+ ratioButton.addClass( 'cke_btn_unlocked' );
+
+ var lang = dialog._.editor.lang.image,
+ label = lang[ dialog.lockRatio ? 'unlockRatio' : 'lockRatio' ];
+
+ ratioButton.setAttribute( 'title', label );
+ ratioButton.getFirst().setText( label );
+
+ return dialog.lockRatio;
+ };
+
+ var resetSize = function( dialog )
{
var oImageOriginal = dialog.originalElement;
if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' )
{
- if ( this.id == 'txtHeight' )
- {
- if ( value && value != '0' )
- value = Math.round( oImageOriginal.$.width * ( value / oImageOriginal.$.height ) );
- if ( !isNaN( value ) )
- dialog.setValueOf( 'info', 'txtWidth', value );
+ dialog.setValueOf( 'info', 'txtWidth', oImageOriginal.$.width );
+ dialog.setValueOf( 'info', 'txtHeight', oImageOriginal.$.height );
+ }
+ updatePreview( dialog );
+ };
+
+ var setupDimension = function( type, element )
+ {
+ if ( type != IMAGE )
+ return;
+
+ function checkDimension( size, defaultValue )
+ {
+ var aMatch = size.match( regexGetSize );
+ if ( aMatch )
+ {
+ if ( aMatch[2] == '%' ) // % is allowed.
+ {
+ aMatch[1] += '%';
+ switchLockRatio( dialog, false ); // Unlock ratio
+ }
+ return aMatch[1];
}
- else //this.id = txtWidth.
- {
- if ( value && value != '0' )
- value = Math.round( oImageOriginal.$.height * ( value / oImageOriginal.$.width ) );
- if ( !isNaN( value ) )
- dialog.setValueOf( 'info', 'txtHeight', value );
- }
+ return defaultValue;
}
- }
- updatePreview( dialog );
- };
-
- var updatePreview = function( dialog )
- {
- //Don't load before onShow.
- if ( !dialog.originalElement || !dialog.preview )
- return 1;
-
- // Read attributes and update imagePreview;
- dialog.commitContent( PREVIEW, dialog.preview );
- return 0;
- };
-
- // Custom commit dialog logic, where we're intended to give inline style
- // field (txtdlgGenStyle) higher priority to avoid overwriting styles contribute
- // by other fields.
- function commitContent()
- {
- var args = arguments;
- var inlineStyleField = this.getContentElement( 'advanced', 'txtdlgGenStyle' );
- inlineStyleField && inlineStyleField.commit.apply( inlineStyleField, args );
-
- this.foreach( function( widget )
- {
- if ( widget.commit && widget.id != 'txtdlgGenStyle' )
- widget.commit.apply( widget, args );
- });
- }
-
- // Avoid recursions.
- var incommit;
-
- // Synchronous field values to other impacted fields is required, e.g. border
- // size change should alter inline-style text as well.
- function commitInternally( targetFields )
- {
- if ( incommit )
- return;
-
- incommit = 1;
-
- var dialog = this.getDialog(),
- element = dialog.imageElement;
- if ( element )
- {
- // Commit this field and broadcast to target fields.
- this.commit( IMAGE, element );
-
- targetFields = [].concat( targetFields );
- var length = targetFields.length,
- field;
- for ( var i = 0; i < length; i++ )
- {
- field = dialog.getContentElement.apply( dialog, targetFields[ i ].split( ':' ) );
- // May cause recursion.
- field && field.setup( IMAGE, element );
- }
- }
-
- incommit = 0;
- }
-
- var switchLockRatio = function( dialog, value )
- {
- var oImageOriginal = dialog.originalElement;
-
- // Dialog may already closed. (#5505)
- if( !oImageOriginal )
- return;
-
- var ratioButton = CKEDITOR.document.getById( 'btnLockSizes' );
-
- if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' )
- {
- if ( value == 'check' ) // Check image ratio and original image ratio.
- {
- var width = dialog.getValueOf( 'info', 'txtWidth' ),
- height = dialog.getValueOf( 'info', 'txtHeight' ),
- originalRatio = oImageOriginal.$.width * 1000 / oImageOriginal.$.height,
- thisRatio = width * 1000 / height;
- dialog.lockRatio = false; // Default: unlock ratio
-
- if ( !width && !height )
- dialog.lockRatio = true;
- else if ( !isNaN( originalRatio ) && !isNaN( thisRatio ) )
- {
- if ( Math.round( originalRatio ) == Math.round( thisRatio ) )
- dialog.lockRatio = true;
- }
- }
- else if ( value != undefined )
- dialog.lockRatio = value;
- else
- dialog.lockRatio = !dialog.lockRatio;
- }
- else if ( value != 'check' ) // I can't lock ratio if ratio is unknown.
- dialog.lockRatio = false;
-
- if ( dialog.lockRatio )
- ratioButton.removeClass( 'cke_btn_unlocked' );
- else
- ratioButton.addClass( 'cke_btn_unlocked' );
-
- var lang = dialog._.editor.lang.image,
- label = lang[ dialog.lockRatio ? 'unlockRatio' : 'lockRatio' ];
-
- ratioButton.setAttribute( 'title', label );
- ratioButton.getFirst().setText( label );
-
- return dialog.lockRatio;
- };
-
- var resetSize = function( dialog )
- {
- var oImageOriginal = dialog.originalElement;
- if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' )
- {
- dialog.setValueOf( 'info', 'txtWidth', oImageOriginal.$.width );
- dialog.setValueOf( 'info', 'txtHeight', oImageOriginal.$.height );
- }
- updatePreview( dialog );
- };
-
- var setupDimension = function( type, element )
- {
- if ( type != IMAGE )
- return;
-
- function checkDimension( size, defaultValue )
- {
- var aMatch = size.match( regexGetSize );
- if ( aMatch )
- {
- if ( aMatch[2] == '%' ) // % is allowed.
- {
- aMatch[1] += '%';
- switchLockRatio( dialog, false ); // Unlock ratio
- }
- return aMatch[1];
- }
- return defaultValue;
- }
-
- var dialog = this.getDialog(),
- value = '',
- dimension = (( this.id == 'txtWidth' )? 'width' : 'height' ),
- size = element.getAttribute( dimension );
-
- if ( size )
- value = checkDimension( size, value );
- value = checkDimension( element.getStyle( dimension ), value );
-
- this.setValue( value );
- };
-
- var imageDialog = function( editor, dialogType )
- {
+
+ var dialog = this.getDialog(),
+ value = '',
+ dimension = (( this.id == 'txtWidth' )? 'width' : 'height' ),
+ size = element.getAttribute( dimension );
+
+ if ( size )
+ value = checkDimension( size, value );
+ value = checkDimension( element.getStyle( dimension ), value );
+
+ this.setValue( value );
+ };
+
var previewPreloader;
@@ -219,5 +219,5 @@
// Hide loader
- CKEDITOR.document.getById( 'ImagePreviewLoader' ).setStyle( 'display', 'none' );
+ CKEDITOR.document.getById( imagePreviewLoaderId ).setStyle( 'display', 'none' );
// New image -> new domensions
@@ -247,7 +247,16 @@
// Hide loader
- CKEDITOR.document.getById( 'ImagePreviewLoader' ).setStyle( 'display', 'none' );
+ CKEDITOR.document.getById( imagePreviewLoaderId ).setStyle( 'display', 'none' );
switchLockRatio( this, false ); // Unlock.
};
+
+ var numbering = function( id ){ return id + CKEDITOR.tools.getNextNumber(); },
+ btnLockSizesId = numbering( 'btnLockSizes' ),
+ btnResetSizeId = numbering( 'btnResetSize' ),
+ imagePreviewLoaderId = numbering( 'ImagePreviewLoader' ),
+ imagePreviewBoxId = numbering( 'ImagePreviewBox' ),
+ previewLinkId = numbering( 'previewLink' ),
+ previewImageId = numbering( 'previewImage' );
+
return {
title : ( dialogType == 'image' ) ? editor.lang.image.title : editor.lang.image.titleButton,
@@ -274,8 +283,8 @@
//Hide loader.
- CKEDITOR.document.getById( 'ImagePreviewLoader' ).setStyle( 'display', 'none' );
+ CKEDITOR.document.getById( imagePreviewLoaderId ).setStyle( 'display', 'none' );
// Create the preview before setup the dialog contents.
previewPreloader = new CKEDITOR.dom.element( 'img', editor.document );
- this.preview = CKEDITOR.document.getById( 'previewImage' );
+ this.preview = CKEDITOR.document.getById( previewImageId );
// Copy of the image
@@ -438,6 +447,6 @@
this.hidePage( 'Link' ); //Hide Link tab.
var doc = this._.element.getDocument();
- this.addFocusable( doc.getById( 'btnResetSize' ), 5 );
- this.addFocusable( doc.getById( 'btnLockSizes' ), 5 );
+ this.addFocusable( doc.getById( btnResetSizeId ), 5 );
+ this.addFocusable( doc.getById( btnLockSizesId ), 5 );
this.commitContent = commitContent;
@@ -497,5 +506,5 @@
original.setCustomData( 'isReady', 'false' );
// Show loader
- var loader = CKEDITOR.document.getById( 'ImagePreviewLoader' );
+ var loader = CKEDITOR.document.getById( imagePreviewLoaderId );
if ( loader )
loader.setStyle( 'display', '' );
@@ -724,6 +733,6 @@
{
// Activate Reset button
- var resetButton = CKEDITOR.document.getById( 'btnResetSize' ),
- ratioButton = CKEDITOR.document.getById( 'btnLockSizes' );
+ var resetButton = CKEDITOR.document.getById( btnResetSizeId ),
+ ratioButton = CKEDITOR.document.getById( btnLockSizesId );
if ( resetButton )
{
@@ -774,7 +783,7 @@
html : '' + - '' + - '
'+
'' + editor.lang.image.unlockRatio + '' +
+ '" class="cke_btn_locked" id="' + btnLockSizesId + '" role="button">' + editor.lang.image.unlockRatio + '' +
'' + editor.lang.image.resetSize + ''+
+ '" class="cke_btn_reset" id="' + btnResetSizeId + '" role="button">' + editor.lang.image.resetSize + ''+
'
'
}
@@ -1056,8 +1065,8 @@
style : 'width:95%;',
html : '' + CKEDITOR.tools.htmlEncode( editor.lang.common.preview ) +'
'+ - ''+ - '
'+ - ''+ - '
'+
- ''+
- '
|