Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
ansuz 5 years ago
commit 238d547a46

@ -29,10 +29,6 @@
.dropdown-menu {
top: -0.7rem;
left: 100%;
&.left {
left: 0%;
transform: translate(-100%);
}
}
}
a {

@ -1368,10 +1368,12 @@ define([
errEv.preventDefault();
errEv.stopPropagation();
noWorker = true;
worker.terminate();
w();
};
worker.onmessage = function (ev) {
if (ev.data === "OK") {
worker.terminate();
w();
}
};

@ -498,10 +498,16 @@ define([
var $el = $(el);
var $a = $el.children().filter("a");
var $sub = $el.find(".dropdown-menu").first();
var left, bottomOffset;
var timeoutId;
var showSubmenu = function () {
clearTimeout(timeoutId);
$sub.toggleClass("left", $el.offset().left + $el.outerWidth() + $sub.outerWidth() > $(window).width());
left = $el.offset().left + $el.outerWidth() + $sub.outerWidth() > $(window).width();
bottomOffset = $el.offset().top + $el.outerHeight() + $sub.outerHeight() - $(window).height();
$sub.css("left", left ? "0%": "100%");
$sub.css("transform", "translate("
+ (left ? "-100%" : "0")
+ "," + (bottomOffset > 0 ? -(bottomOffset - $el.outerHeight()) : 0) + "px)");
$el.siblings().find(".dropdown-menu").hide();
$sub.show();
};

Loading…
Cancel
Save