P4TB-400: Improved manual key import. Part 6: CSS tweaks, clearing usage section when new ASC file is selected.

addon/content/dialogs/options.css

@@ -98,6 +98,11 @@ label.donate {
     background-color: #03AA4B;
 }
 
+#importResult {
+  white-space: pre;
+  margin: 0.4em;
+}  
+
 #importOptions radio {
   margin-top: 0;
   margin-bottom: 0;

addon/content/dialogs/options.js

@@ -348,10 +348,12 @@ var pEpOptions = {
   },
 
   browseForKey() {
-    var fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
+    this.cancelKey();
+
+    let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
 
     // If we already have a key, then use the path.
-    var localFile = this.convertURLToLocalFile(document.getElementById("keyLocation").value);
+    let localFile = this.convertURLToLocalFile(document.getElementById("keyLocation").value);
     if (localFile) {
       fp.displayDirectory = localFile.parent;
     }

addon/content/dialogs/options.xhtml

@@ -147,7 +147,7 @@
                          onclick="pEpOptions.importKey();">
             </html:button>
           </hbox>
-          <html:div id="importResult" hidden="hidden" style="white-space: pre;">
+          <html:div id="importResult" hidden="hidden">
           </html:div>
           <radiogroup id="importOptions" hidden="true" orient="vertical" preference="extensions.pEp.keyUse">
             <radio value="keep" label-localekey="optionsPrivateOwnKeep"/>