Merges master

2020-03-14 12:05:38 -05:00
parent 8fcfef08a6 be9287c70a
commit 2e0528b754
18 changed files with 1453 additions and 89822 deletions
--- a/app/assets/javascripts/directives/views/editorMenu.js
+++ b/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);