/*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.\r
For licensing, see LICENSE.html or http://ckeditor.com/license\r
*/\r
\r
pillarIndex += td.$.colSpan || 1;\r
\r
// Calculate the pillar boundary positions.\r
- var pillarLeft, pillarRight, pillarWidth, pillarPadding;\r
+ var pillarLeft, pillarRight, pillarWidth;\r
\r
var x = td.getDocumentPosition().x;\r
\r
\r
pillarWidth = Math.max( pillarRight - pillarLeft, 3 );\r
\r
- // Make the pillar touch area at least 14 pixels wide, for easy to use.\r
- pillarPadding = Math.max( Math.round( 7 - ( pillarWidth / 2 ) ), 0 );\r
-\r
// The pillar should reflects exactly the shape of the hovered\r
// column border line.\r
pillars.push( {\r
x : pillarLeft,\r
y : tbodyPosition.y,\r
width : pillarWidth,\r
- height: tbody.$.offsetHeight,\r
- padding : pillarPadding,\r
+ height : tbody.$.offsetHeight,\r
rtl : rtl } );\r
}\r
\r
{\r
for ( var i = 0, len = pillars.length ; i < len ; i++ )\r
{\r
- var pillar = pillars[ i ],\r
- pad = pillar.padding;\r
+ var pillar = pillars[ i ];\r
\r
- if ( positionX >= pillar.x - pad && positionX <= ( pillar.x + pillar.width + pad ) )\r
+ if ( positionX >= pillar.x && positionX <= ( pillar.x + pillar.width ) )\r
return pillar;\r
}\r
\r
\r
function onMouseMove( evt )\r
{\r
- move( evt.data.$.clientX );\r
+ move( evt.data.getPageOffset().x );\r
}\r
\r
document = editor.document;\r
\r
resizer = CKEDITOR.dom.element.createFromHtml(\r
- '<div cke_temp=1 contenteditable=false unselectable=on '+\r
+ '<div data-cke-temp=1 contenteditable=false unselectable=on '+\r
'style="position:absolute;cursor:col-resize;filter:alpha(opacity=0);opacity:0;' +\r
'padding:0;background-color:#004;background-image:none;border:0px none;z-index:10"></div>', document );\r
\r
if ( !pillar )\r
return 0;\r
\r
- var pad = pillar.padding;\r
-\r
- if ( !isResizing && ( posX < pillar.x - pad || posX > ( pillar.x + pillar.width + pad ) ) )\r
+ if ( !isResizing && ( posX < pillar.x || posX > ( pillar.x + pillar.width ) ) )\r
{\r
detach();\r
return 0;\r
return;\r
}\r
\r
- target.getAscendant( 'table', true ).removeCustomData( '_cke_table_pillars' );\r
+ target.getAscendant( 'table', 1 ).removeCustomData( '_cke_table_pillars' );\r
evt.removeListener();\r
}\r
\r
{\r
evt = evt.data;\r
\r
+ var pageX = evt.getPageOffset().x;\r
+\r
// If we're already attached to a pillar, simply move the\r
// resizer.\r
- if ( resizer && resizer.move( evt.$.clientX ) )\r
+ if ( resizer && resizer.move( pageX ) )\r
{\r
cancel( evt );\r
return;\r
table,\r
pillars;\r
\r
- if ( !target.is( 'table' ) && !target.getAscendant( 'tbody', true ) )\r
+ if ( !target.is( 'table' ) && !target.getAscendant( 'tbody', 1 ) )\r
return;\r
\r
- table = target.getAscendant( 'table', true );\r
+ table = target.getAscendant( 'table', 1 );\r
\r
if ( !( pillars = table.getCustomData( '_cke_table_pillars' ) ) )\r
{\r
table.on( 'mousedown', clearPillarsCache );\r
}\r
\r
- var pillar = getPillarAtPosition( pillars, evt.$.clientX );\r
+ var pillar = getPillarAtPosition( pillars, pageX );\r
if ( pillar )\r
{\r
!resizer && ( resizer = new columnResizer( editor ) );\r