Bug 621757 - Sync UI: Allow pasting the Sync Key with the mouse in setup wizard and Update Sync Key dialog. r=mconnor a=blocking-betaN
authorPhilipp von Weitershausen <philipp@weitershausen.de>
Thu, 06 Jan 2011 17:29:58 -0800
changeset 60087 898dc02747b6663adc932042073b2d94274f9747
parent 60086 9ae61e07c2c646dbca7bf62925ba7417afe07d95
child 60088 83e84e7592c03bcdcc06d2bff38e7622e21cb464
push idunknown
push userunknown
push dateunknown
reviewersmconnor, blocking-betaN
bugs621757
milestone2.0b9pre
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
Bug 621757 - Sync UI: Allow pasting the Sync Key with the mouse in setup wizard and Update Sync Key dialog. r=mconnor a=blocking-betaN
browser/base/content/syncGenericChange.xul
browser/base/content/syncSetup.js
browser/base/content/syncSetup.xul
--- a/browser/base/content/syncGenericChange.xul
+++ b/browser/base/content/syncGenericChange.xul
@@ -93,17 +93,17 @@
           <label id="textBox2Label" control="textBox2"/>
           <textbox id="textBox2" type="password" oninput="Change.validate()"/>
           <spacer/>
         </row>
         <row id="passphraseRow" align="center">
           <label id="passphraseLabel" control="passphraseBox"/>
           <textbox id="passphraseBox"
                    onfocus="this.select()"
-                   onkeyup="Change.validate(event)"/>
+                   oninput="Change.validate()"/>
           <label id="generatePassphraseButton"
                  value="&syncKeyGenerate.label;"
                  class="text-link inline-link"
                  onclick="event.stopPropagation();
                           Change.doGeneratePassphrase();"/>
         </row>
       </rows>
     </grid>
--- a/browser/base/content/syncSetup.js
+++ b/browser/base/content/syncSetup.js
@@ -192,20 +192,16 @@ var gSyncSetup = {
         // otherwise, fall through
       case "wipeClient":
       case "wipeRemote":
         Weave.Svc.Prefs.set("firstSync", action);
         break;
     }
   },
 
-  onPassphraseKeyUp: function (event) {
-    this.checkFields();
-  },
-
   // fun with validation!
   checkFields: function () {
     this.wizard.canAdvance = this.readyToAdvance();
   },
 
   readyToAdvance: function () {
     switch (this.wizard.pageIndex) {
       case INTRO_PAGE:
--- a/browser/base/content/syncSetup.xul
+++ b/browser/base/content/syncSetup.xul
@@ -344,18 +344,17 @@
       </grid>
 
     <groupbox>
       <label id="existingPassphraseLabel"
              value="&signIn.syncKey.label;"
              accesskey="&signIn.syncKey.accesskey;"
              control="existingPassphrase"/>
       <textbox id="existingPassphrase"
-               onkeyup="gSyncSetup.onPassphraseKeyUp(event)"
-               onchange="gSyncSetup.checkFields()"/>
+               oninput="gSyncSetup.checkFields()"/>
       <hbox id="login-throbber" hidden="true">
         <image/>
         <label value="&verifying.label;"/>
       </hbox>
       <vbox align="left" id="existingPassphraseFeedbackRow" hidden="true">
         <hbox>
           <image class="statusIcon"/>
           <vbox>