rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

editor-menu-bar id

Browse Source
This commit is contained in:
Mo Bitar
2018-12-13 01:38:22 -06:00
parent 7cba67ce69
commit 9200055616
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/editor.js
View File

@@ -516,7 +516,7 @@ angular.module('app')
this.loadPreferences = function() { this.loadPreferences = function() {
this.monospaceFont = authManager.getUserPrefValue("monospaceFont", "monospace"); this.monospaceFont = authManager.getUserPrefValue("monospaceFont", "monospace");
this.spellcheck = authManager.getUserPrefValue("spellcheck", true); this.spellcheck = authManager.getUserPrefValue("spellcheck", true);
this.marginResizersEnabled = authManager.getUserPrefValue("marginResizersEnabled", false); this.marginResizersEnabled = authManager.getUserPrefValue("marginResizersEnabled", true);
if(!document.getElementById("editor-content")) { if(!document.getElementById("editor-content")) {
// Elements have not yet loaded due to ng-if around wrapper // Elements have not yet loaded due to ng-if around wrapper

13
app/assets/javascripts/app/services/componentManager.js
View File

@@ -33,7 +33,7 @@ class ComponentManager {
desktopManager.registerUpdateObserver((component) => { desktopManager.registerUpdateObserver((component) => {
// Reload theme if active // Reload theme if active
if(component.active && component.isTheme()) { if(component.active && component.isTheme()) {
this.postActiveThemeToAllComponents(); this.postActiveThemesToAllComponents();
} }
}) })
@@ -147,13 +147,14 @@ class ComponentManager {
}); });
} }
postActiveThemeToAllComponents() { postActiveThemesToAllComponents() {
for(var component of this.components) { for(var component of this.components) {
// Skip over components that are themes themselves, // Skip over components that are themes themselves,
// or components that are not active, or components that don't have a window // or components that are not active, or components that don't have a window
if(component.isTheme() || !component.active || !component.window) { if(component.isTheme() || !component.active || !component.window) {
continue; continue;
} }
this.postActiveThemesToComponent(component); this.postActiveThemesToComponent(component);
} }
} }
@@ -862,7 +863,7 @@ class ComponentManager {
} }
if(component.area == "themes") { if(component.area == "themes") {
this.postActiveThemeToAllComponents(); this.postActiveThemesToAllComponents();
} }
} }
@@ -895,7 +896,7 @@ class ComponentManager {
}) })
if(component.area == "themes") { if(component.area == "themes") {
this.postActiveThemeToAllComponents(); this.postActiveThemesToAllComponents();
} }
} }
@@ -922,7 +923,7 @@ class ComponentManager {
}) })
if(component.area == "themes") { if(component.area == "themes") {
this.postActiveThemeToAllComponents(); this.postActiveThemesToAllComponents();
} }
// //
@@ -944,7 +945,7 @@ class ComponentManager {
} }
if(component.area == "themes") { if(component.area == "themes") {
this.postActiveThemeToAllComponents(); this.postActiveThemesToAllComponents();
} }
}) })
} }

6
app/assets/templates/editor.html.haml
View File

@@ -10,8 +10,8 @@
#editor-title-bar.section-title-bar{"ng-show" => "ctrl.note && !ctrl.note.errorDecrypting", "ng-class" => "{'locked' : ctrl.note.locked }"} #editor-title-bar.section-title-bar{"ng-show" => "ctrl.note && !ctrl.note.errorDecrypting", "ng-class" => "{'locked' : ctrl.note.locked }"}
.title .title
%input.input#note-title-editor{"ng-model" => "ctrl.note.title", "ng-keyup" => "$event.keyCode == 13 && ctrl.saveTitle($event)", %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()", "ng-change" => "ctrl.nameChanged()", "ng-focus" => "ctrl.onNameFocus()", "ng-blur" => "ctrl.onNameBlur()",
"select-on-click" => "true", "ng-disabled" => "ctrl.note.locked"} "select-on-click" => "true", "ng-disabled" => "ctrl.note.locked"}
#save-status{"ng-class" => "{'warning bold': ctrl.syncTakingTooLong}", "ng-bind-html" => "ctrl.noteStatus"} #save-status{"ng-class" => "{'warning bold': ctrl.syncTakingTooLong}", "ng-bind-html" => "ctrl.noteStatus"}
@@ -23,7 +23,7 @@
"spellcheck" => "false", "ng-disabled" => "ctrl.note.locked"} "spellcheck" => "false", "ng-disabled" => "ctrl.note.locked"}
.sn-component{"ng-if" => "ctrl.note"} .sn-component{"ng-if" => "ctrl.note"}
.sk-app-bar.no-edges .sk-app-bar.no-edges#editor-menu-bar
.left .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-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 .sk-label Options