From 20384147cb0adc4fbf03534a4b39577f572e7e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kay=20Pl=C3=B6=C3=9Fer?= <mail@kay.is>
Date: Fri, 24 Jan 2014 10:49:37 -0600
Subject: [PATCH] Bug 960737 - Remove inline script / style in
 browser/devtools/fontinspector/font-inspector.xhtml;r=bgrins

---
 browser/devtools/fontinspector/font-inspector.css   | 3 ++-
 browser/devtools/fontinspector/font-inspector.js    | 4 ++++
 browser/devtools/fontinspector/font-inspector.xhtml | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/browser/devtools/fontinspector/font-inspector.css b/browser/devtools/fontinspector/font-inspector.css
index 3ad5e5437a9..c0fd6a5738f 100644
--- a/browser/devtools/fontinspector/font-inspector.css
+++ b/browser/devtools/fontinspector/font-inspector.css
@@ -6,7 +6,8 @@
 .font:not(.has-code) .font-css-code,
 .font-is-local,
 .font-is-remote,
-.font.is-local .font-format-url {
+.font.is-local .font-format-url,
+#template {
   display: none;
 }
 
diff --git a/browser/devtools/fontinspector/font-inspector.js b/browser/devtools/fontinspector/font-inspector.js
index 3c65964d79f..9e5c9fd1d36 100644
--- a/browser/devtools/fontinspector/font-inspector.js
+++ b/browser/devtools/fontinspector/font-inspector.js
@@ -22,6 +22,9 @@ FontInspector.prototype = {
     this.onNewNode = this.onNewNode.bind(this);
     this.inspector.selection.on("new-node", this.onNewNode);
     this.inspector.sidebar.on("fontinspector-selected", this.onNewNode);
+    this.showAll = this.showAll.bind(this);
+    this.showAllButton = this.chromeDoc.getElementById("showall");
+    this.showAllButton.addEventListener("click", this.showAll);
     this.update();
   },
 
@@ -40,6 +43,7 @@ FontInspector.prototype = {
     this.chromeDoc = null;
     this.inspector.sidebar.off("layoutview-selected", this.onNewNode);
     this.inspector.selection.off("new-node", this.onNewNode);
+    this.showAllButton.removeEventListener("click", this.showAll);
   },
 
   /**
diff --git a/browser/devtools/fontinspector/font-inspector.xhtml b/browser/devtools/fontinspector/font-inspector.xhtml
index 19dd2061c97..81151d6fd04 100644
--- a/browser/devtools/fontinspector/font-inspector.xhtml
+++ b/browser/devtools/fontinspector/font-inspector.xhtml
@@ -20,9 +20,9 @@
     <script type="application/javascript;version=1.8" src="font-inspector.js"></script>
     <div id="root">
       <ul id="all-fonts"></ul>
-      <button id="showall" onclick="fontInspector.showAll()">&showAllFonts;</button>
+      <button id="showall">&showAllFonts;</button>
     </div>
-    <div id="template" style="display:none">
+    <div id="template">
       <section class="font">
         <iframe sandbox="" class="font-preview"></iframe>
         <div class="font-info">