Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
This commit is contained in:
commit
238d547a46
@ -29,10 +29,6 @@
|
|||||||
.dropdown-menu {
|
.dropdown-menu {
|
||||||
top: -0.7rem;
|
top: -0.7rem;
|
||||||
left: 100%;
|
left: 100%;
|
||||||
&.left {
|
|
||||||
left: 0%;
|
|
||||||
transform: translate(-100%);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
a {
|
a {
|
||||||
|
|||||||
@ -1368,10 +1368,12 @@ define([
|
|||||||
errEv.preventDefault();
|
errEv.preventDefault();
|
||||||
errEv.stopPropagation();
|
errEv.stopPropagation();
|
||||||
noWorker = true;
|
noWorker = true;
|
||||||
|
worker.terminate();
|
||||||
w();
|
w();
|
||||||
};
|
};
|
||||||
worker.onmessage = function (ev) {
|
worker.onmessage = function (ev) {
|
||||||
if (ev.data === "OK") {
|
if (ev.data === "OK") {
|
||||||
|
worker.terminate();
|
||||||
w();
|
w();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@ -498,10 +498,16 @@ define([
|
|||||||
var $el = $(el);
|
var $el = $(el);
|
||||||
var $a = $el.children().filter("a");
|
var $a = $el.children().filter("a");
|
||||||
var $sub = $el.find(".dropdown-menu").first();
|
var $sub = $el.find(".dropdown-menu").first();
|
||||||
|
var left, bottomOffset;
|
||||||
var timeoutId;
|
var timeoutId;
|
||||||
var showSubmenu = function () {
|
var showSubmenu = function () {
|
||||||
clearTimeout(timeoutId);
|
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();
|
$el.siblings().find(".dropdown-menu").hide();
|
||||||
$sub.show();
|
$sub.show();
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user