From 3b23f69786afc1093e956da2d89bc8e29dda271d Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Mon, 25 Apr 2016 09:50:17 +0100
Subject: [PATCH] [WebUI] Use Apply button to change password

---
 .../deluge-all/preferences/InterfacePage.js   | 23 ++++---------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/deluge/ui/web/js/deluge-all/preferences/InterfacePage.js b/deluge/ui/web/js/deluge-all/preferences/InterfacePage.js
index 941bd32db..6716db8a4 100644
--- a/deluge/ui/web/js/deluge-all/preferences/InterfacePage.js
+++ b/deluge/ui/web/js/deluge-all/preferences/InterfacePage.js
@@ -106,29 +106,11 @@ Deluge.preferences.Interface = Ext.extend(Ext.form.FormPanel, {
             fieldLabel: _('Confirm:'),
         });
 
-        var panel = fieldset.add({
-            xtype: 'panel',
-            autoHeight: true,
-            border: false,
-            width: 310,
-            bodyStyle: 'padding-left: 110px'
-        })
-        panel.add({
-            xtype: 'button',
-            text: _('Change Password'),
-            listeners: {
-                'click': {
-                    fn: this.onPasswordChange,
-                    scope: this
-                }
-            }
-        });
-
         fieldset = this.add({
             xtype: 'fieldset',
             border: false,
             title: _('Server'),
-            style: 'padding-top: 3px; margin-bottom: 0px; padding-bottom: 5px',
+            style: 'padding-top: 5px; margin-bottom: 0px; padding-bottom: 5px',
             autoHeight: true,
             labelWidth: 100,
             defaultType: 'spinnerfield',
@@ -191,6 +173,9 @@ Deluge.preferences.Interface = Ext.extend(Ext.form.FormPanel, {
                 deluge.config[key] = this.optionsManager.get(key);
             }
         }
+        if (this.oldPassword.getValue() || this.newPassword.getValue()) {
+            this.onPasswordChange();
+        }
     },
 
     onGotConfig: function(config) {