From 76532a156a861b88948bd91b2342b5cc7b1f8ee7 Mon Sep 17 00:00:00 2001
From: Mark Holmquist <mtraceur@member.fsf.org>
Date: Tue, 10 Dec 2013 15:22:40 -0800
Subject: [PATCH] Fixes for the scroll-up affordance

Fix click listener, add cursor: move

Change-Id: I1c51702d4c7dd63d64026747c5c75d2dfff14c58
---
 .../ext.multimediaViewer/ext.multimediaViewer.css |  1 +
 .../ext.multimediaViewer.lightboxinterface.js     | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.css b/resources/ext.multimediaViewer/ext.multimediaViewer.css
index 0e1b08890..6e94aacdc 100644
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.css
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.css
@@ -299,6 +299,7 @@ body.mw-mlb-lightbox-open .mlb-main {
 .mw-mlb-drag-affordance {
 	width: 100%;
 	height: 32px;
+	cursor: move;
 }
 
 .mw-mlb-drag-icon {
diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js b/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
index 409caf41c..5e24c1192 100644
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
@@ -444,10 +444,17 @@
 	};
 
 	LIP.toggleMetadata = function () {
-		var off = this.$controlBar.offset();
-		$( 'html, body' ).animate( {
-			scrollTop: off.top - 72
-		} );
+		var off = this.$controlBar.offset(),
+			scroll = this.$main.scrollTop();
+		if ( scroll > 0 ) {
+			this.$main.animate( {
+				scrollTop: 0
+			}, 400 );
+		} else {
+			this.$main.animate( {
+				scrollTop: off.top - 96
+			}, 400 );
+		}
 	};
 
 	// We are overwriting what is already set in window.LightboxInterface, shouldn't it be 'mw.LightboxInterface' ???