bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove link generation on image, favicon and logo in settings

Browse source
This commit is contained in:
Guillaume Gomez 2018-04-20 12:20:50 +02:00
parent f2ad3c3f6c
commit 1f7892f16a
2 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1643,23 +1643,25 @@ impl Context {
&self.shared.themes), &self.shared.themes),
&final_file); &final_file);
// If the file already exists, no need to generate it again... // Generating settings page.
if !settings_file.is_file() { let settings = Settings::new("./", &self.shared.resource_suffix);
let settings = Settings::new("./", &self.shared.resource_suffix); page.title = "Rustdoc settings";
page.title = "Rustdoc settings"; page.description = "Settings of Rustdoc";
page.description = "Settings of Rustdoc"; page.root_path = "./";
page.root_path = "./";
let mut w = BufWriter::new(try_err!(File::create(&settings_file), &settings_file)); let mut w = BufWriter::new(try_err!(File::create(&settings_file), &settings_file));
let mut themes = self.shared.themes.clone(); let mut themes = self.shared.themes.clone();
let sidebar = "<p class='location'>Settings</p><div class='sidebar-elems'>".to_owned(); let sidebar = "<p class='location'>Settings</p><div class='sidebar-elems'></div>";
themes.push(PathBuf::from("settings.css")); themes.push(PathBuf::from("settings.css"));
try_err!(layout::render(&mut w, &self.shared.layout, let mut layout = self.shared.layout.clone();
&page, &sidebar, &settings, layout.krate = String::new();
self.shared.css_file_extension.is_some(), layout.logo = String::new();
&themes), layout.favicon = String::new();
&settings_file); try_err!(layout::render(&mut w, &layout,
} &page, &sidebar, &settings,
self.shared.css_file_extension.is_some(),
&themes),
&settings_file);
Ok(()) Ok(())
} }

9
src/librustdoc/html/static/settings.js
View file

@ -19,13 +19,6 @@
return getCurrentValue('rustdoc-' + settingName); return getCurrentValue('rustdoc-' + settingName);
} }
function replaceLogoHref() {
var elem = document.getElementsByClassName("sidebar-menu");
if (elem && elem.length > 0) {
elem[0].nextElementSibling.setAttribute('href', 'javascript:void');
}
}
function setEvents() { function setEvents() {
var elems = document.getElementsByClassName("slider"); var elems = document.getElementsByClassName("slider");
if (!elems || elems.length === 0) { if (!elems || elems.length === 0) {
@ -44,7 +37,5 @@
} }
} }
// To remove possibility to come back to "something" by clicking on the logo.
replaceLogoHref();
setEvents(); setEvents();
})(); })();