X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Ftabletools%2Fdialogs%2FtableCell.js;h=06c7ec44cf4128c4b3a876e6e86855e8719395f2;hb=2f22c0c38f17e75be5541089076885442aaa2377;hp=7266890f8e5a2d7730160eb2ebe5b4c0bdeda011;hpb=48b1db88210b4160dce439c6e3e32e14af8c106b;p=ckeditor.git diff --git a/_source/plugins/tabletools/dialogs/tableCell.js b/_source/plugins/tabletools/dialogs/tableCell.js index 7266890..06c7ec4 100644 --- a/_source/plugins/tabletools/dialogs/tableCell.js +++ b/_source/plugins/tabletools/dialogs/tableCell.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -26,7 +26,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor ) { releaseHandlers( this ); callback( this, this._.parentDialog ); - this._.parentDialog.changeFocus( true ); + this._.parentDialog.changeFocus(); }; var onCancel = function() { @@ -73,7 +73,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor ) return { title : langCell.title, minWidth : CKEDITOR.env.ie && CKEDITOR.env.quirks? 450 : 410, - minHeight : CKEDITOR.env.ie && CKEDITOR.env.quirks? 230 : 200, + minHeight : CKEDITOR.env.ie && ( CKEDITOR.env.ie7Compat || CKEDITOR.env.quirks )? 230 : 200, contents : [ { id : 'info', @@ -512,14 +512,9 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor ) for ( var i = 0 ; i < cells.length ; i++ ) this.commitContent( cells[ i ] ); + this._.editor.forceNextSelectionCheck(); selection.selectBookmarks( bookmarks ); - - // Force selectionChange event because of alignment style. - var firstElement = selection.getStartElement(); - var currentPath = new CKEDITOR.dom.elementPath( firstElement ); - - this._.editor._.selectionPreviousPath = currentPath; - this._.editor.fire( 'selectionChange', { selection : selection, path : currentPath, element : firstElement } ); + this._.editor.selectionChange(); } }; } );