Index: /CKEditor/branches/prototype/_source/core/config.js =================================================================== --- /CKEditor/branches/prototype/_source/core/config.js (revision 2734) +++ /CKEditor/branches/prototype/_source/core/config.js (revision 2735) @@ -232,5 +232,5 @@ */ imageUpload : true, - + /** * List of smiley images displayed in the Smiley dialog. Index: /CKEditor/branches/prototype/_source/dialogs/testOnly/dialog.js =================================================================== --- /CKEditor/branches/prototype/_source/dialogs/testOnly/dialog.js (revision 2734) +++ /CKEditor/branches/prototype/_source/dialogs/testOnly/dialog.js (revision 2735) @@ -4,5 +4,5 @@ title : 'Test Dialog', resizable : CKEDITOR.DIALOG_RESIZE_BOTH, - buttons : [ + buttons : [ CKEDITOR.dialog.okButton.override( { label : 'Apply' } ), CKEDITOR.dialog.cancelButton.override( { label : 'Close' } ) @@ -66,5 +66,5 @@ return valid; }, - isChanged : false + isChanged : false }, @@ -108,5 +108,5 @@ type : 'checkbox', label : 'Enable that', - checked : true + checked : true }, Index: /CKEditor/branches/prototype/_source/lang/en.js =================================================================== --- /CKEditor/branches/prototype/_source/lang/en.js (revision 2734) +++ /CKEditor/branches/prototype/_source/lang/en.js (revision 2735) @@ -144,5 +144,5 @@ dlgDivStyle : 'Style', dlgDivInlineStyle : 'Inline Style', - + // General Dialogs Labels dlgGenNotSet : '', @@ -164,5 +164,5 @@ // Special Character Dialog dlgSpecialCharTitle : 'Select Special Character', - + // Find and Replace Dialog dlgFindAndReplaceTitle : 'Find and Replace', Index: /CKEditor/branches/prototype/_source/plugins/dialog/dialogDefinition.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/dialog/dialogDefinition.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/dialog/dialogDefinition.js (revision 2735) Index: /CKEditor/branches/prototype/_source/plugins/dialog/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/dialog/plugin.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/dialog/plugin.js (revision 2735) @@ -301,5 +301,5 @@ }; -CKEDITOR.dialog.prototype = +CKEDITOR.dialog.prototype = { /** @@ -410,5 +410,5 @@ var viewSize = CKEDITOR.document.getWindow().getViewPaneSize(); this.move( ( viewSize.width - this._.size.width ) / 2, ( viewSize.height - this._.size.height ) / 2 ); - + // Select the first tab by default. this.selectPage( this._.definition.contents[0].id ); @@ -452,5 +452,5 @@ this._.dummyText.focus(); this._.dummyText.$.select(); - + // Execute onLoad for the first show. this.fireOnce( 'load', {} ); @@ -536,5 +536,5 @@ className : 'cke_dialog_page_contents', children : contents.elements, - expand : !!contents.expand + expand : !!contents.expand }, pageHtml ); @@ -798,5 +798,5 @@ * Restores the editor's selection from the previously saved position in this * dialog. - * This function is automatically called when a non-nested dialog is closed, + * This function is automatically called when a non-nested dialog is closed, * but it may also be called by event handlers in dialog definition. * @example @@ -928,5 +928,5 @@ }); -CKEDITOR.dialog._ = +CKEDITOR.dialog._ = { defaultDialogDefinition : function( editor ) @@ -942,5 +942,5 @@ uiElementBuilders : {}, - dialogDefinitions : + dialogDefinitions : { testOnly : '_source/dialogs/testOnly/dialog.js' @@ -968,5 +968,5 @@ { var size = win.getViewPaneSize(); - element.setStyles( + element.setStyles( { width : size.width + 'px', @@ -1134,5 +1134,5 @@ var partName = evt.listenerData.part, size = dialog.getSize(); abstractDialogCoords = dialog.getPosition(); - CKEDITOR.tools.extend( abstractDialogCoords, + CKEDITOR.tools.extend( abstractDialogCoords, { x2 : abstractDialogCoords.x + size.width, @@ -1226,5 +1226,5 @@ { var element = dialog.parts[ parts[i] + '_resize' ]; - if ( resizable == CKEDITOR.DIALOG_RESIZE_NONE || + if ( resizable == CKEDITOR.DIALOG_RESIZE_NONE || resizable == CKEDITOR.DIALOG_RESIZE_HEIGHT && widthTest.test( parts[i] ) || resizable == CKEDITOR.DIALOG_RESIZE_WIDTH && heightTest.test( parts[i] ) ) @@ -1240,5 +1240,5 @@ currentZIndex : null, - + storedDialogs : {}, @@ -1354,5 +1354,5 @@ delete this.accessKeyProcessors[i]; } - }, + }, accessKeyProcessors : {}, @@ -1371,5 +1371,5 @@ CKEDITOR.event.implementOn( CKEDITOR.dialog ); -CKEDITOR.dialog._.definitionObject.prototype = +CKEDITOR.dialog._.definitionObject.prototype = /** @lends CKEDITOR.dialog.dialogDefinitionObject.prototype */ { @@ -1483,5 +1483,5 @@ }; -CKEDITOR.dialog._.contentObject.prototype = +CKEDITOR.dialog._.contentObject.prototype = /** @lends CKEDITOR.dialog.contentDefinitionObject.prototype */ { @@ -1489,5 +1489,5 @@ * Gets a UI element definition under the content definition. * @param {String} id The id of the UI element definition. - * @returns {CKEDITOR.dialog.uiElementDefinition} + * @returns {CKEDITOR.dialog.uiElementDefinition} * @example */ @@ -1506,6 +1506,6 @@ * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition The UI elemnet definition * to be added. - * @param {String} nextSiblingId The id of an existing UI element definition which the new - * UI element definition will be inserted before. Omit if the new button definition is to + * @param {String} nextSiblingId The id of an existing UI element definition which the new + * UI element definition will be inserted before. Omit if the new button definition is to * be inserted as the last item. * @returns {CKEDITOR.dialog.uiElementDefinition} The element definition inserted. @@ -1551,5 +1551,5 @@ } - CKEDITOR.ui.dialog = + CKEDITOR.ui.dialog = { /** @@ -1584,5 +1584,5 @@ * @param {Array} htmlList * List of HTML code to be added to the dialog's content area. - * @param {Function|String} nodeNameArg + * @param {Function|String} nodeNameArg * A function returning a string, or a simple string for the node name for * the root DOM node. Default is 'div'. @@ -1665,5 +1665,5 @@ if ( typeof( elementDefinition.isChanged ) == 'function' ) this.isChanged = elementDefinition.isChanged; - + // Add events. CKEDITOR.event.implementOn( this ); @@ -1744,5 +1744,5 @@ }; - CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition || { type : 'hbox' }, htmlList, 'table', styles, + CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition || { type : 'hbox' }, htmlList, 'table', styles, { align : ( elementDefinition && elementDefinition.align ) || ( dialog.getParentEditor().lang.dir == 'ltr' ? 'left' : 'right' ) }, innerHTML ); @@ -1824,5 +1824,5 @@ })(); -CKEDITOR.ui.dialog.uiElement.prototype = +CKEDITOR.ui.dialog.uiElement.prototype = { /** @@ -1980,5 +1980,5 @@ *   true ); */ - eventProcessors : + eventProcessors : { onLoad : function( dialog, func ) @@ -2035,5 +2035,5 @@ /** * Gets a child UI element inside this container. - * @param {Array|Number} indices An array or a single number to indicate the child's + * @param {Array|Number} indices An array or a single number to indicate the child's * position in the container's descendant tree. Omit to get all the children in an array. * @returns {Array|CKEDITOR.ui.dialog.uiElement} Array of all UI elements in the container @@ -2073,5 +2073,5 @@ * @see CKEDITOR.dialog.add * @example - * CKEDITOR.instances.editor1.openDialog( 'smiley' ); + * CKEDITOR.instances.editor1.openDialog( 'smiley' ); * @returns {CKEDITOR.dialog} The dialog object corresponding to the dialog displayed. null if the dialog name is not registered. */ Index: /CKEditor/branches/prototype/_source/plugins/dialogui/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/dialogui/plugin.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/dialogui/plugin.js (revision 2735) @@ -38,5 +38,5 @@ return this._; }, - textBuilder = + textBuilder = { build : function( dialog, elementDefinition, output ) @@ -45,5 +45,5 @@ } }, - commonBuilder = + commonBuilder = { build : function( dialog, elementDefinition, output ) @@ -150,5 +150,5 @@ { type : 'html', - html : '' + CKEDITOR.tools.htmlEncode( elementDefinition.label ) + '' @@ -351,5 +351,5 @@ *
  • items (Required) An array of options. Each option * is a 1- or 2-item array of format [ 'Description', 'Value' ]. If 'Value' - * is missing, then the value would be assumed to be the same as the + * is missing, then the value would be assumed to be the same as the * description.
    • * @@ -390,5 +390,5 @@ }, true ), inputHtml = [], - inputAttributes = + inputAttributes = { type : 'radio', @@ -514,5 +514,5 @@ } - CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition, htmlList, 'table', styles, + CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition, htmlList, 'table', styles, { align : align }, innerHTML ); }, @@ -532,5 +532,5 @@ *
  • items (Required) An array of options. Each option * is a 1- or 2-item array of format [ 'Description', 'Value' ]. If 'Value' - * is missing, then the value would be assumed to be the same as the + * is missing, then the value would be assumed to be the same as the * description.
    • *
  • multiple (Optional) Set this to true if you'd like @@ -541,5 +541,5 @@ * @param {Array} htmlList * List of HTML code to output to. - */ + */ select : function( dialog, elementDefinition, htmlList ) { @@ -654,5 +654,5 @@ if ( arguments.length < 3 ) return; - + var _ = initPrivateObject.call( this, elementDefinition ), me = this; @@ -663,5 +663,5 @@ var myDefinition = CKEDITOR.tools.extend( {}, elementDefinition ); myDefinition.className = ( myDefinition.className ? myDefinition.className + ' ' : '' ) + 'cke_dialog_ui_button'; - myDefinition.onClick = function( evt ) + myDefinition.onClick = function( evt ) { var target = elementDefinition[ 'for' ]; // [ pageId, elementId ] @@ -734,5 +734,5 @@ /** @lends CKEDITOR.ui.dialog.labeledElement.prototype */ { - /** + /** * Sets the label text of the element. * @param {String} label The new label text. Index: /CKEditor/branches/prototype/_source/plugins/find/dialogs/find.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/find/dialogs/find.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/find/dialogs/find.js (revision 2735) @@ -19,6 +19,6 @@ * == END LICENSE == */ - - + + findDialog = function( editor, startupPage ) { Index: /CKEditor/branches/prototype/_source/plugins/find/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/find/plugin.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/find/plugin.js (revision 2735) Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/button.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/button.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/button.js (revision 2735) @@ -42,5 +42,5 @@ this.editObj.setAttribute(name, this.changedAttibutes[ name ] ); } - + if( this.editMode == false ) { @@ -53,15 +53,15 @@ { this.editMode = false; - + /* Check selection. Fill this.editObj if the BUTTON element is selected. */ - + if( this.editMode == false ) //New object. { this.editObj = editor.document.createElement( 'input' ); } - + this.changedAttibutes = new Array(); }, Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/checkbox.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/checkbox.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/checkbox.js (revision 2735) @@ -39,10 +39,10 @@ { this.changedAttibutes[ 'type' ] = 'checkbox'; - + for( var name in this.changedAttibutes ) { this.editObj.setAttribute(name, this.changedAttibutes[ name ] ); } - + if( this.editMode == false ) { @@ -58,15 +58,15 @@ { this.editMode = false; - + /* Check selection. Fill this.editObj if the BUTTON element is selected. */ - + if( this.editMode == false ) //New object. { this.editObj = editor.document.createElement( 'input' ); } - + this.changedAttibutes = new Array(); }, Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/form.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/form.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/form.js (revision 2735) @@ -42,5 +42,5 @@ this.editObj.setAttribute(name, this.changedAttibutes[ name ] ); } - + if( this.editMode == false ) //New object. { @@ -52,17 +52,17 @@ onShow: function() { - + this.editMode = false; - + /* Check selection. Fill this.editObj if FORM element is selected. */ - + if( this.editMode == false ) { this.editObj = editor.document.createElement( 'form' ); } - + this.changedAttibutes = new Array(); }, Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/hiddenfield.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/hiddenfield.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/hiddenfield.js (revision 2735) @@ -57,15 +57,15 @@ { this.editMode = false; - + /* Check selection. Fill this.editObj if the BUTTON element is selected. */ - + if( this.editMode == false ) //New object. { this.editObj = editor.document.createElement( 'input' ); } - + this.changedAttibutes = new Array(); }, Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/radio.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/radio.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/radio.js (revision 2735) @@ -39,10 +39,10 @@ { this.changedAttibutes[ 'type' ] = 'radio'; - + for( var name in this.changedAttibutes ) { this.editObj.setAttribute(name, this.changedAttibutes[ name ] ); } - + if( this.editMode == false ) { @@ -58,15 +58,15 @@ { this.editMode = false; - + /* Check selection. Fill this.editObj if the BUTTON element is selected. */ - + if( this.editMode == false ) //New object. { this.editObj = editor.document.createElement( 'input' ); } - + this.changedAttibutes = new Array(); }, Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/select.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/select.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/select.js (revision 2735) @@ -40,15 +40,15 @@ var parentEditor = this.getParentEditor(); this.editMode = false; - + /* Check selection. Fill this.editObj if the SELECT element is selected. */ - + var names = this.getContentElement( 'info', 'cmbName' ); var values = this.getContentElement( 'info', 'cmbValue' ); var namesOptions = CKEDITOR.plugins.forms.select.getOptions( names ); var valuesOptions = CKEDITOR.plugins.forms.select.getOptions( values ); - + // Reset dialog. for ( var i = namesOptions.length-1 ; i >=0 ; i-- ) @@ -57,6 +57,6 @@ valuesOptions[i].parentNode.removeChild( valuesOptions[i] ); } - - + + if ( this.editMode == true ) //Load existing object. { @@ -65,5 +65,5 @@ this.getContentElement( 'info', 'txtSize' ).setValue( this.editObj.getAttribute( "size" ) ); this.getContentElement( 'info', 'chkMulti' ).setValue( this.editObj.getAttribute( "multiple" ) ); - + var objOptions = CKEDITOR.plugins.forms.select.getOptions( this.editObj ); @@ -80,5 +80,5 @@ else //New object. this.editObj = this.getParentEditor().document.createElement( 'select' ); - + this.changedAttibutes = new Array(); }, @@ -108,5 +108,5 @@ var sValue = optionsValues[i].value; if ( sValue.length == 0 ) sValue = sText; - + var oOption = CKEDITOR.plugins.forms.select.addOption( this.editObj, sText, sValue, parentEditor.document ); if ( sValue == selectValue ) @@ -165,5 +165,5 @@ widths : [ '175px', '170px' ], align : 'center', - children : + children : [ { @@ -231,8 +231,8 @@ var name = dialog.getContentElement( 'info', 'txtOptName' ); var value = dialog.getContentElement( 'info', 'txtOptValue' ); - + var names = dialog.getContentElement( 'info', 'cmbName' ); var values = dialog.getContentElement( 'info', 'cmbValue' ); - + CKEDITOR.plugins.forms.select.addOption(names, name.getValue(), name.getValue() ); CKEDITOR.plugins.forms.select.addOption(values, value.getValue(), value.getValue() ); @@ -252,5 +252,5 @@ var name = dialog.getContentElement( 'info', 'txtOptName' ); var value = dialog.getContentElement( 'info', 'txtOptValue' ); - + var names = dialog.getContentElement( 'info', 'cmbName' ); var values = dialog.getContentElement( 'info', 'cmbValue' ); @@ -313,5 +313,5 @@ var iIndex = CKEDITOR.plugins.forms.select.getSelectedIndex( values ); CKEDITOR.plugins.forms.select.setSelectedIndex( names, iIndex ); - + name.setValue( names.getValue() ); value.setValue( values.getValue() ); @@ -320,5 +320,5 @@ { type : 'vbox', - children : + children : [ { @@ -357,5 +357,5 @@ } ] - }, + }, { type : 'hbox', @@ -386,8 +386,8 @@ var names = dialog.getContentElement( 'info', 'cmbName' ); var values = dialog.getContentElement( 'info', 'cmbValue' ); - + CKEDITOR.plugins.forms.select.removeSelectedOptions( names ); CKEDITOR.plugins.forms.select.removeSelectedOptions( values ); - + var name = dialog.getContentElement( 'info', 'txtOptName' ); var value = dialog.getContentElement( 'info', 'txtOptValue' ); Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/textarea.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/textarea.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/textarea.js (revision 2735) @@ -42,5 +42,5 @@ this.editObj.setAttribute(name, this.changedAttibutes[ name ] ); } - + if( this.editMode == false ) { @@ -53,15 +53,15 @@ { this.editMode = false; - + /* Check selection. Fill this.editObj if the TEXTAREA element is selected. */ - + if( this.editMode == false ) //New object. { this.editObj = editor.document.createElement( 'textarea' ); } - + this.changedAttibutes = new Array(); }, Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/textfield.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/textfield.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/textfield.js (revision 2735) @@ -42,5 +42,5 @@ this.editObj.setAttribute(name, this.changedAttibutes[ name ] ); } - + if( this.editMode == false ) { @@ -56,15 +56,15 @@ { this.editMode = false; - + /* Check selection. Fill this.editObj if the BUTTON element is selected. */ - + if( this.editMode == false ) //New object. { this.editObj = editor.document.createElement( 'input' ); } - + this.changedAttibutes = new Array(); }, Index: /CKEditor/branches/prototype/_source/plugins/forms/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/forms/plugin.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/forms/plugin.js (revision 2735) @@ -122,5 +122,5 @@ else if (oOption.$ && oOption.$.tagName && oOption.$.tagName.toLowerCase() == 'option' ) { - oOptionObj = oOption.$; + oOptionObj = oOption.$; } if ( !isNaN( parseInt( index, 10 ) ) ) @@ -134,5 +134,5 @@ return oOptionObj; }, - + // Remove all selected options from a SELECT object. removeSelectedOptions : function ( combo ) @@ -158,5 +158,5 @@ } }, - + //Modify option from a SELECT object. modifyOption : function( combo, index, title, value ) @@ -168,5 +168,5 @@ combo.options[ index ].value = CKEDITOR.tools.htmlEncode( value ) ; }, - + // Moves the selected option by a number of steps (also negative). changeOptionPosition : function ( combo, steps ) @@ -194,5 +194,5 @@ combo.remove( iActualIndex ); - + oOption = this.addOption( combo, sText, sValue, null, iFinalIndex ); oOption.selected = true; @@ -209,5 +209,5 @@ { combo = this._getObject( combo ); - + if ( index < 0 ) return ; combo.selectedIndex = index; @@ -246,4 +246,2 @@ } } - - Index: /CKEditor/branches/prototype/_source/plugins/image/dialogs/image.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/image/dialogs/image.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/image/dialogs/image.js (revision 2735) @@ -54,5 +54,5 @@ type : 'vbox', padding : 0, - children : + children : [ { @@ -65,5 +65,5 @@ widths : [ '280px', '110px' ], align : 'right', - children : + children : [ { @@ -103,23 +103,23 @@ type : 'hbox', widths : [ '140px', '240px' ], - children : + children : [ { type : 'vbox', - children : + children : [ { type : 'hbox', widths : [ '70%', '30%' ], - children : + children : [ { type : 'vbox', - children : + children : [ { type : 'text', id : 'txtWidth', - labelLayout : 'horizontal', + labelLayout : 'horizontal', style : 'width:100%', label : editor.lang.dlgImgWidth, @@ -139,5 +139,5 @@ type : 'text', id : 'txtHeight', - labelLayout : 'horizontal', + labelLayout : 'horizontal', style : 'width:100%', label : editor.lang.dlgImgHeight, @@ -159,6 +159,6 @@ type : 'html', style : 'position:relative; top:-20px;width:35px;height:20px', //valign = top - html : '
    '+ - '
    ' + + html : '
    '+ + '
    ' + '
    '+ '
    ' @@ -169,5 +169,5 @@ type : 'text', id : 'txtBorder', - labelLayout : 'horizontal', + labelLayout : 'horizontal', style : 'width:100%', label : editor.lang.dlgImgBorder, @@ -187,5 +187,5 @@ type : 'text', id : 'txtHSpace', - labelLayout : 'horizontal', + labelLayout : 'horizontal', style : 'width:100%', label : editor.lang.dlgImgHSpace, @@ -205,5 +205,5 @@ type : 'text', id : 'txtVSpace', - labelLayout : 'horizontal', + labelLayout : 'horizontal', label : editor.lang.dlgImgVSpace, style : 'width:100%', @@ -223,5 +223,5 @@ id : 'cmbAlign', type : 'select', - labelLayout : 'horizontal', + labelLayout : 'horizontal', widths : [ '30%','70%' ], label : editor.lang.dlgImgAlign, @@ -246,5 +246,5 @@ type : 'vbox', height : '180px', - children : + children : [ { @@ -265,5 +265,5 @@ label : editor.lang.linkTitle, padding : 0, - elements : + elements : [ { @@ -301,5 +301,5 @@ id : 'Upload', label : editor.lang.dlgImgUpload, - elements : + elements : [ { @@ -321,5 +321,5 @@ id : 'advanced', label : editor.lang.dlgDivAdvancedTab, - elements : + elements : [ { Index: /CKEditor/branches/prototype/_source/plugins/image/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/image/plugin.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/image/plugin.js (revision 2735) @@ -35,3 +35,2 @@ } } ); - Index: /CKEditor/branches/prototype/_source/plugins/link/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/link/plugin.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/link/plugin.js (revision 2735) @@ -118,5 +118,5 @@ type : 'hbox', widths : [ '25%', '75%' ], - children : + children : [ { @@ -163,5 +163,5 @@ { type : 'hbox', - children : + children : [ { @@ -222,5 +222,5 @@ label : editor.lang.linkTarget, title : editor.lang.linkTarget, - elements : + elements : [ { @@ -235,5 +235,5 @@ 'default' : 'notSet', style : 'width : 100%;', - 'items' : + 'items' : [ [ editor.lang.linkTargetNotSet, 'notSet' ], @@ -260,5 +260,5 @@ padding : 2, id : 'popupFeatures', - children : + children : [ { @@ -268,5 +268,5 @@ { type : 'hbox', - children : + children : [ { @@ -378,5 +378,5 @@ label : editor.lang.linkUpload, title : editor.lang.linkUpload, - elements : + elements : [ { @@ -399,15 +399,15 @@ label : editor.lang.linkAdvanced, title : editor.lang.linkAdvanced, - elements : + elements : [ { type : 'vbox', padding : 1, - children : + children : [ { type : 'hbox', widths : [ '45%', '35%', '20%' ], - children : + children : [ { @@ -440,5 +440,5 @@ type : 'hbox', widths : [ '45%', '35%', '20%' ], - children : + children : [ { @@ -470,5 +470,5 @@ type : 'hbox', widths : [ '45%', '55%' ], - children : + children : [ { @@ -487,5 +487,5 @@ type : 'hbox', widths : [ '45%', '55%' ], - children : + children : [ { @@ -503,5 +503,5 @@ { type : 'hbox', - children : + children : [ { Index: /CKEditor/branches/prototype/_source/plugins/smiley/lang/en.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/smiley/lang/en.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/smiley/lang/en.js (revision 2735) Index: /CKEditor/branches/prototype/_source/plugins/smiley/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/smiley/plugin.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/smiley/plugin.js (revision 2735) @@ -73,8 +73,8 @@ html.push( '' ); - html.push( '' ); Index: /CKEditor/branches/prototype/_source/plugins/specialchar/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/specialchar/plugin.js (revision 2734) +++ /CKEditor/branches/prototype/_source/plugins/specialchar/plugin.js (revision 2735) @@ -24,5 +24,5 @@ */ -var specialChars = +var specialChars = [ "!",""","#","$","%","&","\\'","(",")","*","+","-",".","/", @@ -55,5 +55,5 @@ "→","⇒","⇔","♦","≈" ]; - + CKEDITOR.plugins.add( 'specialchar', { @@ -87,5 +87,5 @@ var cols = 20 ; var i = 0 ; - + while ( i < specialChars.length) { @@ -105,5 +105,5 @@ html.push("<\/tr>"); } - + html.push( '' ); this.getContentElement( 'info', 'charContainer' ).getElement().setHtml(html.join( '' )); Index: /CKEditor/branches/prototype/_source/skins/default/dialog.css =================================================================== --- /CKEditor/branches/prototype/_source/skins/default/dialog.css (revision 2734) +++ /CKEditor/branches/prototype/_source/skins/default/dialog.css (revision 2735) Index: /CKEditor/branches/prototype/_source/skins/default/skin.js =================================================================== --- /CKEditor/branches/prototype/_source/skins/default/skin.js (revision 2734) +++ /CKEditor/branches/prototype/_source/skins/default/skin.js (revision 2735) @@ -105,5 +105,5 @@ var child = dialog.parts.contents.getChild( i ); if ( ( child instanceof CKEDITOR.dom.element ) && ( child.$.className || '' ).search( 'cke_dialog_page_contents' ) > -1 ) - child.setStyles( + child.setStyles( { width : contentWidth - ( standardsMode ? 20 : 0 ) + 'px',