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

Merge "Added check for empty document to avoid error"

Browse source
This commit is contained in:
Catrope 2012-08-17 20:57:46 +00:00 committed by Gerrit Code Review
parent 8c91e3526d b4ed671dbc
commit 453620b3e6
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/ve/ve.Surface.js
View file

@ -162,7 +162,8 @@ ve.Surface.prototype.floatTopToolbar = function () {
$window.scroll( function () {
var left, right,
toolbarWrapperOffset = $toolbarWrapper.offset(),
$editorDocument = $toolbarWrapper.parent().find('.ve-surface .ve-ce-documentNode');
$editorDocument = $toolbarWrapper.parent().find('.ve-surface .ve-ce-documentNode'),
$lastBranch = $editorDocument.children( '.ve-ce-branchNode:last' );
if ( $window.scrollTop() > toolbarWrapperOffset.top ) {
left = toolbarWrapperOffset.left;
@ -179,9 +180,10 @@ ve.Surface.prototype.floatTopToolbar = function () {
} else {
// Toolbar is floated
if (
// There's at least one branch
$lastBranch.length &&
// Toolbar is at or below the top of last node in the document
$window.scrollTop() + $toolbar.height() >=
$editorDocument.children( '.ve-ce-branchNode:last' ).offset().top
$window.scrollTop() + $toolbar.height() >= $lastBranch.offset().top
) {
// XXX: Use less generic class names (not "bottom" and "float")
if( !$toolbarWrapper.hasClass( 'bottom' ) ) {