From e4257b425b474596ae7952ca05177b9f5dd525d0 Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Sun, 10 Feb 2019 17:47:43 -0600 Subject: [PATCH] Note about spellcheck performance --- app/assets/javascripts/app/controllers/editor.js | 1 + app/assets/templates/directives/sync-resolution-menu.html.haml | 2 +- app/assets/templates/editor.html.haml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/controllers/editor.js b/app/assets/javascripts/app/controllers/editor.js index ed7975894..6c408aa79 100644 --- a/app/assets/javascripts/app/controllers/editor.js +++ b/app/assets/javascripts/app/controllers/editor.js @@ -28,6 +28,7 @@ angular.module('app') this.spellcheck = true; this.componentManager = componentManager; this.componentStack = []; + this.isDesktop = isDesktopApplication(); $rootScope.$on("sync:taking-too-long", function(){ this.syncTakingTooLong = true; diff --git a/app/assets/templates/directives/sync-resolution-menu.html.haml b/app/assets/templates/directives/sync-resolution-menu.html.haml index dc502ee27..2eb3b7a15 100644 --- a/app/assets/templates/directives/sync-resolution-menu.html.haml +++ b/app/assets/templates/directives/sync-resolution-menu.html.haml @@ -11,7 +11,7 @@ We've detected that the data on the server may not match the data in the current application session. We will attempt to reconcile changes by downloading all data from the server. No existing data will be overwritten. If the local contents of an item differ from what the server has, - we'll create a conflicted copy of it. + a conflicted copy will be created. .sk-panel-section{"ng-if" => "!status.backupFinished"} .sk-panel-row diff --git a/app/assets/templates/editor.html.haml b/app/assets/templates/editor.html.haml index da8df3bea..307545866 100644 --- a/app/assets/templates/editor.html.haml +++ b/app/assets/templates/editor.html.haml @@ -55,7 +55,7 @@ "desc" => "'Toggles the font style for the default editor'", "subtitle" => "ctrl.selectedEditor ? 'Not available with editor extensions' : null", "disabled" => "ctrl.selectedEditor"} %menu-row{"label" => "'Spellcheck'", "circle" => "ctrl.spellcheck ? 'success' : 'neutral'", "action" => "ctrl.selectedMenuItem(true); ctrl.toggleKey('spellcheck')", - "desc" => "'Toggles spellcheck for the default editor'", "subtitle" => "ctrl.selectedEditor ? 'Not available with editor extensions' : null", "disabled" => "ctrl.selectedEditor"} + "desc" => "'Toggles spellcheck for the default editor'", "subtitle" => "ctrl.selectedEditor ? 'Not available with editor extensions' : (ctrl.isDesktop ? 'May degrade editor performance' : null)", "disabled" => "ctrl.selectedEditor"} %menu-row{"label" => "'Margin Resizers'", "circle" => "ctrl.marginResizersEnabled ? 'success' : 'neutral'", "action" => "ctrl.selectedMenuItem(true); ctrl.toggleKey('marginResizersEnabled')", "desc" => "'Allows for editor left and right margins to be resized'", "faded" => "!ctrl.marginResizersEnabled"}