Merge pull request #88 from RoelVB/dev

Release 1.4.7

Author: RoelVB

dist/manifest.json

@@ -3,7 +3,7 @@
 
     "name": "ChromeKeePass",
     "description": "Chrome extension for automatically entering credentials from KeePass/KeeWeb",
-    "version": "1.4.6",
+    "version": "1.4.7",
 
     "commands": {
         "redetect_fields": {

src/classes/FieldSet.ts

@@ -41,7 +41,7 @@ export default class FieldSet
      * @param passwordField Pointer to the password field
      * @param usernameField Pointer to the username field
      */
-    constructor(private _pageControl: PageControl, public readonly passwordField: JQuery, public readonly usernameField?: JQuery) {
+    constructor(private _pageControl: PageControl, public passwordField: JQuery, public readonly usernameField?: JQuery) {
         this._addListenerFunction('mousemove', this._onMouseMove.bind(this));
         this._addListenerFunction('mousedown', this._onMouseDown.bind(this));
         this._addListenerFunction('mouseleave', this._activateIcon.bind(this, true));

src/classes/PageControl.ts

@@ -83,8 +83,15 @@ export default class PageControl
                     // We didn't find the username field. Check if password field is actually visible
                     controlField = $passwordField;
                 } // Else we didn't find a visible username of password field
-                if(controlField && !this._fieldSets.has(controlField[0])) // Only create a FieldSet once for every field
-                    this._fieldSets.set(controlField[0], new FieldSet(this, $passwordField, controlField));
+
+                if(controlField)
+                {
+                    if(this._fieldSets.has(controlField[0])) // We already have a fieldset for this controlfield?
+                        this._fieldSets.get(controlField[0])!.passwordField = $passwordField; // Set the passwordfield again, it might have changed (This happens for Dropbox, see issue #86)
+                    else
+                        this._fieldSets.set(controlField[0], new FieldSet(this, $passwordField, controlField));
+                }
+
                 return false; // Break the each() loop
             }
         });