bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Apply review comments

Browse source
This commit is contained in:
Guillaume Gomez 2019-10-10 12:09:01 +02:00
parent 8f9014d98f
commit 530d866aef
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustdoc/html/layout.rs
View file

@ -1,6 +1,7 @@
use std::path::PathBuf;
use crate::externalfiles::ExternalHtml;
use crate::html::escape::Escape;
use crate::html::render::ensure_trailing_slash;
use crate::html::format::{Buffer, Print};
@ -166,10 +167,11 @@ pub fn render<T: Print, S: Print>(
themes = themes.iter()
.filter_map(|t| t.file_stem())
.filter_map(|t| t.to_str())
.map(|t| format!(r#"<link rel="stylesheet" type="text/css" href="{}{}{}.css">"#,
static_root_path,
t,
page.resource_suffix))
.map(|t| format!(r#"<link rel="stylesheet" type="text/css" href="{}.css">"#,
Escape(&format!("{}{}{}",
static_root_path,
t,
page.resource_suffix))))
.collect::<String>(),
suffix=page.resource_suffix,
static_extra_scripts=page.static_extra_scripts.iter().map(|e| {

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

@ -569,9 +569,7 @@ fn write_shared(
let content = try_err!(fs::read(&entry), &entry);
let theme = try_none!(try_none!(entry.file_stem(), &entry).to_str(), &entry);
let extension = try_none!(try_none!(entry.extension(), &entry).to_str(), &entry);
cx.shared.fs.write(
cx.path(&format!("{}.{}", Escape(theme), extension)),
content.as_slice())?;
cx.shared.fs.write(cx.path(&format!("{}.{}", theme, extension)), content.as_slice())?;
themes.insert(theme.to_owned());
}
@ -637,7 +635,7 @@ themePicker.onclick = switchThemeButtonState;
themePicker.onblur = handleThemeButtonsBlur;
{}.forEach(function(item) {{
var but = document.createElement('button');
but.innerHTML = item;
but.textContent = item;
but.onclick = function(el) {{
switchTheme(currentTheme, mainTheme, item, true);
}};