wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-25 06:46:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "ve.ce.Surface.getSelectionRect() can return null"

Browse source
This commit is contained in:
jenkins-bot 2013-10-11 14:24:10 +00:00 committed by Gerrit Code Review
parent 873b190804 5d7673ebc2
commit 66615efc1f
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/ve/ce/ve.ce.Surface.js
View file

@ -184,6 +184,7 @@ ve.ce.Surface.static.getClipboardHash = function ( $elements ) {
* Get the coordinates of the selection anchor.
*
* @method
* @returns {Object|null} { 'start': { 'x': ..., 'y': ... }, 'end': { 'x': ..., 'y': ... } }
*/
ve.ce.Surface.prototype.getSelectionRect = function () {
var sel, rect, $span, lineHeight, startRange, startOffset, endRange, endOffset, focusedOffset;

8
modules/ve/ui/ve.ui.Context.js
View file

@ -294,6 +294,14 @@ ve.ui.Context.prototype.updateDimensions = function ( transition ) {
// We're on top of a selected text
// Get the position of the cursor
cursorPosition = surface.getSelectionRect();
if ( !cursorPosition ) {
// The surface apparently isn't selected, so getSelectionRect() returned null.
// This shouldn't happen because the context is only supposed to be displayed in
// response to a selection, but for some reason this does happen in phantomjs.
// We can't update the context position if we don't know where the selection is,
// so just bail.
return this;
}
// Correct for surface offset:
position = {

12
modules/ve/ui/ve.ui.SurfaceToolbar.js
View file

@ -130,10 +130,14 @@ ve.ui.SurfaceToolbar.prototype.onWindowResize = function () {
* the cursor is obscured by the toolbar.
*/
ve.ui.SurfaceToolbar.prototype.onSurfaceViewKeyUp = function () {
var cursorPos = this.surface.view.getSelectionRect(),
barHeight = this.$bar.height(),
scrollTo = this.$bar.offset().top - barHeight + ( cursorPos.end.y - cursorPos.start.y ),
obscured = cursorPos.start.y - this.$window.scrollTop() < barHeight;
var barHeight, scrollTo, obscured, cursorPos = this.surface.view.getSelectionRect();
if ( !cursorPos ) {
return;
}
barHeight = this.$bar.height();
scrollTo = this.$bar.offset().top - barHeight + ( cursorPos.end.y - cursorPos.start.y );
obscured = cursorPos.start.y - this.$window.scrollTop() < barHeight;
// If toolbar is floating and cursor is obscured, scroll cursor into view
if ( obscured && this.floating ) {