Skip to content

Commit

Permalink
Merge branch 't/11823'
Browse files Browse the repository at this point in the history
  • Loading branch information
Piotr Jasiun committed May 6, 2014
2 parents f811d8e + f25c56f commit c4a1982
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -17,6 +17,7 @@ Fixed Issues:
* [#11839](http://dev.ckeditor.com/ticket/11839): Fixed: [IE9] Caret jumps out of editable when resizing editor in source mode.
* [#11880](http://dev.ckeditor.com/ticket/11880): Fixed: [IE8-9] Linked image has a default thick border.
* [#11822](http://dev.ckeditor.com/ticket/11822): Fixed: [Webkit] Anchors editing by double click broken in some cases.
* [#11823](http://dev.ckeditor.com/ticket/11823): [IE8] Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) throws error over scrollbar.

Other changes:

Expand Down
12 changes: 10 additions & 2 deletions plugins/tableresize/plugin.js
Expand Up @@ -356,9 +356,18 @@
var resizer,
editable = editor.editable();

// In Classic editor it is better to use document
// instead of editable so event will work below body.
editable.attachListener( editable.isInline() ? editable : editor.document, 'mousemove', function( evt ) {
evt = evt.data;

var target = evt.getTarget();

// FF may return document and IE8 some UFO (object with no nodeType property...)
// instead of an element (#11823).
if ( target.type != CKEDITOR.NODE_ELEMENT )
return;

var pageX = evt.getPageOffset().x;

// If we're already attached to a pillar, simply move the
Expand All @@ -369,8 +378,7 @@
}

// Considering table, tr, td, tbody but nothing else.
var target = evt.getTarget(),
table, pillars;
var table, pillars;

if ( !target.is( 'table' ) && !target.getAscendant( 'tbody', 1 ) )
return;
Expand Down

0 comments on commit c4a1982

Please sign in to comment.