Merges master

app/assets/javascripts/directives/views/accountMenu.js

@@ -199,6 +199,7 @@ class AccountMenuCtrl extends PureCtrl {
     }
     await this.setFormDataState({
       status: null,
+      user_password: null
     });
     const error = response
       ? response.error
@@ -462,6 +463,19 @@ class AccountMenuCtrl extends PureCtrl {
     }
   }
 
+  hidePasswordForm() {
+    this.setFormDataState({
+      showLogin: false,
+      showRegister: false,
+      user_password: null,
+      password_conf: null
+    });
+  }
+
+  hasPasscode() {
+    return this.passcodeManager.hasPasscode();
+  }
+
   addPasscodeClicked() {
     this.setFormDataState({
       showPasscodeForm: true

app/assets/javascripts/directives/views/editorMenu.js

@@ -42,7 +42,7 @@ class EditorMenuCtrl extends PureCtrl {
   }
 
   toggleDefaultForEditor(editor) {
-    if(this.defaultEditor === editor) {
+    if(this.state.defaultEditor === editor) {
       this.removeEditorDefault(editor);
     } else {
       this.makeEditorDefault(editor);