jenkins-bot has submitted this change and it was merged.

Change subject: MediaViewer image description trimmed
......................................................................


MediaViewer image description trimmed

Image details section restricted to 50% of browser height, and navigation for
extra content enabled through scroll

Bug: T92053
Change-Id: I55088badb8dc87b1d30dab01b45a5b4333cc2bed
---
M javascripts/modules/mediaViewer/ImageOverlay.js
M less/modules/mediaViewer.less
2 files changed, 14 insertions(+), 0 deletions(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/javascripts/modules/mediaViewer/ImageOverlay.js 
b/javascripts/modules/mediaViewer/ImageOverlay.js
index 733899e..36aa3c5 100644
--- a/javascripts/modules/mediaViewer/ImageOverlay.js
+++ b/javascripts/modules/mediaViewer/ImageOverlay.js
@@ -108,6 +108,7 @@
                                                self.$( '.license' ).prepend( 
author + ' • ' );
                                        }
                                }
+                               self.adjustDetails();
                        } );
 
                        $( window ).on( 'resize', $.proxy( this, 
'_positionImage' ) );
@@ -135,6 +136,7 @@
                 * @private
                 */
                _positionImage: function () {
+                       this.adjustDetails();
                        // with a hidden details box we have a little bit more 
space, we just need to use it
                        var detailsHeight = !this.$details.is( ':visible' ) ? 0 
: this.$details.outerHeight(),
                                windowWidth = $( window ).width(),
@@ -158,6 +160,17 @@
                                }
                        }
                        $( '.image-wrapper' ).css( 'bottom', detailsHeight );
+               },
+
+               /**
+                * Function to adjust the height of details section to not more 
than 50% of window height.
+                * @method
+                */
+               adjustDetails: function () {
+                       var windowHeight = $( window ).height();
+                       if ( this.$( '.details' ).height() > windowHeight * 
0.50 ) {
+                               this.$( '.details' ).css( 'max-height', 
windowHeight * 0.50 );
+                       }
                }
        } );
        M.define( 'modules/mediaViewer/ImageOverlay', ImageOverlay );
diff --git a/less/modules/mediaViewer.less b/less/modules/mediaViewer.less
index c2fd8cb..32ea59b 100644
--- a/less/modules/mediaViewer.less
+++ b/less/modules/mediaViewer.less
@@ -58,6 +58,7 @@
                padding: 8px 10px;
                margin: 0;
                background: white;
+               overflow-y: auto;
 
                .button {
                        float: right;

-- 
To view, visit https://gerrit.wikimedia.org/r/196576
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I55088badb8dc87b1d30dab01b45a5b4333cc2bed
Gerrit-PatchSet: 12
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Sumit <asthana.sumi...@gmail.com>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.wel...@t-online.de>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: Sumit <asthana.sumi...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to