gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #15857 - Fix #15854 Fix black borders for full screen mode on Designer

Browse Source 
Pull-request: #15857
Fixes: #15854
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-01-28 22:33:57 +01:00
commit 853aea0c53
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/designer/move.js
View File

@ -21,16 +21,25 @@ AJAX.registerTeardown('designer/move.js', function () {
});
AJAX.registerOnload('designer/move.js', function () {
$('#page_content').css({ 'margin-left': '3px' });
var $content = $('#page_content');
var $img = $('#toggleFullscreen').find('img');
var $span = $img.siblings('span');
$content.css({ 'margin-left': '3px' });
$(document).on('fullscreenchange', function () {
if (! $.fn.fullScreen()) {
$('#page_content').removeClass('content_fullscreen')
if (!$.fn.fullScreen() || !$content.fullScreen()) {
$content.removeClass('content_fullscreen')
.css({ 'width': 'auto', 'height': 'auto' });
var $img = $('#toggleFullscreen').find('img');
var $span = $img.siblings('span');
$span.text($span.data('enter'));
$('#osn_tab').css({ 'width': 'auto', 'height': 'auto' });
$img.attr('src', $img.data('enter'))
.attr('title', $span.data('enter'));
$span.text($span.data('enter'));
// Saving the fullscreen state in config when
// designer exists fullscreen mode via ESC key
var valueSent = 'off';
DesignerMove.saveValueInConfig('full_screen', valueSent);
}
});
@ -260,8 +269,6 @@ DesignerMove.resizeOsnTab = function () {
osnTabWidth = maxX + 50;
osnTabHeight = maxY + 50;
DesignerMove.canvasPos();
document.getElementById('osn_tab').style.width = osnTabWidth + 'px';
document.getElementById('osn_tab').style.height = osnTabHeight + 'px';
};
/**
@ -512,12 +519,17 @@ DesignerMove.toggleFullscreen = function () {
$content
.addClass('content_fullscreen')
.css({ 'width': screen.width - 5, 'height': screen.height - 5 });
$('#osn_tab').css({ 'width': screen.width + 'px', 'height': screen.height});
valueSent = 'on';
$content.fullScreen(true);
} else {
$img.attr('src', $img.data('enter'))
.attr('title', $span.data('enter'));
$span.text($span.data('enter'));
$content.removeClass('content_fullscreen')
.css({ 'width': 'auto', 'height': 'auto' });
$('#osn_tab').css({ 'width': 'auto', 'height': 'auto'});
$content.fullScreen(false);
valueSent = 'off';
}