aboutsummaryrefslogtreecommitdiff
path: root/sources/plugins/floatingspace
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2017-12-04 18:55:29 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2017-12-04 18:55:29 +0100
commit1794320dcfdfcd19572fb1676294f9853a6bbc20 (patch)
treea4c9e978947d6930d50391747382d7f95a5863e3 /sources/plugins/floatingspace
parent7183f6a6a21ad9124e70c997e0168459f377a9f2 (diff)
downloadludivine-ckeditor-component-1794320dcfdfcd19572fb1676294f9853a6bbc20.tar.gz
ludivine-ckeditor-component-1794320dcfdfcd19572fb1676294f9853a6bbc20.tar.zst
ludivine-ckeditor-component-1794320dcfdfcd19572fb1676294f9853a6bbc20.zip
Update to 4.7.3HEAD4.7.3master
Diffstat (limited to 'sources/plugins/floatingspace')
-rw-r--r--sources/plugins/floatingspace/plugin.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/sources/plugins/floatingspace/plugin.js b/sources/plugins/floatingspace/plugin.js
index 878d952..bea3306 100644
--- a/sources/plugins/floatingspace/plugin.js
+++ b/sources/plugins/floatingspace/plugin.js
@@ -68,7 +68,7 @@
68 } 68 }
69 69
70 return function( evt ) { 70 return function( evt ) {
71 // #10112 Do not fail on editable-less editor. 71 // http://dev.ckeditor.com/ticket/10112 Do not fail on editable-less editor.
72 if ( !( editable = editor.editable() ) ) 72 if ( !( editable = editor.editable() ) )
73 return; 73 return;
74 74
@@ -159,7 +159,7 @@
159 alignSide = mid - editorRect.left > editorRect.right - mid ? 'left' : 'right'; 159 alignSide = mid - editorRect.left > editorRect.right - mid ? 'left' : 'right';
160 } 160 }
161 161
162 // (#9769) If viewport width is less than space width, 162 // (http://dev.ckeditor.com/ticket/9769) If viewport width is less than space width,
163 // make sure space never cross the left boundary of the viewport. 163 // make sure space never cross the left boundary of the viewport.
164 // In other words: top-left corner of the space is always visible. 164 // In other words: top-left corner of the space is always visible.
165 if ( spaceRect.width > viewRect.width ) { 165 if ( spaceRect.width > viewRect.width ) {
@@ -226,7 +226,7 @@
226 offset = 0; 226 offset = 0;
227 } 227 }
228 228
229 // (#9769) Finally, stick the space to the opposite side of 229 // (http://dev.ckeditor.com/ticket/9769) Finally, stick the space to the opposite side of
230 // the viewport when it's cut off horizontally on the left/right 230 // the viewport when it's cut off horizontally on the left/right
231 // side like below. 231 // side like below.
232 // 232 //
@@ -258,7 +258,7 @@
258 } 258 }
259 259
260 // Pin mode is fixed, so don't include scroll-x. 260 // Pin mode is fixed, so don't include scroll-x.
261 // (#9903) For mode is "top" or "bottom", add opposite scroll-x for right-aligned space. 261 // (http://dev.ckeditor.com/ticket/9903) For mode is "top" or "bottom", add opposite scroll-x for right-aligned space.
262 var scroll = mode == 'pin' ? 0 : alignSide == 'left' ? pageScrollX : -pageScrollX; 262 var scroll = mode == 'pin' ? 0 : alignSide == 'left' ? pageScrollX : -pageScrollX;
263 263
264 floatSpace.setStyle( alignSide, pixelate( ( mode == 'pin' ? pinnedOffsetX : dockedOffsetX ) + offset + scroll ) ); 264 floatSpace.setStyle( alignSide, pixelate( ( mode == 'pin' ? pinnedOffsetX : dockedOffsetX ) + offset + scroll ) );