From 9200055616669d148b26c0559a87a81baae716ff Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Thu, 13 Dec 2018 01:38:22 -0600
Subject: [PATCH] editor-menu-bar id

---
 app/assets/javascripts/app/controllers/editor.js    |  2 +-
 .../javascripts/app/services/componentManager.js    | 13 +++++++------
 app/assets/templates/editor.html.haml               |  6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/editor.js b/app/assets/javascripts/app/controllers/editor.js
index ed97fe6a8..986584343 100644
--- a/app/assets/javascripts/app/controllers/editor.js
+++ b/app/assets/javascripts/app/controllers/editor.js
@@ -516,7 +516,7 @@ angular.module('app')
     this.loadPreferences = function() {
       this.monospaceFont = authManager.getUserPrefValue("monospaceFont", "monospace");
       this.spellcheck = authManager.getUserPrefValue("spellcheck", true);
-      this.marginResizersEnabled = authManager.getUserPrefValue("marginResizersEnabled", false);
+      this.marginResizersEnabled = authManager.getUserPrefValue("marginResizersEnabled", true);
 
       if(!document.getElementById("editor-content")) {
         // Elements have not yet loaded due to ng-if around wrapper
diff --git a/app/assets/javascripts/app/services/componentManager.js b/app/assets/javascripts/app/services/componentManager.js
index ccb255d4e..c611f8e41 100644
--- a/app/assets/javascripts/app/services/componentManager.js
+++ b/app/assets/javascripts/app/services/componentManager.js
@@ -33,7 +33,7 @@ class ComponentManager {
     desktopManager.registerUpdateObserver((component) => {
       // Reload theme if active
       if(component.active && component.isTheme()) {
-        this.postActiveThemeToAllComponents();
+        this.postActiveThemesToAllComponents();
       }
     })
 
@@ -147,13 +147,14 @@ class ComponentManager {
     });
   }
 
-  postActiveThemeToAllComponents() {
+  postActiveThemesToAllComponents() {
     for(var component of this.components) {
       // Skip over components that are themes themselves,
       // or components that are not active, or components that don't have a window
       if(component.isTheme() || !component.active || !component.window) {
         continue;
       }
+
       this.postActiveThemesToComponent(component);
     }
   }
@@ -862,7 +863,7 @@ class ComponentManager {
     }
 
     if(component.area == "themes") {
-      this.postActiveThemeToAllComponents();
+      this.postActiveThemesToAllComponents();
     }
   }
 
@@ -895,7 +896,7 @@ class ComponentManager {
     })
 
     if(component.area == "themes") {
-      this.postActiveThemeToAllComponents();
+      this.postActiveThemesToAllComponents();
     }
   }
 
@@ -922,7 +923,7 @@ class ComponentManager {
     })
 
     if(component.area == "themes") {
-      this.postActiveThemeToAllComponents();
+      this.postActiveThemesToAllComponents();
     }
 
     //
@@ -944,7 +945,7 @@ class ComponentManager {
       }
 
       if(component.area == "themes") {
-        this.postActiveThemeToAllComponents();
+        this.postActiveThemesToAllComponents();
       }
     })
   }
diff --git a/app/assets/templates/editor.html.haml b/app/assets/templates/editor.html.haml
index ec5c34da7..70ceb1b4e 100644
--- a/app/assets/templates/editor.html.haml
+++ b/app/assets/templates/editor.html.haml
@@ -10,8 +10,8 @@
   #editor-title-bar.section-title-bar{"ng-show" => "ctrl.note && !ctrl.note.errorDecrypting", "ng-class" => "{'locked' : ctrl.note.locked }"}
     .title
       %input.input#note-title-editor{"ng-model" => "ctrl.note.title", "ng-keyup" => "$event.keyCode == 13 && ctrl.saveTitle($event)",
-                "ng-change" => "ctrl.nameChanged()", "ng-focus" => "ctrl.onNameFocus()", "ng-blur" => "ctrl.onNameBlur()",
-                "select-on-click" => "true", "ng-disabled" => "ctrl.note.locked"}
+        "ng-change" => "ctrl.nameChanged()", "ng-focus" => "ctrl.onNameFocus()", "ng-blur" => "ctrl.onNameBlur()",
+        "select-on-click" => "true", "ng-disabled" => "ctrl.note.locked"}
 
     #save-status{"ng-class" => "{'warning bold': ctrl.syncTakingTooLong}", "ng-bind-html" => "ctrl.noteStatus"}
 
@@ -23,7 +23,7 @@
        "spellcheck" => "false", "ng-disabled" => "ctrl.note.locked"}
 
   .sn-component{"ng-if" => "ctrl.note"}
-    .sk-app-bar.no-edges
+    .sk-app-bar.no-edges#editor-menu-bar
       .left
         .sk-app-bar-item{"ng-click" => "ctrl.toggleMenu('showMenu')", "ng-class" => "{'selected' : ctrl.showMenu}", "click-outside" => "ctrl.showMenu = false;", "is-open" => "ctrl.showMenu"}
           .sk-label Options