Backout eb0a4ef7d8b9 (bug 1032128) for adding UX noise. r=me
authorJ. Ryan Stinnett <jryans@gmail.com>
Wed, 18 Mar 2015 19:43:47 -0500
changeset 263236 890e93b28bd08f3aba16726acd8f0252cfc6af06
parent 263235 d3923b8fe2fa43c4b8dc1e96d4142d4fa0aff11d
child 263237 62f338d8f747c9289cb7e146dd29ebf7b3d51059
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1032128
milestone39.0a1
backs outeb0a4ef7d8b904ec900e3612b38f383e7c2310f5
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout eb0a4ef7d8b9 (bug 1032128) for adding UX noise. r=me
browser/devtools/webide/content/wifi-auth.js
browser/devtools/webide/content/wifi-auth.xhtml
browser/locales/en-US/chrome/browser/devtools/webide.properties
--- a/browser/devtools/webide/content/wifi-auth.js
+++ b/browser/devtools/webide/content/wifi-auth.js
@@ -4,18 +4,16 @@
 
 "use strict";
 
 const Cu = Components.utils;
 const { Services } = Cu.import("resource://gre/modules/Services.jsm");
 const { require } =
   Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools;
 const QR = require("devtools/toolkit/qrcode/index");
-const PROPERTIES = "chrome://browser/locale/devtools/webide.properties";
-const Strings = Services.strings.createBundle(PROPERTIES);
 
 window.addEventListener("load", function onLoad() {
   window.removeEventListener("load", onLoad);
   document.getElementById("close").onclick = () => window.close();
   document.getElementById("no-scanner").onclick = showToken;
   document.getElementById("yes-scanner").onclick = hideToken;
   buildUI();
 });
@@ -28,20 +26,16 @@ function buildUI() {
 
 function createQR(oob) {
   let oobData = JSON.stringify(oob);
   let imgData = QR.encodeToDataURI(oobData, "L" /* low quality */);
   document.querySelector("#qr-code img").src = imgData.src;
 }
 
 function createToken(oob) {
-  let spacedCert = oob.sha256.replace(/:/g, " ").toLowerCase();
-  let certText = Strings.formatStringFromName("wifi_auth_cert",
-                                              [spacedCert], 1);
-  document.querySelector("#cert").textContent = certText;
   let token = oob.sha256.replace(/:/g, "").toLowerCase() + oob.k;
   document.querySelector("#token pre").textContent = token;
 }
 
 function showToken() {
   document.querySelector("body").setAttribute("token", "true");
 }
 
--- a/browser/devtools/webide/content/wifi-auth.xhtml
+++ b/browser/devtools/webide/content/wifi-auth.xhtml
@@ -19,17 +19,16 @@
   <body>
 
     <div id="controls">
       <a id="close">&deck_close;</a>
     </div>
 
     <h3 id="header">&wifi_auth_header;</h3>
     <div id="scan-request">&wifi_auth_scan_request;</div>
-    <div id="cert"></div>
 
     <div id="qr-code">
       <div id="qr-code-wrapper">
         <img/>
       </div>
       <a id="no-scanner" class="toggle-scanner">&wifi_auth_no_scanner;</a>
     </div>
 
--- a/browser/locales/en-US/chrome/browser/devtools/webide.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/webide.properties
@@ -72,14 +72,8 @@ runtimedetails_notUSBDevice=Not a USB de
 status_tooltip=Validation status: %1$S
 status_valid=VALID
 status_warning=WARNINGS
 status_error=ERRORS
 status_unknown=UNKNOWN
 
 # Device preferences and settings
 device_reset_default=Reset to default
-
-# WiFi Auth
-# LOCALIZATION NOTE (wifi_auth_cert): Part of the dialog that instructs the
-# user to transfer an authentication token to the server.
-# %1$S: The client's cert fingerprint
-wifi_auth_cert=My Cert: %1$S