bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix doc [−] button bug by escaping differently

Browse source 
The cause of the problem is described here: https://github.com/rust-lang/rust/pull/24797#issuecomment-97049765 .

I tested this new `main.js` by changing the `main.js` content of a rendered docs page to this new content. The [−] button worked again.
This commit is contained in:
Rory O’Kane 2015-04-30 00:07:42 -04:00
parent 5449f5d29e
commit 2258aef74f
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustdoc/html/render.rs
View file

@ -1460,7 +1460,7 @@ impl<'a> fmt::Display for Item<'a> {
try!(write!(fmt, "<span class='out-of-band'>")); try!(write!(fmt, "<span class='out-of-band'>"));
try!(write!(fmt, try!(write!(fmt,
r##"<span id='render-detail'> r##"<span id='render-detail'>
<a id="toggle-all-docs" href="#" title="collapse all docs">[&minus;]</a> <a id="toggle-all-docs" href="#" title="collapse all docs">[&#x2212;]</a>
</span>"##)); </span>"##));
// Write `src` tag // Write `src` tag

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

@ -808,20 +808,20 @@
$("#toggle-all-docs").on("click", function() { $("#toggle-all-docs").on("click", function() {
var toggle = $("#toggle-all-docs"); var toggle = $("#toggle-all-docs");
if (toggle.html() == "[&minus;]") { if (toggle.html() == "[\u2212]") {
toggle.html("[&plus;]"); toggle.html("[+]");
toggle.attr("title", "expand all docs"); toggle.attr("title", "expand all docs");
$(".docblock").hide(); $(".docblock").hide();
$(".toggle-label").show(); $(".toggle-label").show();
$(".toggle-wrapper").addClass("collapsed"); $(".toggle-wrapper").addClass("collapsed");
$(".collapse-toggle").children(".inner").html("&plus;"); $(".collapse-toggle").children(".inner").html("+");
} else { } else {
toggle.html("[&minus;]"); toggle.html("[\u2212]");
toggle.attr("title", "collapse all docs"); toggle.attr("title", "collapse all docs");
$(".docblock").show(); $(".docblock").show();
$(".toggle-label").hide(); $(".toggle-label").hide();
$(".toggle-wrapper").removeClass("collapsed"); $(".toggle-wrapper").removeClass("collapsed");
$(".collapse-toggle").children(".inner").html("&minus;"); $(".collapse-toggle").children(".inner").html("\u2212");
} }
}); });
@ -835,12 +835,12 @@
if (relatedDoc.is(":visible")) { if (relatedDoc.is(":visible")) {
relatedDoc.slideUp({duration:'fast', easing:'linear'}); relatedDoc.slideUp({duration:'fast', easing:'linear'});
toggle.parent(".toggle-wrapper").addClass("collapsed"); toggle.parent(".toggle-wrapper").addClass("collapsed");
toggle.children(".inner").html("&plus;"); toggle.children(".inner").html("+");
toggle.children(".toggle-label").fadeIn(); toggle.children(".toggle-label").fadeIn();
} else { } else {
relatedDoc.slideDown({duration:'fast', easing:'linear'}); relatedDoc.slideDown({duration:'fast', easing:'linear'});
toggle.parent(".toggle-wrapper").removeClass("collapsed"); toggle.parent(".toggle-wrapper").removeClass("collapsed");
toggle.children(".inner").html("&minus;"); toggle.children(".inner").html("\u2212");
toggle.children(".toggle-label").hide(); toggle.children(".toggle-label").hide();
} }
} }
@ -848,7 +848,7 @@
$(function() { $(function() {
var toggle = $("<a/>", {'href': 'javascript:void(0)', 'class': 'collapse-toggle'}) var toggle = $("<a/>", {'href': 'javascript:void(0)', 'class': 'collapse-toggle'})
.html("[<span class='inner'>&minus;</span>]"); .html("[<span class='inner'>\u2212</span>]");
$(".method").each(function() { $(".method").each(function() {
if ($(this).next().is(".docblock") || if ($(this).next().is(".docblock") ||