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

Merge #15866 - Fix #15863 Designer move menu icon not changing directions

Browse Source 
Pull-request: #15866
Fixes: #15863
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-01-28 21:52:18 +01:00
commit c66f0e0866
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/designer/move.js
View File

@ -91,7 +91,7 @@ DesignerMove.mouseDown = function (e) {
curClick = e.target.parentNode.parentNode.parentNode.parentNode;
} else if (e.target.className === 'tab_zag_2') {
curClick = e.target.parentNode.parentNode.parentNode;
} else if (e.target.className === 'icon') {
} else if (e.target.id === 'layer_menu_sizer_btn') {
layerMenuCurClick = 1;
} else if (e.target.className === 'M_butt') {
return false;
@ -1709,17 +1709,19 @@ DesignerMove.showLeftMenu = function (idThis) {
DesignerMove.sideMenuRight = function (idThis) {
$('#side_menu').toggleClass('right');
$('#layer_menu').toggleClass('left');
var icon = $(idThis.childNodes[0]);
var current = icon.attr('src');
icon.attr('src', icon.attr('data-right')).attr('data-right', current);
icon = $(document.getElementById('layer_menu_sizer').childNodes[0])
var moveMenuIcon = $(idThis.getElementsByTagName('img')[0]);
var resizeIcon = $('#layer_menu_sizer > img')
.toggleClass('floatleft')
.toggleClass('floatright')
.children();
current = icon.attr('src');
icon.attr('src', icon.attr('data-right'));
icon.attr('data-right', current);
.toggleClass('floatright');
var srcResizeIcon = resizeIcon.attr('src');
resizeIcon.attr('src', resizeIcon.attr('data-right'));
resizeIcon.attr('data-right', srcResizeIcon);
var srcMoveIcon = moveMenuIcon.attr('src');
moveMenuIcon.attr('src', moveMenuIcon.attr('data-right'));
moveMenuIcon.attr('data-right', srcMoveIcon);
menuMoved = !menuMoved;
DesignerMove.saveValueInConfig('side_menu', $('#side_menu').hasClass('right'));
$('#key_Left_Right').toggleClass('M_butt_Selected_down');

9
templates/database/designer/main.twig
View File

@ -227,11 +227,10 @@ var designerConfig = {{ designer_config|raw }};
{% trans 'Number of tables:' %} <span id="tables_counter">0</span>
</div>
<div id="layer_menu_sizer">
<div class="floatleft">
<img class="icon"
data-right="{{ theme.getImgPath('designer/resizeright.png') }}"
src="{{ theme.getImgPath('designer/resize.png') }}">
</div>
<img class="icon floatleft"
id="layer_menu_sizer_btn"
data-right="{{ theme.getImgPath('designer/resizeright.png') }}"
src="{{ theme.getImgPath('designer/resize.png') }}">
</div>
</div>
{# end layer_menu #}