Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.6.6
[ckeditor.git]
/
_source
/
plugins
/
tableresize
/
plugin.js
diff --git
a/_source/plugins/tableresize/plugin.js
b/_source/plugins/tableresize/plugin.js
index
50ec8d6
..
4d99a13
100644
(file)
--- a/
_source/plugins/tableresize/plugin.js
+++ b/
_source/plugins/tableresize/plugin.js
@@
-1,5
+1,5
@@
/*
\r
/*
\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
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
@@
-82,7
+82,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
pillarIndex += td.$.colSpan || 1;
\r
\r
// Calculate the pillar boundary positions.
\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
var x = td.getDocumentPosition().x;
\r
\r
@@
-112,9
+112,6
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
pillarWidth = Math.max( pillarRight - pillarLeft, 3 );
\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
// The pillar should reflects exactly the shape of the hovered
\r
// column border line.
\r
pillars.push( {
\r
@@
-123,8
+120,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
x : pillarLeft,
\r
y : tbodyPosition.y,
\r
width : pillarWidth,
\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
rtl : rtl } );
\r
}
\r
\r
@@
-135,10
+131,9
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
{
\r
for ( var i = 0, len = pillars.length ; i < len ; i++ )
\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
\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
return pillar;
\r
}
\r
\r
@@
-292,7
+287,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
function onMouseMove( evt )
\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
\r
document = editor.document;
\r
@@
-349,9
+344,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
if ( !pillar )
\r
return 0;
\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
{
\r
detach();
\r
return 0;
\r
@@
-410,9
+403,11
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
{
\r
evt = evt.data;
\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 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
{
\r
cancel( evt );
\r
return;
\r
@@
-436,7
+431,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
table.on( 'mousedown', clearPillarsCache );
\r
}
\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
if ( pillar )
\r
{
\r
!resizer && ( resizer = new columnResizer( editor ) );
\r