diff -urN ../roundcubemail-1.4.10.orig/skins/elastic/styles/styles-fixes.css ./skins/elastic/styles/styles-fixes.css --- ../roundcubemail-1.4.10.orig/skins/elastic/styles/styles-fixes.css 1970-01-01 03:00:00.000000000 +0300 +++ ./skins/elastic/styles/styles-fixes.css 2020-05-31 00:21:22.734980000 +0300 @@ -0,0 +1,50 @@ +body.task-settings #layout-content>.header>.header-title{display: inline;} + +#layout-content {overflow-y: hidden; overflow-x: auto;} +/* Firefox */ +/* +#layout-content {scrollbar-width: none;} +*/ +/* IE 10+ */ +/* +#layout-content {-ms-overflow-style: none;} +*/ +/* Chrome/Safari/Webkit */ +/* +#layout-content::-webkit-scrollbar {width: 0px; background: transparent;} +*/ + +.header #toolbar-menu {overflow-y: hidden; overflow-x: auto;} +.header #toolbar-menu {height: 75px;} +/* Firefox */ +/* +.header #toolbar-menu {scrollbar-width: none;} +*/ +/* IE 10+ */ +/* +.header #toolbar-menu {-ms-overflow-style: none;} +*/ +/* Chrome/Safari/Webkit */ +/* +.header #toolbar-menu::-webkit-scrollbar {width: 0px; background: transparent;} +*/ +/* Edge */ +@supports (-ms-ime-align: auto) { +.header #toolbar-menu {overflow-x: hidden;} +} + +.header #toolbar-menu { +-webkit-touch-callout: none; +-webkit-user-select: none; +-khtml-user-select: none; +-moz-user-select: none; +-o-user-select:none; +-ms-user-select: none; +user-select: none; +-webkit-user-drag: none; +-khtml-user-drag: none; +-moz-user-drag: none; +-o-user-drag: none; +-ms-user-drag: none; +user-drag: none; +} diff -urN ../roundcubemail-1.4.10.orig/skins/elastic/templates/includes/layout.html ./skins/elastic/templates/includes/layout.html --- ../roundcubemail-1.4.10.orig/skins/elastic/templates/includes/layout.html 2020-12-27 23:42:19.000000000 +0200 +++ ./skins/elastic/templates/includes/layout.html 2021-01-17 22:01:24.802570000 +0200 @@ -28,6 +28,7 @@ + action-"> diff -urN ../roundcubemail-1.4.10.orig/skins/elastic/ui.js ./skins/elastic/ui.js --- ../roundcubemail-1.4.10.orig/skins/elastic/ui.js 2020-12-27 23:42:19.000000000 +0200 +++ ./skins/elastic/ui.js 2021-01-18 20:20:00.174063000 +0200 @@ -763,8 +763,127 @@ $('input.datepicker').each(function() { func(this); }); rcmail.addEventListener('insert-edit-field', func); } + + // scroll toolbar + var toolbarmenu = document.getElementById('toolbar-menu'); + if (toolbarmenu) { + if (toolbarmenu.addEventListener) { + // scroll toolbar by mousewheel + if ('onwheel' in document) { + toolbarmenu.addEventListener('wheel', toolbarmenuOnWheel); // IE9+, Firefox17+, Chrome31+ + } else if ('onmousewheel' in document) { + toolbarmenu.addEventListener('mousewheel', toolbarmenuOnWheel); // old variant + } else { + toolbarmenu.addEventListener('MozMousePixelScroll', toolbarmenuOnWheel); // Firefox17- + } + toolbarmenu.addEventListener('scroll', toolbarmenuOnScroll, { passive: true }); // for Edge + + // scroll toolbar by drag + toolbarmenu.addEventListener('mousedown', toolbarmenuOnMouseDown); + toolbarmenu.addEventListener('mouseenter', toolbarmenuOnMouseEnter); + document.addEventListener('mousemove', toolbarmenuOnMouseMove) + document.addEventListener('mouseup', toolbarmenuOnMouseUp); + } else { + // IE8- + + // scroll toolbar by mousewheel + toolbarmenu.attachEvent('onmousewheel', toolbarmenuOnWheel); + + // scroll toolbar by drag + toolbarmenu.attachEvent('onmousedown', toolbarmenuOnMouseDown); + toolbarmenu.attachEvent('onmouseenter', toolbarmenuOnMouseEnter); + document.attachEvent('onmousemove', toolbarmenuOnMouseMove) + document.attachEvent('onmouseup', toolbarmenuOnMouseUp); + } + $(toolbarmenu).find('li a').on('dragstart', function() { return(false); }); + } }; + var tbMouseX, tbMouseClicked = false, tbMouseMoved = false, tbScrollLeft; + function toolbarmenuOnMouseDown(e) { + e = e || window.event; + var toolbarmenu = document.getElementById('toolbar-menu'); + if (toolbarmenu) { + tbMouseMoved = false; + tbMouseClicked = true; + tbMouseX = e.pageX; + tbScrollLeft = toolbarmenu.scrollLeft; + } + } + function toolbarmenuOnMouseMove(e) { + e = e || window.event; + if (tbMouseClicked) { + var toolbarmenu = document.getElementById('toolbar-menu'); + if (toolbarmenu) { + if (!tbMouseMoved && (Math.abs(tbMouseX - e.pageX) > 2)) { + tbMouseMoved = true; + $(toolbarmenu).find('li a').each(function() { + if (!$(this).hasClass('disabled')) { + $(this).data('wasDisabled', 'false').addClass('disabled'); + } + }); + } + if (toolbarmenu.scrollLeft != tbScrollLeft + tbMouseX - e.pageX) { + toolbarmenu.scrollLeft = tbScrollLeft + tbMouseX - e.pageX; + } + e.preventDefault ? e.preventDefault() : (e.returnValue = false); + } + } + } + function toolbarEnableButtons() { + var toolbarmenu = document.getElementById('toolbar-menu'); + if (toolbarmenu) { + $(toolbarmenu).find('li a').each(function() { + if (($(this).hasClass('disabled')) && ($(this).data('wasDisabled') == 'false')) { + $(this).data('wasDisabled', 'true').removeClass('disabled').data('wasDisabled', ''); + } + }); + } + } + function toolbarmenuOnMouseUp(e) { + e = e || window.event; + if (tbMouseClicked) { + tbMouseClicked = false; + if (tbMouseMoved) { + tbMouseMoved = false; + toolbarEnableButtons(); + e.preventDefault ? e.preventDefault() : (e.returnValue = false); + } + } + } + function toolbarmenuOnMouseEnter(e) { + e = e || window.event; + if (tbMouseClicked && e.buttons == 0) { + tbMouseClicked = false; + if (tbMouseMoved) { + tbMouseMoved = false; + toolbarEnableButtons(); + } + } + } + function toolbarmenuOnWheel(e) { + e = e || window.event; + var delta = e.deltaY || e.detail || e.wheelDelta; + if ((navigator.appVersion.toUpperCase().indexOf("TRIDENT") != -1) || (navigator.appVersion.toUpperCase().indexOf("MSIE") != -1)) delta=-delta; + if (delta >= 200 || delta <= -200) delta /= 25 + else if (delta >= 100 || delta <= -100) delta /= 15; + else if (delta < 10 || delta > -10) delta *= 3; + var toolbarmenu = document.getElementById('toolbar-menu'); + if (toolbarmenu) { + toolbarmenu.scrollLeft += delta; + e.preventDefault ? e.preventDefault() : (e.returnValue = false); + } + } + function toolbarmenuOnScroll(e) { + var toolbarmenu = document.getElementById('toolbar-menu'); + if (toolbarmenu) { + if (toolbarmenu.scrollTop > 0) { + toolbarmenu.scrollTop = 0; + e.preventDefault ? e.preventDefault() : (e.returnValue = false); + } + } + } + /** * Apply bootstrap classes to html elements */ @@ -3978,6 +4097,46 @@ $('
') .appendTo(node) + .on('touchstart', function(e) { + var ts, splitter = $(this), offset = node.position().left; + + // Makes col-resize cursor follow the touch position on dragging + // and fixes issues related to iframes + splitter.width(10000).css(reverted ? 'left' : 'right', -5000); + + // Disable selection on document while dragging + // It can happen when you move touch out of window, on top + document.body.style.userSelect = 'none'; + + // Start listening to touchmove events + $(document) + .on('touchmove.resizer', function(e) { + // Use of timeouts makes the move more smooth in Chrome + clearTimeout(ts); + ts = setTimeout(function() { + // For left-side-splitter we need the current offset + if (reverted) { + offset = node.position().left; + } + var cursor_position = rcube_event.get_touch_pos(e).x, + width = reverted ? node.width() + (offset - cursor_position) : cursor_position - offset; + + set_width(width); + }, 5); + }) + .on('touchend.resizer', function() { + // Remove registered events + $(document).off('.resizer'); + $('iframe').off('.resizer'); + document.body.style.userSelect = 'auto'; + + // Set back the splitter width to normal + splitter.width(6).css(reverted ? 'left' : 'right', -3); + + // Save the current position (width) + save_pref(key, node.width()); + }); + }) .on('mousedown', function(e) { var ts, splitter = $(this), offset = node.position().left; diff -urN ../roundcubemail-1.4.10.orig/skins/elastic/ui.min.js ./skins/elastic/ui.min.js --- ../roundcubemail-1.4.10.orig/skins/elastic/ui.min.js 2020-12-27 23:42:19.000000000 +0200 +++ ./skins/elastic/ui.min.js 2021-01-18 20:20:09.887071000 +0200 @@ -1,131 +1 @@ -/** - * Roundcube webmail functions for the Elastic skin - * - * Copyright (c) The Roundcube Dev Team - * - * The contents are subject to the Creative Commons Attribution-ShareAlike - * License. It is allowed to copy, distribute, transmit and to adapt the work - * by keeping credits to the original autors in the README file. - * See http://creativecommons.org/licenses/by-sa/3.0/ for details. - * - * @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0-1.0 - */ -/* - magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0-1.0 -*/ -function rcube_elastic_ui(){function r(a,b,d){(a=n(a))&&rcmail.register_button(a.command,b,a.data.type,d,a.data.sel)}function s(a,b,d,c){var f=!0,h=$(""),m=a.attr("id")||(new Date).getTime(),k=m+"-clone";d=a[0].className+(d?" "+d:"");if(!b)d=$.trim(d.replace("btn-primary","primary").replace(/(btn[a-z-]*|button|disabled)/g,"")),d+=" button"+(c?"":" disabled");else if(c=a.data("popup"))h.data({popup:c,"toggle-button":a.data("toggle-button")}),E(h[0]),f=!1,rcmail.register_menu_button(h[0],c);h.attr({id:k, -href:"#","class":d}).append($('').text(a.text()));if(f)h.on("click",function(c){a.click()});l&&!b?(h.data("target",a),U.push($.extend({button_id:k},n(a[0].id)))):r(m,k,d.replace(" disabled",""));return h}function n(a){var b,d,c;for(c in rcmail.buttons)for(b=0;b").attr({"class":"button selection disabled",role:"button",title:rcmail.gettext("select")}).on("click",function(){$(this).is(".active")&&c.toggleClass("withselection")}).append($('').text(rcmail.gettext("select"))),u.is(".menu")?(a.prependTo(u).wrap('
  • '), -e.content&&(f=s(a,!0,"hidden-big hidden-large"),$('
  • ').append(f).appendTo("#toolbar-menu"),a=a.add(f))):(d=c.data("list-select-replace"))?$(d).replaceWith(a):(a.appendTo(u).addClass("icon"),f.is("#layout-sidebar")||a.addClass("toolbar-button")));rcmail.addEventListener("listupdate",function(c){c.list&&c.list==rcmail[b]&&(c.rowcount?a.addClass("active").removeClass("disabled").attr("tabindex",0):a.removeClass("active").addClass("disabled").attr("tabindex",-1))})}K&&rcmail[b]&&("function"== -typeof rcmail[b].draggable?rcmail[b].draggable("destroy"):"boolean"==typeof rcmail[b].draggable&&(rcmail[b].draggable=!1))});window.MutationObserver&&$("[data-label-msg]").filter("ul,table").each(function(){var a,c,b=$('