Browse Source

Merge pull request #8403 from Piccirello/webui-download-height

Make WebUI iframe windows scrollable on iOS. Closes #8401, #7932.
adaptive-webui-19844
Mike Tzou 7 years ago committed by GitHub
parent
commit
0cacd71503
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 16
      src/webui/www/private/css/Window.css
  2. 2
      src/webui/www/private/scripts/mocha-init.js

16
src/webui/www/private/css/Window.css

@ -376,3 +376,19 @@ div.mochaToolbarWrapper.bottom {
.mochaCloseButton.replaced { .mochaCloseButton.replaced {
background-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7) !important; background-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7) !important;
} }
/* iOS iframe scrolling */
.windowFrame .mochaContentWrapper {
/* scroll the Window content. !important required. */
overflow: auto !important;
-webkit-overflow-scrolling: touch;
}
.windowFrame .mochaContent {
height: 100%;
}
.windowFrame iframe {
/* fix double scroll bar by reducing frame height. !important required. */
height: calc(100% - 5px) !important;
}

2
src/webui/www/private/scripts/mocha-init.js

@ -65,6 +65,7 @@ initializeWindows = function() {
title: "QBT_TR(Download from URLs)QBT_TR[CONTEXT=downloadFromURL]", title: "QBT_TR(Download from URLs)QBT_TR[CONTEXT=downloadFromURL]",
loadMethod: 'iframe', loadMethod: 'iframe',
contentURL: 'download.html', contentURL: 'download.html',
addClass: 'windowFrame', // fixes iframe scrolling on iOS Safari
scrollbars: true, scrollbars: true,
maximizable: false, maximizable: false,
closable: true, closable: true,
@ -112,6 +113,7 @@ initializeWindows = function() {
title: "QBT_TR(Upload local torrent)QBT_TR[CONTEXT=HttpServer]", title: "QBT_TR(Upload local torrent)QBT_TR[CONTEXT=HttpServer]",
loadMethod: 'iframe', loadMethod: 'iframe',
contentURL: 'upload.html', contentURL: 'upload.html',
addClass: 'windowFrame', // fixes iframe scrolling on iOS Safari
scrollbars: true, scrollbars: true,
maximizable: false, maximizable: false,
paddingVertical: 0, paddingVertical: 0,

Loading…
Cancel
Save