bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't apply impl block collapse rules to trait impls

Browse source
This commit is contained in:
Guillaume Gomez 2019-02-04 15:50:46 +01:00
parent 19f8958f82
commit 729e37da4d
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/librustdoc/html/static/main.js
View file

@ -1918,9 +1918,9 @@ if (!DOMTokenList.prototype.remove) {
}; };
} }
function implHider(addOrRemove) { function implHider(addOrRemove, fullHide) {
return function(n) { return function(n) {
var is_method = hasClass(n, "method"); var is_method = hasClass(n, "method") || fullHide;
if (is_method || hasClass(n, "type")) { if (is_method || hasClass(n, "type")) {
if (is_method === true) { if (is_method === true) {
if (addOrRemove) { if (addOrRemove) {
@ -1974,7 +1974,7 @@ if (!DOMTokenList.prototype.remove) {
} }
} }
} else { } else {
// we are collapsing the impl block // we are collapsing the impl block(s).
var parentElem = toggle.parentNode; var parentElem = toggle.parentNode;
relatedDoc = parentElem; relatedDoc = parentElem;
@ -1989,7 +1989,7 @@ if (!DOMTokenList.prototype.remove) {
return; return;
} }
// Hide all functions, but not associated types/consts // Hide all functions, but not associated types/consts.
if (mode === "toggle") { if (mode === "toggle") {
if (hasClass(relatedDoc, "fns-now-collapsed") || if (hasClass(relatedDoc, "fns-now-collapsed") ||
@ -2000,16 +2000,17 @@ if (!DOMTokenList.prototype.remove) {
} }
} }
var dontApplyBlockRule = toggle.parentNode.parentNode.id !== "main";
if (action === "show") { if (action === "show") {
removeClass(relatedDoc, "fns-now-collapsed"); removeClass(relatedDoc, "fns-now-collapsed");
removeClass(docblock, "hidden-by-usual-hider"); removeClass(docblock, "hidden-by-usual-hider");
onEachLazy(toggle.childNodes, adjustToggle(false)); onEachLazy(toggle.childNodes, adjustToggle(false, dontApplyBlockRule));
onEachLazy(relatedDoc.childNodes, implHider(false)); onEachLazy(relatedDoc.childNodes, implHider(false, dontApplyBlockRule));
} else if (action === "hide") { } else if (action === "hide") {
addClass(relatedDoc, "fns-now-collapsed"); addClass(relatedDoc, "fns-now-collapsed");
addClass(docblock, "hidden-by-usual-hider"); addClass(docblock, "hidden-by-usual-hider");
onEachLazy(toggle.childNodes, adjustToggle(true)); onEachLazy(toggle.childNodes, adjustToggle(true, dontApplyBlockRule);
onEachLazy(relatedDoc.childNodes, implHider(true)); onEachLazy(relatedDoc.childNodes, implHider(true, dontApplyBlockRule));
} }
} }
} }