X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Ftabletools%2Fdialogs%2FtableCell.js;h=d3ed5cec3fee627829c2531a29b44cb379a90168;hb=6e682412d5cc0dfaedb376482e585bf2989c6863;hp=33fe66bbb1d8961f992c4487779ad6c1a052f670;hpb=9afde8772159bd3436f1f5b7862960307710ae5a;p=ckeditor.git diff --git a/_source/plugins/tabletools/dialogs/tableCell.js b/_source/plugins/tabletools/dialogs/tableCell.js index 33fe66b..d3ed5ce 100644 --- a/_source/plugins/tabletools/dialogs/tableCell.js +++ b/_source/plugins/tabletools/dialogs/tableCell.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2010, 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 : 220, 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(); } }; } );