Skip to content
Permalink
Browse files

Merge branch 't/11179'

  • Loading branch information...
pjasiun committed Dec 4, 2013
2 parents 4f674e7 + 0889921 commit ab49df9a9c609e8b2f699428e500678f6a08666f
Showing with 14 additions and 8 deletions.
  1. +1 −0 CHANGES.md
  2. +13 −8 plugins/tableresize/plugin.js
@@ -29,6 +29,7 @@ Fixed Issues:
* [#11042](http://dev.ckeditor.com/ticket/11042): Fixed: Selection made on element containing non-editable element was not auto faked.
* [#11042](http://dev.ckeditor.com/ticket/11125): Fixed: Keyboard navigation through menu and combo items will now cycle.
* [#11011](http://dev.ckeditor.com/ticket/11011): Fixed: Method applyStyle removes attributes from nested elements.
* [#11179](http://dev.ckeditor.com/ticket/11179): Fixed: editor.destroy() does not cleanup content generated by [TableResize plugin](http://ckeditor.com/addon/tableresize) for inline editors.

## CKEditor 4.3

@@ -3,7 +3,7 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

(function() {
( function() {
var pxUnit = CKEDITOR.tools.cssLength,
needsIEHacks = CKEDITOR.env.ie && ( CKEDITOR.env.ie7Compat || CKEDITOR.env.quirks );

@@ -96,7 +96,7 @@

// The pillar should reflects exactly the shape of the hovered
// column border line.
pillars.push({
pillars.push( {
table: table,
index: pillarIndex,
x: pillarLeft,
@@ -257,6 +257,11 @@
'style="position:absolute;cursor:col-resize;filter:alpha(opacity=0);opacity:0;' +
'padding:0;background-color:#004;background-image:none;border:0px none;z-index:10"></div>', document );

// Clean DOM when editor is destroyed.
editor.on( 'destroy', function() {
resizer.remove();
} );

// Except on IE6/7 (#5890), place the resizer after body to prevent it
// from being editable.
if ( !needsIEHacks )
@@ -275,12 +280,12 @@

pillar = targetPillar;

resizer.setStyles({
resizer.setStyles( {
width: pxUnit( targetPillar.width ),
height: pxUnit( targetPillar.height ),
left: pxUnit( targetPillar.x ),
top: pxUnit( targetPillar.y )
});
} );

// In IE6/7, it's not possible to have custom cursors for floating
// elements in an editable document. Show the resizer in that case,
@@ -382,9 +387,9 @@
!resizer && ( resizer = new columnResizer( editor ) );
resizer.attachTo( pillar );
}
});
});
} );
} );
}
});
} );

})();
} )();

0 comments on commit ab49df9

Please sign in to comment.
You can’t perform that action at this time.