wikimedia/mediawiki-extensions-MultimediaViewer
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer synced 2024-12-01 03:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Hide mouse cursor when buttons are faded out in fullscreen"

Browse source
This commit is contained in:
jenkins-bot 2014-02-19 23:48:32 +00:00 committed by Gerrit Code Review
parent 258bdf7747 9a0a601278
commit b6add9a17b
4 changed files with 48 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/mmv/mmv.less
View file

@ -67,6 +67,10 @@
}
}
.cursor-hidden {
cursor: none;
}
.mlb-image-wrapper {
position: fixed;
}

27
resources/mmv/mmv.lightboxinterface.js
View file

@ -156,12 +156,15 @@
history.pushState( {}, '', hashFragment );
}
this.handleEvent( 'keydown', function( e ) { ui.keydown( e ); } );
this.handleEvent( 'keydown', function ( e ) { ui.keydown( e ); } );
// mousemove generates a ton of events, which is why we throttle it
this.handleEvent( 'mousemove.lip', $.throttle( 250, function( e ) {
ui.mousemove( e );
} ) );
this.handleEvent( 'mmv-faded-out', function ( e ) { ui.fadedOut( e ); } );
this.handleEvent( 'mmv-fade-stopped', function ( e ) { ui.fadeStopped( e ); } );
};
/**
@ -299,13 +302,10 @@
this.buttons.setOffset( prevNextTop );
this.buttons.toggle( showPrevButton, showNextButton );
if ( this.isFullscreen ) {
this.buttons.revealAndFade( this.mousePosition );
}
};
/**
* @method
* Gets the widths for a given lightbox image.
* @param {mlb.LightboxImage} image
* @returns {mw.mmv.model.ThumbnailWidth}
@ -318,6 +318,7 @@
};
/**
* @method
* Gets the widths for the current lightbox image.
* @returns {mw.mmv.model.ThumbnailWidth}
*/
@ -325,5 +326,21 @@
return this.getLightboxImageWidths( this.currentImage );
};
/**
* @method
* Called when the buttons have completely faded out and disappeared
*/
LIP.fadedOut = function () {
this.$main.addClass( 'cursor-hidden' );
};
/**
* @method
* Called when the buttons have stopped fading and are back into view
*/
LIP.fadeStopped = function () {
this.$main.removeClass( 'cursor-hidden' );
};
mw.LightboxInterface = LightboxInterface;
}( mediaWiki, jQuery, OO, window.LightboxInterface ) );

9
resources/mmv/ui/mmv.ui.buttons.js
View file

@ -95,7 +95,10 @@
Buttons.prototype.stopFade = function () {
this.$buttons
.stop( true )
.removeClass( 'hidden' )
.css( 'opacity', '' );
this.$container.trigger( $.Event( 'mmv-fade-stopped' ) );
};
/**
@ -116,7 +119,11 @@
// We don't use animation chaining because delay() can't be stop()ed
this.buttonsFadeTimeout = setTimeout( function() {
buttons.$buttons.not( '.disabled' ).animate( { opacity: 0 }, 1000 );
buttons.$buttons.not( '.disabled' ).animate( { opacity: 0 }, 1000, 'swing',
function () {
buttons.$buttons.addClass( 'hidden' );
buttons.$container.trigger( $.Event( 'mmv-faded-out' ) );
} );
}, 1500 );
};

13
resources/mmv/ui/mmv.ui.buttons.less
View file

@ -21,6 +21,19 @@
.unselectable;
}
.mlb-close.hidden,
.mlb-fullscreen.hidden,
.mw-mlb-next-image.hidden,
.mw-mlb-prev-image.hidden {
display: none;
}
.cursor-hidden {
.mlb-close, .mlb-fullscreen, .mw-mlb-next-image, .mw-mlb-prev-image {
cursor: none;
}
}
.mlb-close,
.mlb-fullscreen {
right: @buttons-offset;