Auto merge of #36637 - GuillaumeGomez:fix_run_button, r=bluss

bors · web-flow · commit b98cc352cbb4 · 2016-10-08T19:42:55.000-07:00
Fixes run button appearing when it shouldn't Fixes #36621. r? @steveklabnik
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
@@ -176,10 +176,10 @@ r##"<!DOCTYPE html>
     krate     = layout.krate,
     play_url  = layout.playground_url,
     play_js   = if layout.playground_url.is_empty() {
-        "".to_string()
+        format!(r#"<script src="{}extra.js"></script>"#, page.root_path)
     } else {
         format!(r#"<script src="{}playpen.js"></script>"#, page.root_path)
-    },
+    }
     )
 }
 
diff --git a/src/librustdoc/html/static/extra.js b/src/librustdoc/html/static/extra.js
@@ -0,0 +1,25 @@
+// Copyright 2014-2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+/*jslint browser: true, es5: true */
+/*globals $: true, rootPath: true */
+
+document.addEventListener('DOMContentLoaded', function() {
+    'use strict';
+
+    if (!window.playgroundUrl) {
+        var runButtons = document.querySelectorAll(".test-arrow");
+
+        for (var i = 0; i < runButtons.length; i++) {
+            runButtons[i].classList.remove("test-arrow");
+        }
+        return;
+    }
+});
diff --git a/src/librustdoc/html/static/playpen.js b/src/librustdoc/html/static/playpen.js
@@ -15,6 +15,11 @@ document.addEventListener('DOMContentLoaded', function() {
     'use strict';
 
     if (!window.playgroundUrl) {
+        var runButtons = document.querySelectorAll(".test-arrow");
+
+        for (var i = 0; i < runButtons.length; i++) {
+            runButtons[i].classList.remove("test-arrow");
+        }
         return;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -176,10 +176,10 @@ r##"<!DOCTYPE html>`
`176`	`176`	`krate = layout.krate,`
`177`	`177`	`play_url = layout.playground_url,`
`178`	`178`	`play_js = if layout.playground_url.is_empty() {`
`179`		`- "".to_string()`
	`179`	`+ format!(r#"<script src="{}extra.js"></script>"#, page.root_path)`
`180`	`180`	`} else {`
`181`	`181`	`format!(r#"<script src="{}playpen.js"></script>"#, page.root_path)`
`182`		`- },`
	`182`	`+ }`
`183`	`183`	`)`
`184`	`184`	`}`
`185`	`185`