Add button to copy password to the clipboard.

gflarity · Apr 19, 2011 · a57236c · a57236c
1 parent 97ee247
commit a57236c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 8 deletions.
diff --git a/css/popup.css b/css/popup.css
@@ -84,4 +84,13 @@ select {
 .largebutton {
     width: 180px;
     text-align: center;
-}
+}
+
+#copypassword {
+  float: left;
+}
+
+.hidden {
+  margin-left: -500px;
+  margin-top: -500px;
+}
diff --git a/html/popup.html b/html/popup.html
@@ -43,10 +43,13 @@
             <input id='generated' readonly='true' value=""/>
             <a id='activatePassword' class="awesome button largebutton" href="#" onclick="showPasswordField();">Show password</a>
         </div>
-
         <div class='row button-row'>
-            <div id="injectpasswordrow"><input class="awesome" type="button" value="Fill password field" onClick="fillPassword();"/></div>
-            <div id='options'><a class="awesome button" href="#" onClick="chrome.tabs.create({url: 'html/options.html'}); window.close();">Options</a></div>
+          <div id="copypassword"><input class="awesome" type="button" value="Copy" onClick="copyPassword();"/></div>
+          <div id="injectpasswordrow"><input class="awesome" type="button" value="Fill field" onClick="fillPassword();"/></div>
+          <div id='options'><a class="awesome button" href="#" onClick="chrome.tabs.create({url: 'html/options.html'}); window.close();">Options</a></div>
+        </div>
+        <div class='hidden'>
+          <input type='text' id='generatedForClipboard' value='' />
         </div>
         </form>
     </body>

diff --git a/javascript/popup.js b/javascript/popup.js
@@ -20,19 +20,26 @@ function updateFields(e) {
     Settings.setActiveProfileId(profileId);
 
     if (password == "") {
+        $("#generatedForClipboard").val("");
         $("#generated").val("Enter password");
         setPasswordColors("#000000", "#85FFAB")
     } else if ( ! matchesHash(password) ) {
+        $("#generatedForClipboard").val("");
         $("#generated").val("Master password mismatch");
         setPasswordColors("#FFFFFF", "#FF7272")
     } else if (!Settings.keepMasterPasswordHash() && password != confirmation) {
+        $("#generatedForClipboard").val("");
         $("#generated").val("Password wrong");
         setPasswordColors("#FFFFFF", "#FF7272")
     } else {        
         if (profile != null) {
-            $("#generated").val(profile.getPassword($("#usedtext").val(), password));
+            var generatedPassword = profile.getPassword($("#usedtext").val(), password);
+            $("#generated").val(generatedPassword);
+            $("#generatedForClipboard").val(generatedPassword);
+            showCopy();
         } else {
             $("#generated").val("");
+            $("#generatedForClipboard").val("");
         }
         setPasswordColors("#000000", "#FFFFFF")
         // pressed enter in confirmation field
@@ -75,6 +82,10 @@ function showInject() {
     $("#injectpasswordrow").fadeIn();
 }
 
+function showCopy() {
+  $("#copypassword").fadeIn();
+}
+
 function init(url) {
     var profiles = Settings.getProfiles();
     Settings.getPassword(function(password) {
@@ -116,14 +127,21 @@ function fillPassword() {
     window.close();
 }
 
+function copyPassword() {
+    $("#generatedForClipboard").select();
+    document.execCommand("Copy");
+    window.close();
+}
+
 function showPasswordField() {
     $("#activatePassword").hide();
     $("#generated").show();
-    $("#generated").focus();     
+    $("#generated").focus();
 }
 
 $(function() {
     $("#injectpasswordrow").hide();
+    $("#copypassword").hide();
 
     if (Settings.shouldHidePassword()){
         $("#generated").hide();
@@ -149,6 +167,4 @@ $(function() {
             $("form").show();
         });
     });
-
-
 });