diff options
author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2018-04-20 12:20:50 +0200 |
---|---|---|
committer | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2018-04-21 21:59:12 +0200 |
commit | 1f7892f16a83af3d96dc815c7a688f4cb541c600 (patch) | |
tree | 5de15147c1d850c5620a469b09ec2c4f4fad455d | |
parent | f2ad3c3f6c1c8c2220127e3d38bcf095533a0e47 (diff) | |
download | rust-1f7892f16a83af3d96dc815c7a688f4cb541c600.tar.gz |
Remove link generation on image, favicon and logo in settings
-rw-r--r-- | src/librustdoc/html/render.rs | 36 | ||||
-rw-r--r-- | src/librustdoc/html/static/settings.js | 9 |
2 files changed, 19 insertions, 26 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 7a1ddd9fd24..698333b4e17 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -1643,23 +1643,25 @@ impl Context { &self.shared.themes), &final_file); - // If the file already exists, no need to generate it again... - if !settings_file.is_file() { - let settings = Settings::new("./", &self.shared.resource_suffix); - page.title = "Rustdoc settings"; - page.description = "Settings of Rustdoc"; - page.root_path = "./"; - - let mut w = BufWriter::new(try_err!(File::create(&settings_file), &settings_file)); - let mut themes = self.shared.themes.clone(); - let sidebar = "<p class='location'>Settings</p><div class='sidebar-elems'>".to_owned(); - themes.push(PathBuf::from("settings.css")); - try_err!(layout::render(&mut w, &self.shared.layout, - &page, &sidebar, &settings, - self.shared.css_file_extension.is_some(), - &themes), - &settings_file); - } + // Generating settings page. + let settings = Settings::new("./", &self.shared.resource_suffix); + page.title = "Rustdoc settings"; + page.description = "Settings of Rustdoc"; + page.root_path = "./"; + + let mut w = BufWriter::new(try_err!(File::create(&settings_file), &settings_file)); + let mut themes = self.shared.themes.clone(); + let sidebar = "<p class='location'>Settings</p><div class='sidebar-elems'></div>"; + themes.push(PathBuf::from("settings.css")); + let mut layout = self.shared.layout.clone(); + layout.krate = String::new(); + layout.logo = String::new(); + layout.favicon = String::new(); + try_err!(layout::render(&mut w, &layout, + &page, &sidebar, &settings, + self.shared.css_file_extension.is_some(), + &themes), + &settings_file); Ok(()) } diff --git a/src/librustdoc/html/static/settings.js b/src/librustdoc/html/static/settings.js index ac7bc610520..cc7c60082fb 100644 --- a/src/librustdoc/html/static/settings.js +++ b/src/librustdoc/html/static/settings.js @@ -19,13 +19,6 @@ 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() { var elems = document.getElementsByClassName("slider"); if (!elems || elems.length === 0) { @@ -44,7 +37,5 @@ } } - // To remove possibility to come back to "something" by clicking on the logo. - replaceLogoHref(); setEvents(); })(); |