wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-27 04:06:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Always float toolbar to top of page, not last branch node"

Browse source
This commit is contained in:
jenkins-bot 2013-06-20 00:27:06 +00:00 committed by Gerrit Code Review
parent 38d6c6ba73 0072e66183
commit 58c7db50e3
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -87,15 +87,11 @@ ve.mixinClass( ve.ui.Toolbar, ve.EventEmitter );
*/
ve.ui.Toolbar.prototype.onWindowScroll = function () {
var scrollTop = this.$window.scrollTop(),
toolbarOffset = this.$.offset(),
$lastBranch = this.surface.$.find( '.ve-ce-documentNode > .ve-ce-branchNode:visible:last' ),
lastBranchOffset = $lastBranch.offset(),
belowLastBranch = $lastBranch.length &&
scrollTop + this.$bar.height() >= lastBranchOffset.top;
toolbarOffset = this.$.offset();
if ( scrollTop > toolbarOffset.top ) {
this.setPosition(
belowLastBranch ? lastBranchOffset.top - this.$.outerHeight() : 0,
0,
toolbarOffset.left,
this.$window.width() - this.$.outerWidth() - toolbarOffset.left
);