Index: /CKEditor/branches/versions/3.3.x/CHANGES.html =================================================================== --- /CKEditor/branches/versions/3.3.x/CHANGES.html (revision 5505) +++ /CKEditor/branches/versions/3.3.x/CHANGES.html (revision 5506) @@ -51,4 +51,6 @@
  • #4231 : Option to restrict manual resizing of the editor to only one direction with config.resize_dir.
  • #5479 : Classic asp integration file and samples.
    • +
  • #5631 : Configurable SCAYT context menu options position.
    • +
  • #5024 : Added sample to show how to output HTML using fonts and other attributes instead of styles.

    • @@ -97,8 +99,18 @@

  • #5663 : General memory clean up after destroying last instance.
  • #5673 : [Firefox] Tab key have to press twice to focus the editor.
    • +
  • #5461 : [IE] Fix Paste from Word dialog doesn't accept imput problem.
    • +
  • #5573 : SCAYT move cursor position after insert element into marked word text.
    • +
  • #5546 : SCAYT interferes with undo/redo commands.
    • +
  • #5676 : Make color buttons use RRGGBB instead of RGB for better compatibility with IE.
    • +
  • #4948 : [Safari] Select the first/last cell of table to open context menu may lead to undetected table.
    • +
  • #5591 : [Firefox] Select a list item makes selected element broken.
    • +
  • #5667 : Pasting in a RTL page content causes shows up the horizontal scrollbar.
    • +
  • #5688 : Duplicate ids are used in dialog definition.
    • +
  • #5570 : [IE] First enabling SCAYT blind cursor in editor.
  • Updated the following language files:
    • Index: /CKEditor/branches/versions/3.3.x/_samples/index.html =================================================================== --- /CKEditor/branches/versions/3.3.x/_samples/index.html (revision 5505) +++ /CKEditor/branches/versions/3.3.x/_samples/index.html (revision 5506) @@ -41,4 +41,5 @@
  • jQuery adapter example
  • Output XHTML
    • +
  • Output HTML
    • '; return { Index: /CKEditor/branches/versions/3.3.x/_source/plugins/image/dialogs/image.js =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/plugins/image/dialogs/image.js (revision 5505) +++ /CKEditor/branches/versions/3.3.x/_source/plugins/image/dialogs/image.js (revision 5506) @@ -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 ) +'
    '+ - ''+ - '
    '+ - ''+ - '' + + ''+ + '
    '+ + ''+ + '' + ( editor.config.image_previewText || 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. '+ Index: /CKEditor/branches/versions/3.3.x/_source/plugins/pagebreak/plugin.js =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/plugins/pagebreak/plugin.js (revision 5505) +++ /CKEditor/branches/versions/3.3.x/_source/plugins/pagebreak/plugin.js (revision 5506) @@ -33,5 +33,5 @@ 'display: block;' + 'float: none;' + - 'width: 100%;' + + 'width:100%;_width:99.9%;' + 'border-top: #999999 1px dotted;' + 'border-bottom: #999999 1px dotted;' + Index: /CKEditor/branches/versions/3.3.x/_source/plugins/scayt/plugin.js =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/plugins/scayt/plugin.js (revision 5505) +++ /CKEditor/branches/versions/3.3.x/_source/plugins/scayt/plugin.js (revision 5506) @@ -54,9 +54,15 @@ if ( !( CKEDITOR.env.ie && CKEDITOR.env.version < 8 ) ) this.addStyle( this.selectorCss(), 'padding-bottom: 2px !important;' ); + + // Call scayt_control.focus when SCAYT loaded + // and only if editor has focus + if ( editor.focusManager.hasFocus ) + this.focus(); + }; oParams.onBeforeChange = function() { - if ( !editor.checkDirty() ) + if ( plugin.getScayt( editor ) && !editor.checkDirty() ) setTimeout( function(){ editor.resetDirty(); } ); }; @@ -143,12 +149,21 @@ }); + editor.on( 'afterCommandExec', function( ev ) + { + if ( !plugin.isScaytEnabled( editor ) ) + return; + + if ( editor.mode == 'wysiwyg' && ( ev.data.name == 'undo' || ev.data.name == 'redo' ) ) + window.setTimeout( function() { plugin.getScayt( editor ).refresh(); }, 10 ); + }); + editor.on( 'destroy', function( ev ) { var editor = ev.editor, scayt_instance = plugin.getScayt( editor ); + delete plugin.instances[ editor.name ]; // store a control id for restore a specific scayt control settings scayt_control_id = scayt_instance.id; scayt_instance.destroy( true ); - delete plugin.instances[ editor.name ]; }); @@ -157,5 +172,9 @@ { if ( plugin.isScaytEnabled( editor ) ) { - window.setTimeout( function(){ plugin.getScayt( editor ).refresh(); }, 10 ); + window.setTimeout( function() + { + var instance = plugin.getScayt( editor ); + instance && instance.refresh(); + }, 10 ); } }); @@ -172,6 +191,10 @@ editor.getSelection().unlock( true ); - // Swallow any SCAYT engine errors. - window.setTimeout( function(){ scayt_instance.refresh(); }, 10 ); + // Return focus to the editor and refresh SCAYT markup (#5573). + window.setTimeout( function() + { + scayt_instance.focus(); + scayt_instance.refresh(); + }, 10 ); } }, this, null, 50 ); @@ -187,6 +210,11 @@ editor.getSelection().unlock( true ); - // Swallow any SCAYT engine errors. - window.setTimeout( function(){ scayt_instance.refresh(); },10 ); + // Return focus to the editor (#5573) + // Refresh SCAYT markup + window.setTimeout( function() + { + scayt_instance.focus(); + scayt_instance.refresh(); + }, 10 ); } }, this, null, 50 ); @@ -222,4 +250,28 @@ } + // Override Image.equals method avoid CK snapshot module to add SCAYT markup to snapshots. (#5546) + var undoImagePrototype = CKEDITOR.plugins.undo.Image.prototype; + undoImagePrototype.equals = CKEDITOR.tools.override( undoImagePrototype.equals, function( org ) + { + return function( otherImage ) + { + var thisContents = this.contents, + otherContents = otherImage.contents; + var scayt_instance = plugin.getScayt( this.editor ); + // Making the comparison based on content without SCAYT word markers. + if ( scayt_instance && plugin.isScaytReady( this.editor ) ) + { + this.contents = scayt_instance.reset( thisContents ); + otherImage.contents = scayt_instance.reset( otherContents ); + } + + var retval = org.apply( this, arguments ); + + this.contents = thisContents; + otherImage.contents = otherContents; + return retval; + } + }); + if ( editor.document ) createInstance(); @@ -341,4 +393,7 @@ exec: function( editor ) { + var autoStartup = editor.config.scayt_autoStartup; + autoStartup = ( autoStartup == undefined ) || autoStartup; + if ( plugin.isScaytReady( editor ) ) { @@ -348,7 +403,14 @@ var scayt_control = plugin.getScayt( editor ); + // the place where the status of editor focus should be restored + // after there will be ability to store its state before SCAYT button click + // if (storedFocusState is focused ) + // scayt_control.focus(); + // + // now focus is set certainly + scayt_control.focus( ); scayt_control.setDisabled( isEnabled ); } - else if ( !editor.config.scayt_autoStartup && plugin.engineLoaded >= 0 ) // Load first time + else if ( !autoStartup && plugin.engineLoaded >= 0 ) // Load first time { this.setState( CKEDITOR.TRISTATE_DISABLED ); @@ -365,6 +427,21 @@ beforeInit : function( editor ) { - // Register own rbc menu group. - editor.config.menu_groups = 'scayt_suggest,scayt_moresuggest,scayt_control,' + editor.config.menu_groups; + var items_order = editor.config.scayt_contextMenuItemsOrder + || 'suggest|moresuggest|control', + items_order_str = ""; + + items_order = items_order.split( '|' ); + + if ( items_order && items_order.length ) + for ( var pos in items_order ) + items_order_str += 'scayt_' + items_order[ pos ] + ( items_order.length != parseInt( pos ) + 1 ? ',' : '' ); + + // Register scayt rbc menu group. + if ( editor.config.scayt_contextMenuOntop ) + // Put it on top of all context menu items + editor.config.menu_groups = items_order_str + ',' + editor.config.menu_groups; + else + // Put it down + editor.config.menu_groups = editor.config.menu_groups + ',' +items_order_str; }, @@ -639,5 +716,6 @@ // Start plugin - if ( editor.config.scayt_autoStartup ) + var autoStartup = editor.config.scayt_autoStartup; + if ( ( autoStartup == undefined ) || autoStartup ) { editor.on( 'instanceReady', function() @@ -671,7 +749,7 @@ * @name CKEDITOR.config.scayt_autoStartup * @type Boolean - * @default false - * @example - * config.scayt_autoStartup = true; + * @default true + * @example + * config.scayt_autoStartup = false; */ @@ -792,2 +870,32 @@ * config.scayt_userDictionaryName = 'MyDictionary'; */ + +/** + * Makes it possible to place the SCAYT context menu items above others. + * @name CKEDITOR.config.scayt_contextMenuOntop + * @type Boolean + * @default false + * @example + * config.scayt_contextMenuOntop = true; + */ + +/** + * Define order of placing of SCAYT context menu items by groups. + * It must be a string with one or more of the following + * words separated by a pipe ("|"): + *
      + *
    • 'suggest' - main suggestion word list,
      • + *
    • 'moresuggest' - more suggestions word list,
      • + *
    • 'control' - SCAYT commands, such as 'Ignore' and 'Add Word'
      • + *
    + * + * @name CKEDITOR.config.scayt_contextMenuItemsOrder + * @type String + * @default 'suggest|moresuggest|control' + * @example + * config.scayt_contextMenuItemsOrder = 'moresuggest|control|suggest'; + */ + + + + Index: /CKEditor/branches/versions/3.3.x/_source/plugins/selection/plugin.js =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/plugins/selection/plugin.js (revision 5505) +++ /CKEditor/branches/versions/3.3.x/_source/plugins/selection/plugin.js (revision 5506) @@ -754,14 +754,19 @@ function() { - var range = self.getRanges()[ 0 ]; - range.shrink( CKEDITOR.SHRINK_ELEMENT ); - - var enclosed; - if ( range.startContainer.equals( range.endContainer ) - && ( range.endOffset - range.startOffset ) == 1 - && styleObjectElements[ ( enclosed = range.startContainer.getChild( range.startOffset ) ).getName() ] ) - { - return enclosed.$; + var range = self.getRanges()[ 0 ], + enclosed, + selected; + + // Check first any enclosed element, e.g. + for ( var i = 2; i && !( ( enclosed = range.getEnclosedNode() ) + && ( enclosed.type == CKEDITOR.NODE_ELEMENT ) + && styleObjectElements[ enclosed.getName() ] + && ( selected = enclosed ) ); i-- ) + { + // Then check any deep wrapped element, e.g. [] + range.shrink( CKEDITOR.SHRINK_ELEMENT ); } + + return selected.$; }); Index: /CKEditor/branches/versions/3.3.x/_source/plugins/smiley/dialogs/smiley.js =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/plugins/smiley/dialogs/smiley.js (revision 5505) +++ /CKEditor/branches/versions/3.3.x/_source/plugins/smiley/dialogs/smiley.js (revision 5506) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license @@ -134,9 +134,10 @@ // Build the HTML for the smiley images table. + var labelId = 'smiley_emtions_label' + CKEDITOR.tools.getNextNumber(); var html = [ '
    ' + - '' + lang.options +'', - '' + lang.options +'', + '
    ' @@ -149,4 +150,5 @@ html.push( '' ); + var smileyLabelId = 'cke_smile_label_' + i + '_' + CKEDITOR.tools.getNextNumber(); html.push( '' ); Index: /CKEditor/branches/versions/3.3.x/_source/plugins/specialchar/dialogs/specialchar.js =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/plugins/specialchar/dialogs/specialchar.js (revision 5505) +++ /CKEditor/branches/versions/3.3.x/_source/plugins/specialchar/dialogs/specialchar.js (revision 5506) @@ -263,5 +263,6 @@ chars = this.definition.chars; - var html = [ '
    ' + @@ -154,5 +156,5 @@ ' aria-posinset="' + ( i +1 ) + '"', ' aria-setsize="' + size + '"', - ' aria-labelledby="cke_smile_label_' + i + '"', + ' aria-labelledby="' + smileyLabelId + '"', ' class="cke_smile" tabindex="-1" onkeydown="CKEDITOR.tools.callFunction( ', onKeydown, ', event, this );">', '' + - '' +config.smiley_descriptions[ i ] + '' + + '' +config.smiley_descriptions[ i ] + '' + '', '
    ' ]; @@ -290,4 +291,6 @@ charDesc = charDesc || character; + var charLabelId = 'cke_specialchar_label_' + i + '_' + CKEDITOR.tools.getNextNumber(); + html.push( '
    ', '' + lang.options +'' ); + html.push( '
    ', '' + lang.options +'' ); this.getContentElement( 'info', 'charContainer' ).getElement().setHtml( html.join( '' ) ); Index: /CKEditor/branches/versions/3.3.x/_source/plugins/table/dialogs/table.js =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/plugins/table/dialogs/table.js (revision 5505) +++ /CKEditor/branches/versions/3.3.x/_source/plugins/table/dialogs/table.js (revision 5506) @@ -44,4 +44,9 @@ else if ( ranges.length > 0 ) { + // Webkit could report the following range on cell selection (#4948): + //
    [ 
    ] + if ( CKEDITOR.env.webkit ) + ranges[ 0 ].shrink( CKEDITOR.NODE_ELEMENT ); + var rangeRoot = ranges[0].getCommonAncestor( true ); selectedTable = rangeRoot.getAscendant( 'table', true ); Index: /CKEditor/branches/versions/3.3.x/_source/plugins/templates/dialogs/templates.js =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/plugins/templates/dialogs/templates.js (revision 5505) +++ /CKEditor/branches/versions/3.3.x/_source/plugins/templates/dialogs/templates.js (revision 5506) @@ -147,4 +147,5 @@ var listContainer; + var templateListLabelId = 'cke_tpl_list_label_' + CKEDITOR.tools.getNextNumber(); return { title :editor.lang.templates.title, @@ -177,8 +178,8 @@ focus: true, html : - '
    ' + + '
    ' + '
    ' + '
    ' + - '' + editor.lang.templates.options+ '' + '' + editor.lang.templates.options+ '' }, { Index: /CKEditor/branches/versions/3.3.x/_source/plugins/uicolor/dialogs/uicolor.js =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/plugins/uicolor/dialogs/uicolor.js (revision 5505) +++ /CKEditor/branches/versions/3.3.x/_source/plugins/uicolor/dialogs/uicolor.js (revision 5506) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license @@ -8,5 +8,6 @@ var dialog, picker, pickerContents, // Actual UI color value. - uiColor = editor.getUiColor(); + uiColor = editor.getUiColor(), + pickerId = 'cke_uicolor_picker' + CKEDITOR.tools.getNextNumber(); function setNewPickerColor( color ) @@ -17,5 +18,5 @@ picker.setValue( color, true ); // Refresh picker UI. - picker.refresh( 'cke_uicolor_picker' ); + picker.refresh( pickerId ); } @@ -34,5 +35,5 @@ id : 'yuiColorPicker', type : 'html', - html : "
    ", + html : "
    ", onLoad : function( event ) { @@ -43,5 +44,5 @@ // Create new color picker widget. - picker = new window.YAHOO.widget.ColorPicker( "cke_uicolor_picker", + picker = new window.YAHOO.widget.ColorPicker( pickerId, { showhsvcontrols : true, Index: /CKEditor/branches/versions/3.3.x/_source/plugins/uicolor/yui/assets/yui.css =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/plugins/uicolor/yui/assets/yui.css (revision 5505) +++ /CKEditor/branches/versions/3.3.x/_source/plugins/uicolor/yui/assets/yui.css (revision 5506) @@ -13,3 +13,3 @@ version: 2.7.0 */ -#cke_uicolor_picker .yui-picker-panel{background:#e3e3e3;border-color:#888;}#cke_uicolor_picker .yui-picker-panel .hd{background-color:#ccc;font-size:100%;line-height:100%;border:1px solid #e3e3e3;font-weight:bold;overflow:hidden;padding:6px;color:#000;}#cke_uicolor_picker .yui-picker-panel .bd{background:#e8e8e8;margin:1px;height:200px;}#cke_uicolor_picker .yui-picker-panel .ft{background:#e8e8e8;margin:1px;padding:1px;}#cke_uicolor_picker .yui-picker{position:relative;}#cke_uicolor_picker .yui-picker-hue-thumb{cursor:default;width:18px;height:18px;top:-8px;left:-2px;z-index:9;position:absolute;}#cke_uicolor_picker .yui-picker-hue-bg{-moz-outline:none;outline:0 none;position:absolute;left:200px;height:183px;width:14px;background:url(hue_bg.png) no-repeat;top:4px;}#cke_uicolor_picker .yui-picker-bg{-moz-outline:none;outline:0 none;position:absolute;top:4px;left:4px;height:182px;width:182px;background-color:#F00;background-image:url(picker_mask.png);}*html #cke_uicolor_picker .yui-picker-bg{background-image:none;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='picker_mask.png',sizingMethod='scale');}#cke_uicolor_picker .yui-picker-mask{position:absolute;z-index:1;top:0;left:0;}#cke_uicolor_picker .yui-picker-thumb{cursor:default;width:11px;height:11px;z-index:9;position:absolute;top:-4px;left:-4px;}#cke_uicolor_picker .yui-picker-swatch{position:absolute;left:240px;top:4px;height:60px;width:55px;border:1px solid #888;}#cke_uicolor_picker .yui-picker-websafe-swatch{position:absolute;left:304px;top:4px;height:24px;width:24px;border:1px solid #888;}#cke_uicolor_picker .yui-picker-controls{position:absolute;top:72px;left:226px;font:1em monospace;}#cke_uicolor_picker .yui-picker-controls .hd{background:transparent;border-width:0!important;}#cke_uicolor_picker .yui-picker-controls .bd{height:100px;border-width:0!important;}#cke_uicolor_picker .yui-picker-controls ul{float:left;padding:0 2px 0 0;margin:0;}#cke_uicolor_picker .yui-picker-controls li{padding:2px;list-style:none;margin:0;}#cke_uicolor_picker .yui-picker-controls input{font-size:.85em;width:2.4em;}#cke_uicolor_picker .yui-picker-hex-controls{clear:both;padding:2px;}#cke_uicolor_picker .yui-picker-hex-controls input{width:4.6em;}#cke_uicolor_picker .yui-picker-controls a{font:1em arial,helvetica,clean,sans-serif;display:block;*display:inline-block;padding:0;color:#000;} +.cke_uicolor_picker .yui-picker-panel{background:#e3e3e3;border-color:#888;}.cke_uicolor_picker .yui-picker-panel .hd{background-color:#ccc;font-size:100%;line-height:100%;border:1px solid #e3e3e3;font-weight:bold;overflow:hidden;padding:6px;color:#000;}.cke_uicolor_picker .yui-picker-panel .bd{background:#e8e8e8;margin:1px;height:200px;}.cke_uicolor_picker .yui-picker-panel .ft{background:#e8e8e8;margin:1px;padding:1px;}.cke_uicolor_picker .yui-picker{position:relative;}.cke_uicolor_picker .yui-picker-hue-thumb{cursor:default;width:18px;height:18px;top:-8px;left:-2px;z-index:9;position:absolute;}.cke_uicolor_picker .yui-picker-hue-bg{-moz-outline:none;outline:0 none;position:absolute;left:200px;height:183px;width:14px;background:url(hue_bg.png) no-repeat;top:4px;}.cke_uicolor_picker .yui-picker-bg{-moz-outline:none;outline:0 none;position:absolute;top:4px;left:4px;height:182px;width:182px;background-color:#F00;background-image:url(picker_mask.png);}*html .cke_uicolor_picker .yui-picker-bg{background-image:none;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='picker_mask.png',sizingMethod='scale');}.cke_uicolor_picker .yui-picker-mask{position:absolute;z-index:1;top:0;left:0;}.cke_uicolor_picker .yui-picker-thumb{cursor:default;width:11px;height:11px;z-index:9;position:absolute;top:-4px;left:-4px;}.cke_uicolor_picker .yui-picker-swatch{position:absolute;left:240px;top:4px;height:60px;width:55px;border:1px solid #888;}.cke_uicolor_picker .yui-picker-websafe-swatch{position:absolute;left:304px;top:4px;height:24px;width:24px;border:1px solid #888;}.cke_uicolor_picker .yui-picker-controls{position:absolute;top:72px;left:226px;font:1em monospace;}.cke_uicolor_picker .yui-picker-controls .hd{background:transparent;border-width:0!important;}.cke_uicolor_picker .yui-picker-controls .bd{height:100px;border-width:0!important;}.cke_uicolor_picker .yui-picker-controls ul{float:left;padding:0 2px 0 0;margin:0;}.cke_uicolor_picker .yui-picker-controls li{padding:2px;list-style:none;margin:0;}.cke_uicolor_picker .yui-picker-controls input{font-size:.85em;width:2.4em;}.cke_uicolor_picker .yui-picker-hex-controls{clear:both;padding:2px;}.cke_uicolor_picker .yui-picker-hex-controls input{width:4.6em;}.cke_uicolor_picker .yui-picker-controls a{font:1em arial,helvetica,clean,sans-serif;display:block;*display:inline-block;padding:0;color:#000;} Index: /CKEditor/branches/versions/3.3.x/_source/plugins/undo/plugin.js =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/plugins/undo/plugin.js (revision 5505) +++ /CKEditor/branches/versions/3.3.x/_source/plugins/undo/plugin.js (revision 5506) @@ -139,8 +139,15 @@ }); - // Gets a snapshot image which represent the current document status. - function Image( editor ) + CKEDITOR.plugins.undo = {}; + + /** + * Undo snapshot which represents the current document status. + * @name CKEDITOR.plugins.undo.Image + * @param editor The editor instance on which the image is created. + */ + var Image = CKEDITOR.plugins.undo.Image = function( editor ) { - var contents = editor.getSnapshot(), + this.editor = editor; + var contents = editor.getSnapshot(), selection = contents && editor.getSelection(); @@ -150,5 +157,5 @@ this.contents = contents; this.bookmarks = selection && selection.createBookmarks2( true ); - } + }; // Attributes that browser may changing them when setting via innerHTML. @@ -159,4 +166,5 @@ equals : function( otherImage, contentOnly ) { + var thisContents = this.contents, otherContents = otherImage.contents; Index: /CKEditor/branches/versions/3.3.x/_source/skins/kama/dialog.css =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/skins/kama/dialog.css (revision 5505) +++ /CKEditor/branches/versions/3.3.x/_source/skins/kama/dialog.css (revision 5506) @@ -680,5 +680,5 @@ } -.cke_skin_kama .cke_dialog #ImagePreviewBox +.cke_skin_kama .cke_dialog .ImagePreviewBox { border : 2px ridge black; @@ -690,5 +690,5 @@ } -.cke_skin_kama .cke_dialog #ImagePreviewBox table td { +.cke_skin_kama .cke_dialog .ImagePreviewBox table td { white-space: normal; } @@ -700,5 +700,5 @@ } -.cke_skin_kama .cke_dialog #ImagePreviewLoader +.cke_skin_kama .cke_dialog .ImagePreviewLoader { position: absolute; @@ -715,5 +715,5 @@ } -.cke_skin_kama .cke_dialog #FlashPreviewBox +.cke_skin_kama .cke_dialog .FlashPreviewBox { white-space : normal; Index: /CKEditor/branches/versions/3.3.x/_source/skins/office2003/dialog.css =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/skins/office2003/dialog.css (revision 5505) +++ /CKEditor/branches/versions/3.3.x/_source/skins/office2003/dialog.css (revision 5506) @@ -611,5 +611,5 @@ } -.cke_skin_office2003 .cke_dialog #ImagePreviewBox +.cke_skin_office2003 .cke_dialog .ImagePreviewBox { border : 2px ridge black; @@ -621,5 +621,5 @@ } -.cke_skin_office2003 .cke_dialog #ImagePreviewBox table td { +.cke_skin_office2003 .cke_dialog .ImagePreviewBox table td { white-space: normal; } @@ -631,5 +631,5 @@ } -.cke_skin_office2003 .cke_dialog #ImagePreviewLoader +.cke_skin_office2003 .cke_dialog .ImagePreviewLoader { position: absolute; @@ -646,5 +646,5 @@ } -.cke_skin_office2003 .cke_dialog #FlashPreviewBox +.cke_skin_office2003 .cke_dialog .FlashPreviewBox { white-space : normal; Index: /CKEditor/branches/versions/3.3.x/_source/skins/v2/dialog.css =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/skins/v2/dialog.css (revision 5505) +++ /CKEditor/branches/versions/3.3.x/_source/skins/v2/dialog.css (revision 5506) @@ -613,5 +613,5 @@ } -.cke_skin_v2 .cke_dialog #ImagePreviewBox +.cke_skin_v2 .cke_dialog .ImagePreviewBox { border : 2px ridge black; @@ -623,5 +623,5 @@ } -.cke_skin_v2 .cke_dialog #ImagePreviewBox table td { +.cke_skin_v2 .cke_dialog .ImagePreviewBox table td { white-space: normal; } @@ -633,5 +633,5 @@ } -.cke_skin_v2 .cke_dialog #ImagePreviewLoader +.cke_skin_v2 .cke_dialog .ImagePreviewLoader { position: absolute; @@ -648,5 +648,5 @@ } -.cke_skin_v2 .cke_dialog #FlashPreviewBox +.cke_skin_v2 .cke_dialog .FlashPreviewBox { white-space : normal;