From 435d44afff742a1fdea3ad3c4511cf80892635b1 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Sun, 4 Jul 2021 13:37:07 +0530 Subject: Fixed issue with not being able to add new service. --- src/components/services/content/ServiceView.js | 4 +- src/config.js | 2 + src/containers/settings/RecipesScreen.js | 5 +- src/features/webControls/constants.js | 1 - src/i18n/locales/defaultMessages.json | 296 ++++++++++++------------- src/i18n/messages/src/lib/Menu.json | 296 ++++++++++++------------- src/lib/Menu.js | 7 +- 7 files changed, 305 insertions(+), 306 deletions(-) delete mode 100644 src/features/webControls/constants.js diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index 3c0fed32b..17d2db5a0 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js @@ -13,7 +13,7 @@ import ServiceDisabled from './ServiceDisabled'; import ServiceWebview from './ServiceWebview'; import SettingsStore from '../../../stores/SettingsStore'; import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen'; -import { CUSTOM_WEBSITE_ID } from '../../../features/webControls/constants'; +import { CUSTOM_WEBSITE_RECIPE_ID } from '../../../config'; export default @inject('stores', 'actions') @observer class ServiceView extends Component { static propTypes = { @@ -90,7 +90,7 @@ export default @inject('stores', 'actions') @observer class ServiceView extends navigationBarBehaviour, } = stores.settings.app; - const showNavBar = navigationBarBehaviour === 'always' || (navigationBarBehaviour === 'custom' && service.recipe.id === CUSTOM_WEBSITE_ID); + const showNavBar = navigationBarBehaviour === 'always' || (navigationBarBehaviour === 'custom' && service.recipe.id === CUSTOM_WEBSITE_RECIPE_ID); const webviewClasses = classnames({ services__webview: true, diff --git a/src/config.js b/src/config.js index 089ec1a8d..7762a8cae 100644 --- a/src/config.js +++ b/src/config.js @@ -197,3 +197,5 @@ export const TODOS_MIN_WIDTH = 200; export const DEFAULT_TODOS_VISIBLE = true; export const DEFAULT_IS_FEATURE_ENABLED_BY_USER = true; export const TODOS_PARTITION_ID = 'persist:todos'; + +export const CUSTOM_WEBSITE_RECIPE_ID = 'franz-custom-website'; diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js index 117f62ea8..f12f67b1f 100644 --- a/src/containers/settings/RecipesScreen.js +++ b/src/containers/settings/RecipesScreen.js @@ -14,12 +14,11 @@ import UserStore from '../../stores/UserStore'; import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard'; import ErrorBoundary from '../../components/util/ErrorBoundary'; -import { FRANZ_DEV_DOCS } from '../../config'; +import { CUSTOM_WEBSITE_RECIPE_ID, FRANZ_DEV_DOCS } from '../../config'; import { RECIPES_PATH } from '../../environment'; import { communityRecipesStore } from '../../features/communityRecipes'; import RecipePreview from '../../models/RecipePreview'; import AppStore from '../../stores/AppStore'; -import CUSTOM_WEBSITE_ID from '../../features/webControls/constants'; export default @inject('stores', 'actions') @observer class RecipesScreen extends Component { static propTypes = { @@ -140,7 +139,7 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend ), ]) : recipeFilter; - const customWebsiteRecipe = recipePreviews.all.find(service => service.id === CUSTOM_WEBSITE_ID); + const customWebsiteRecipe = recipePreviews.all.find(service => service.id === CUSTOM_WEBSITE_RECIPE_ID); const isLoading = recipePreviews.featuredRecipePreviewsRequest.isExecuting || recipePreviews.allRecipePreviewsRequest.isExecuting diff --git a/src/features/webControls/constants.js b/src/features/webControls/constants.js deleted file mode 100644 index 270a3568e..000000000 --- a/src/features/webControls/constants.js +++ /dev/null @@ -1 +0,0 @@ -export const CUSTOM_WEBSITE_ID = 'franz-custom-website'; diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 4ee96822e..2500d6b3c 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -7451,962 +7451,962 @@ "defaultMessage": "!!!Edit", "end": { "column": 3, - "line": 27 + "line": 26 }, "file": "src/lib/Menu.js", "id": "menu.edit", "start": { "column": 8, - "line": 24 + "line": 23 } }, { "defaultMessage": "!!!Undo", "end": { "column": 3, - "line": 31 + "line": 30 }, "file": "src/lib/Menu.js", "id": "menu.edit.undo", "start": { "column": 8, - "line": 28 + "line": 27 } }, { "defaultMessage": "!!!Redo", "end": { "column": 3, - "line": 35 + "line": 34 }, "file": "src/lib/Menu.js", "id": "menu.edit.redo", "start": { "column": 8, - "line": 32 + "line": 31 } }, { "defaultMessage": "!!!Cut", "end": { "column": 3, - "line": 39 + "line": 38 }, "file": "src/lib/Menu.js", "id": "menu.edit.cut", "start": { "column": 7, - "line": 36 + "line": 35 } }, { "defaultMessage": "!!!Copy", "end": { "column": 3, - "line": 43 + "line": 42 }, "file": "src/lib/Menu.js", "id": "menu.edit.copy", "start": { "column": 8, - "line": 40 + "line": 39 } }, { "defaultMessage": "!!!Paste", "end": { "column": 3, - "line": 47 + "line": 46 }, "file": "src/lib/Menu.js", "id": "menu.edit.paste", "start": { "column": 9, - "line": 44 + "line": 43 } }, { "defaultMessage": "!!!Paste And Match Style", "end": { "column": 3, - "line": 51 + "line": 50 }, "file": "src/lib/Menu.js", "id": "menu.edit.pasteAndMatchStyle", "start": { "column": 22, - "line": 48 + "line": 47 } }, { "defaultMessage": "!!!Delete", "end": { "column": 3, - "line": 55 + "line": 54 }, "file": "src/lib/Menu.js", "id": "menu.edit.delete", "start": { "column": 10, - "line": 52 + "line": 51 } }, { "defaultMessage": "!!!Select All", "end": { "column": 3, - "line": 59 + "line": 58 }, "file": "src/lib/Menu.js", "id": "menu.edit.selectAll", "start": { "column": 13, - "line": 56 + "line": 55 } }, { "defaultMessage": "!!!Find in Page", "end": { "column": 3, - "line": 63 + "line": 62 }, "file": "src/lib/Menu.js", "id": "menu.edit.findInPage", "start": { "column": 14, - "line": 60 + "line": 59 } }, { "defaultMessage": "!!!Speech", "end": { "column": 3, - "line": 67 + "line": 66 }, "file": "src/lib/Menu.js", "id": "menu.edit.speech", "start": { "column": 10, - "line": 64 + "line": 63 } }, { "defaultMessage": "!!!Start Speaking", "end": { "column": 3, - "line": 71 + "line": 70 }, "file": "src/lib/Menu.js", "id": "menu.edit.startSpeaking", "start": { "column": 17, - "line": 68 + "line": 67 } }, { "defaultMessage": "!!!Stop Speaking", "end": { "column": 3, - "line": 75 + "line": 74 }, "file": "src/lib/Menu.js", "id": "menu.edit.stopSpeaking", "start": { "column": 16, - "line": 72 + "line": 71 } }, { "defaultMessage": "!!!Start Dictation", "end": { "column": 3, - "line": 79 + "line": 78 }, "file": "src/lib/Menu.js", "id": "menu.edit.startDictation", "start": { "column": 18, - "line": 76 + "line": 75 } }, { "defaultMessage": "!!!Emoji & Symbols", "end": { "column": 3, - "line": 83 + "line": 82 }, "file": "src/lib/Menu.js", "id": "menu.edit.emojiSymbols", "start": { "column": 16, - "line": 80 + "line": 79 } }, { "defaultMessage": "!!!Open Quick Switch", "end": { "column": 3, - "line": 87 + "line": 86 }, "file": "src/lib/Menu.js", "id": "menu.view.openQuickSwitch", "start": { "column": 19, - "line": 84 + "line": 83 } }, { "defaultMessage": "!!!Back", "end": { "column": 3, - "line": 91 + "line": 90 }, "file": "src/lib/Menu.js", "id": "menu.view.back", "start": { "column": 8, - "line": 88 + "line": 87 } }, { "defaultMessage": "!!!Forward", "end": { "column": 3, - "line": 95 + "line": 94 }, "file": "src/lib/Menu.js", "id": "menu.view.forward", "start": { "column": 11, - "line": 92 + "line": 91 } }, { "defaultMessage": "!!!Actual Size", "end": { "column": 3, - "line": 99 + "line": 98 }, "file": "src/lib/Menu.js", "id": "menu.view.resetZoom", "start": { "column": 13, - "line": 96 + "line": 95 } }, { "defaultMessage": "!!!Zoom In", "end": { "column": 3, - "line": 103 + "line": 102 }, "file": "src/lib/Menu.js", "id": "menu.view.zoomIn", "start": { "column": 10, - "line": 100 + "line": 99 } }, { "defaultMessage": "!!!Zoom Out", "end": { "column": 3, - "line": 107 + "line": 106 }, "file": "src/lib/Menu.js", "id": "menu.view.zoomOut", "start": { "column": 11, - "line": 104 + "line": 103 } }, { "defaultMessage": "!!!Enter Full Screen", "end": { "column": 3, - "line": 111 + "line": 110 }, "file": "src/lib/Menu.js", "id": "menu.view.enterFullScreen", "start": { "column": 19, - "line": 108 + "line": 107 } }, { "defaultMessage": "!!!Exit Full Screen", "end": { "column": 3, - "line": 115 + "line": 114 }, "file": "src/lib/Menu.js", "id": "menu.view.exitFullScreen", "start": { "column": 18, - "line": 112 + "line": 111 } }, { "defaultMessage": "!!!Toggle Full Screen", "end": { "column": 3, - "line": 119 + "line": 118 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleFullScreen", "start": { "column": 20, - "line": 116 + "line": 115 } }, { "defaultMessage": "!!!Toggle Dark Mode", "end": { "column": 3, - "line": 123 + "line": 122 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleDarkMode", "start": { "column": 18, - "line": 120 + "line": 119 } }, { "defaultMessage": "!!!Toggle Developer Tools", "end": { "column": 3, - "line": 127 + "line": 126 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleDevTools", "start": { "column": 18, - "line": 124 + "line": 123 } }, { "defaultMessage": "!!!Toggle Todos Developer Tools", "end": { "column": 3, - "line": 131 + "line": 130 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleTodosDevTools", "start": { "column": 23, - "line": 128 + "line": 127 } }, { "defaultMessage": "!!!Toggle Service Developer Tools", "end": { "column": 3, - "line": 135 + "line": 134 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleServiceDevTools", "start": { "column": 25, - "line": 132 + "line": 131 } }, { "defaultMessage": "!!!Reload Service", "end": { "column": 3, - "line": 139 + "line": 138 }, "file": "src/lib/Menu.js", "id": "menu.view.reloadService", "start": { "column": 17, - "line": 136 + "line": 135 } }, { "defaultMessage": "!!!Reload Ferdi", "end": { "column": 3, - "line": 143 + "line": 142 }, "file": "src/lib/Menu.js", "id": "menu.view.reloadFranz", "start": { "column": 15, - "line": 140 + "line": 139 } }, { "defaultMessage": "!!!Lock Ferdi", "end": { "column": 3, - "line": 147 + "line": 146 }, "file": "src/lib/Menu.js", "id": "menu.view.lockFerdi", "start": { "column": 13, - "line": 144 + "line": 143 } }, { "defaultMessage": "!!!Reload ToDos", "end": { "column": 3, - "line": 151 + "line": 150 }, "file": "src/lib/Menu.js", "id": "menu.view.reloadTodos", "start": { "column": 15, - "line": 148 + "line": 147 } }, { "defaultMessage": "!!!Minimize", "end": { "column": 3, - "line": 155 + "line": 154 }, "file": "src/lib/Menu.js", "id": "menu.window.minimize", "start": { "column": 12, - "line": 152 + "line": 151 } }, { "defaultMessage": "!!!Close", "end": { "column": 3, - "line": 159 + "line": 158 }, "file": "src/lib/Menu.js", "id": "menu.window.close", "start": { "column": 9, - "line": 156 + "line": 155 } }, { "defaultMessage": "!!!Learn More", "end": { "column": 3, - "line": 163 + "line": 162 }, "file": "src/lib/Menu.js", "id": "menu.help.learnMore", "start": { "column": 13, - "line": 160 + "line": 159 } }, { "defaultMessage": "!!!Changelog", "end": { "column": 3, - "line": 167 + "line": 166 }, "file": "src/lib/Menu.js", "id": "menu.help.changelog", "start": { "column": 13, - "line": 164 + "line": 163 } }, { "defaultMessage": "!!!Support", "end": { "column": 3, - "line": 171 + "line": 170 }, "file": "src/lib/Menu.js", "id": "menu.help.support", "start": { "column": 11, - "line": 168 + "line": 167 } }, { "defaultMessage": "!!!Copy Debug Information", "end": { "column": 3, - "line": 175 + "line": 174 }, "file": "src/lib/Menu.js", "id": "menu.help.debugInfo", "start": { "column": 13, - "line": 172 + "line": 171 } }, { "defaultMessage": "!!!Publish Debug Information", "end": { "column": 3, - "line": 179 + "line": 178 }, "file": "src/lib/Menu.js", "id": "menu.help.publishDebugInfo", "start": { "column": 20, - "line": 176 + "line": 175 } }, { "defaultMessage": "!!!Ferdi Debug Information", "end": { "column": 3, - "line": 183 + "line": 182 }, "file": "src/lib/Menu.js", "id": "menu.help.debugInfoCopiedHeadline", "start": { "column": 27, - "line": 180 + "line": 179 } }, { "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.", "end": { "column": 3, - "line": 187 + "line": 186 }, "file": "src/lib/Menu.js", "id": "menu.help.debugInfoCopiedBody", "start": { "column": 23, - "line": 184 + "line": 183 } }, { "defaultMessage": "!!!Unlock with Touch ID", "end": { "column": 3, - "line": 191 + "line": 190 }, "file": "src/lib/Menu.js", "id": "locked.touchId", "start": { "column": 11, - "line": 188 + "line": 187 } }, { "defaultMessage": "!!!unlock via Touch ID", "end": { "column": 3, - "line": 195 + "line": 194 }, "file": "src/lib/Menu.js", "id": "locked.touchIdPrompt", "start": { "column": 17, - "line": 192 + "line": 191 } }, { "defaultMessage": "!!!Terms of Service", "end": { "column": 3, - "line": 199 + "line": 198 }, "file": "src/lib/Menu.js", "id": "menu.help.tos", "start": { "column": 7, - "line": 196 + "line": 195 } }, { "defaultMessage": "!!!Privacy Statement", "end": { "column": 3, - "line": 203 + "line": 202 }, "file": "src/lib/Menu.js", "id": "menu.help.privacy", "start": { "column": 11, - "line": 200 + "line": 199 } }, { "defaultMessage": "!!!File", "end": { "column": 3, - "line": 207 + "line": 206 }, "file": "src/lib/Menu.js", "id": "menu.file", "start": { "column": 8, - "line": 204 + "line": 203 } }, { "defaultMessage": "!!!View", "end": { "column": 3, - "line": 211 + "line": 210 }, "file": "src/lib/Menu.js", "id": "menu.view", "start": { "column": 8, - "line": 208 + "line": 207 } }, { "defaultMessage": "!!!Services", "end": { "column": 3, - "line": 215 + "line": 214 }, "file": "src/lib/Menu.js", "id": "menu.services", "start": { "column": 12, - "line": 212 + "line": 211 } }, { "defaultMessage": "!!!Window", "end": { "column": 3, - "line": 219 + "line": 218 }, "file": "src/lib/Menu.js", "id": "menu.window", "start": { "column": 10, - "line": 216 + "line": 215 } }, { "defaultMessage": "!!!Help", "end": { "column": 3, - "line": 223 + "line": 222 }, "file": "src/lib/Menu.js", "id": "menu.help", "start": { "column": 8, - "line": 220 + "line": 219 } }, { "defaultMessage": "!!!About Ferdi", "end": { "column": 3, - "line": 227 + "line": 226 }, "file": "src/lib/Menu.js", "id": "menu.app.about", "start": { "column": 9, - "line": 224 + "line": 223 } }, { "defaultMessage": "!!!What's new?", "end": { "column": 3, - "line": 231 + "line": 230 }, "file": "src/lib/Menu.js", "id": "menu.app.announcement", "start": { "column": 16, - "line": 228 + "line": 227 } }, { "defaultMessage": "!!!Settings", "end": { "column": 3, - "line": 235 + "line": 234 }, "file": "src/lib/Menu.js", "id": "menu.app.settings", "start": { "column": 12, - "line": 232 + "line": 231 } }, { "defaultMessage": "!!!Check for updates", "end": { "column": 3, - "line": 239 + "line": 238 }, "file": "src/lib/Menu.js", "id": "menu.app.checkForUpdates", "start": { "column": 19, - "line": 236 + "line": 235 } }, { "defaultMessage": "!!!Hide", "end": { "column": 3, - "line": 243 + "line": 242 }, "file": "src/lib/Menu.js", "id": "menu.app.hide", "start": { "column": 8, - "line": 240 + "line": 239 } }, { "defaultMessage": "!!!Hide Others", "end": { "column": 3, - "line": 247 + "line": 246 }, "file": "src/lib/Menu.js", "id": "menu.app.hideOthers", "start": { "column": 14, - "line": 244 + "line": 243 } }, { "defaultMessage": "!!!Unhide", "end": { "column": 3, - "line": 251 + "line": 250 }, "file": "src/lib/Menu.js", "id": "menu.app.unhide", "start": { "column": 10, - "line": 248 + "line": 247 } }, { "defaultMessage": "!!!Auto-hide menu bar", "end": { "column": 3, - "line": 255 + "line": 254 }, "file": "src/lib/Menu.js", "id": "menu.app.autohideMenuBar", "start": { "column": 19, - "line": 252 + "line": 251 } }, { "defaultMessage": "!!!Quit", "end": { "column": 3, - "line": 259 + "line": 258 }, "file": "src/lib/Menu.js", "id": "menu.app.quit", "start": { "column": 8, - "line": 256 + "line": 255 } }, { "defaultMessage": "!!!Add New Service...", "end": { "column": 3, - "line": 263 + "line": 262 }, "file": "src/lib/Menu.js", "id": "menu.services.addNewService", "start": { "column": 17, - "line": 260 + "line": 259 } }, { "defaultMessage": "!!!Add New Workspace...", "end": { "column": 3, - "line": 267 + "line": 266 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.addNewWorkspace", "start": { "column": 19, - "line": 264 + "line": 263 } }, { "defaultMessage": "!!!Open workspace drawer", "end": { "column": 3, - "line": 271 + "line": 270 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.openWorkspaceDrawer", "start": { "column": 23, - "line": 268 + "line": 267 } }, { "defaultMessage": "!!!Close workspace drawer", "end": { "column": 3, - "line": 275 + "line": 274 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.closeWorkspaceDrawer", "start": { "column": 24, - "line": 272 + "line": 271 } }, { "defaultMessage": "!!!Activate next service...", "end": { "column": 3, - "line": 279 + "line": 278 }, "file": "src/lib/Menu.js", "id": "menu.services.setNextServiceActive", "start": { "column": 23, - "line": 276 + "line": 275 } }, { "defaultMessage": "!!!Activate previous service...", "end": { "column": 3, - "line": 283 + "line": 282 }, "file": "src/lib/Menu.js", "id": "menu.services.activatePreviousService", "start": { "column": 27, - "line": 280 + "line": 279 } }, { "defaultMessage": "!!!Disable notifications & audio", "end": { "column": 3, - "line": 287 + "line": 286 }, "file": "src/lib/Menu.js", "id": "sidebar.muteApp", "start": { "column": 11, - "line": 284 + "line": 283 } }, { "defaultMessage": "!!!Enable notifications & audio", "end": { "column": 3, - "line": 291 + "line": 290 }, "file": "src/lib/Menu.js", "id": "sidebar.unmuteApp", "start": { "column": 13, - "line": 288 + "line": 287 } }, { "defaultMessage": "!!!Workspaces", "end": { "column": 3, - "line": 295 + "line": 294 }, "file": "src/lib/Menu.js", "id": "menu.workspaces", "start": { "column": 14, - "line": 292 + "line": 291 } }, { "defaultMessage": "!!!Default", "end": { "column": 3, - "line": 299 + "line": 298 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.defaultWorkspace", "start": { "column": 20, - "line": 296 + "line": 295 } }, { "defaultMessage": "!!!Todos", "end": { "column": 3, - "line": 303 + "line": 302 }, "file": "src/lib/Menu.js", "id": "menu.todos", "start": { "column": 9, - "line": 300 + "line": 299 } }, { "defaultMessage": "!!!Open Todos drawer", "end": { "column": 3, - "line": 307 + "line": 306 }, "file": "src/lib/Menu.js", "id": "menu.Todoss.openTodosDrawer", "start": { "column": 19, - "line": 304 + "line": 303 } }, { "defaultMessage": "!!!Close Todos drawer", "end": { "column": 3, - "line": 311 + "line": 310 }, "file": "src/lib/Menu.js", "id": "menu.Todoss.closeTodosDrawer", "start": { "column": 20, - "line": 308 + "line": 307 } }, { "defaultMessage": "!!!Enable Todos", "end": { "column": 3, - "line": 315 + "line": 314 }, "file": "src/lib/Menu.js", "id": "menu.todos.enableTodos", "start": { "column": 15, - "line": 312 + "line": 311 } }, { "defaultMessage": "!!!Home", "end": { "column": 3, - "line": 319 + "line": 318 }, "file": "src/lib/Menu.js", "id": "menu.services.goHome", "start": { "column": 17, - "line": 316 + "line": 315 } } ], diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json index d5a8d5923..22929e947 100644 --- a/src/i18n/messages/src/lib/Menu.json +++ b/src/i18n/messages/src/lib/Menu.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Edit", "file": "src/lib/Menu.js", "start": { - "line": 24, + "line": 23, "column": 8 }, "end": { - "line": 27, + "line": 26, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!Undo", "file": "src/lib/Menu.js", "start": { - "line": 28, + "line": 27, "column": 8 }, "end": { - "line": 31, + "line": 30, "column": 3 } }, @@ -30,11 +30,11 @@ "defaultMessage": "!!!Redo", "file": "src/lib/Menu.js", "start": { - "line": 32, + "line": 31, "column": 8 }, "end": { - "line": 35, + "line": 34, "column": 3 } }, @@ -43,11 +43,11 @@ "defaultMessage": "!!!Cut", "file": "src/lib/Menu.js", "start": { - "line": 36, + "line": 35, "column": 7 }, "end": { - "line": 39, + "line": 38, "column": 3 } }, @@ -56,11 +56,11 @@ "defaultMessage": "!!!Copy", "file": "src/lib/Menu.js", "start": { - "line": 40, + "line": 39, "column": 8 }, "end": { - "line": 43, + "line": 42, "column": 3 } }, @@ -69,11 +69,11 @@ "defaultMessage": "!!!Paste", "file": "src/lib/Menu.js", "start": { - "line": 44, + "line": 43, "column": 9 }, "end": { - "line": 47, + "line": 46, "column": 3 } }, @@ -82,11 +82,11 @@ "defaultMessage": "!!!Paste And Match Style", "file": "src/lib/Menu.js", "start": { - "line": 48, + "line": 47, "column": 22 }, "end": { - "line": 51, + "line": 50, "column": 3 } }, @@ -95,11 +95,11 @@ "defaultMessage": "!!!Delete", "file": "src/lib/Menu.js", "start": { - "line": 52, + "line": 51, "column": 10 }, "end": { - "line": 55, + "line": 54, "column": 3 } }, @@ -108,11 +108,11 @@ "defaultMessage": "!!!Select All", "file": "src/lib/Menu.js", "start": { - "line": 56, + "line": 55, "column": 13 }, "end": { - "line": 59, + "line": 58, "column": 3 } }, @@ -121,11 +121,11 @@ "defaultMessage": "!!!Find in Page", "file": "src/lib/Menu.js", "start": { - "line": 60, + "line": 59, "column": 14 }, "end": { - "line": 63, + "line": 62, "column": 3 } }, @@ -134,11 +134,11 @@ "defaultMessage": "!!!Speech", "file": "src/lib/Menu.js", "start": { - "line": 64, + "line": 63, "column": 10 }, "end": { - "line": 67, + "line": 66, "column": 3 } }, @@ -147,11 +147,11 @@ "defaultMessage": "!!!Start Speaking", "file": "src/lib/Menu.js", "start": { - "line": 68, + "line": 67, "column": 17 }, "end": { - "line": 71, + "line": 70, "column": 3 } }, @@ -160,11 +160,11 @@ "defaultMessage": "!!!Stop Speaking", "file": "src/lib/Menu.js", "start": { - "line": 72, + "line": 71, "column": 16 }, "end": { - "line": 75, + "line": 74, "column": 3 } }, @@ -173,11 +173,11 @@ "defaultMessage": "!!!Start Dictation", "file": "src/lib/Menu.js", "start": { - "line": 76, + "line": 75, "column": 18 }, "end": { - "line": 79, + "line": 78, "column": 3 } }, @@ -186,11 +186,11 @@ "defaultMessage": "!!!Emoji & Symbols", "file": "src/lib/Menu.js", "start": { - "line": 80, + "line": 79, "column": 16 }, "end": { - "line": 83, + "line": 82, "column": 3 } }, @@ -199,11 +199,11 @@ "defaultMessage": "!!!Open Quick Switch", "file": "src/lib/Menu.js", "start": { - "line": 84, + "line": 83, "column": 19 }, "end": { - "line": 87, + "line": 86, "column": 3 } }, @@ -212,11 +212,11 @@ "defaultMessage": "!!!Back", "file": "src/lib/Menu.js", "start": { - "line": 88, + "line": 87, "column": 8 }, "end": { - "line": 91, + "line": 90, "column": 3 } }, @@ -225,11 +225,11 @@ "defaultMessage": "!!!Forward", "file": "src/lib/Menu.js", "start": { - "line": 92, + "line": 91, "column": 11 }, "end": { - "line": 95, + "line": 94, "column": 3 } }, @@ -238,11 +238,11 @@ "defaultMessage": "!!!Actual Size", "file": "src/lib/Menu.js", "start": { - "line": 96, + "line": 95, "column": 13 }, "end": { - "line": 99, + "line": 98, "column": 3 } }, @@ -251,11 +251,11 @@ "defaultMessage": "!!!Zoom In", "file": "src/lib/Menu.js", "start": { - "line": 100, + "line": 99, "column": 10 }, "end": { - "line": 103, + "line": 102, "column": 3 } }, @@ -264,11 +264,11 @@ "defaultMessage": "!!!Zoom Out", "file": "src/lib/Menu.js", "start": { - "line": 104, + "line": 103, "column": 11 }, "end": { - "line": 107, + "line": 106, "column": 3 } }, @@ -277,11 +277,11 @@ "defaultMessage": "!!!Enter Full Screen", "file": "src/lib/Menu.js", "start": { - "line": 108, + "line": 107, "column": 19 }, "end": { - "line": 111, + "line": 110, "column": 3 } }, @@ -290,11 +290,11 @@ "defaultMessage": "!!!Exit Full Screen", "file": "src/lib/Menu.js", "start": { - "line": 112, + "line": 111, "column": 18 }, "end": { - "line": 115, + "line": 114, "column": 3 } }, @@ -303,11 +303,11 @@ "defaultMessage": "!!!Toggle Full Screen", "file": "src/lib/Menu.js", "start": { - "line": 116, + "line": 115, "column": 20 }, "end": { - "line": 119, + "line": 118, "column": 3 } }, @@ -316,11 +316,11 @@ "defaultMessage": "!!!Toggle Dark Mode", "file": "src/lib/Menu.js", "start": { - "line": 120, + "line": 119, "column": 18 }, "end": { - "line": 123, + "line": 122, "column": 3 } }, @@ -329,11 +329,11 @@ "defaultMessage": "!!!Toggle Developer Tools", "file": "src/lib/Menu.js", "start": { - "line": 124, + "line": 123, "column": 18 }, "end": { - "line": 127, + "line": 126, "column": 3 } }, @@ -342,11 +342,11 @@ "defaultMessage": "!!!Toggle Todos Developer Tools", "file": "src/lib/Menu.js", "start": { - "line": 128, + "line": 127, "column": 23 }, "end": { - "line": 131, + "line": 130, "column": 3 } }, @@ -355,11 +355,11 @@ "defaultMessage": "!!!Toggle Service Developer Tools", "file": "src/lib/Menu.js", "start": { - "line": 132, + "line": 131, "column": 25 }, "end": { - "line": 135, + "line": 134, "column": 3 } }, @@ -368,11 +368,11 @@ "defaultMessage": "!!!Reload Service", "file": "src/lib/Menu.js", "start": { - "line": 136, + "line": 135, "column": 17 }, "end": { - "line": 139, + "line": 138, "column": 3 } }, @@ -381,11 +381,11 @@ "defaultMessage": "!!!Reload Ferdi", "file": "src/lib/Menu.js", "start": { - "line": 140, + "line": 139, "column": 15 }, "end": { - "line": 143, + "line": 142, "column": 3 } }, @@ -394,11 +394,11 @@ "defaultMessage": "!!!Lock Ferdi", "file": "src/lib/Menu.js", "start": { - "line": 144, + "line": 143, "column": 13 }, "end": { - "line": 147, + "line": 146, "column": 3 } }, @@ -407,11 +407,11 @@ "defaultMessage": "!!!Reload ToDos", "file": "src/lib/Menu.js", "start": { - "line": 148, + "line": 147, "column": 15 }, "end": { - "line": 151, + "line": 150, "column": 3 } }, @@ -420,11 +420,11 @@ "defaultMessage": "!!!Minimize", "file": "src/lib/Menu.js", "start": { - "line": 152, + "line": 151, "column": 12 }, "end": { - "line": 155, + "line": 154, "column": 3 } }, @@ -433,11 +433,11 @@ "defaultMessage": "!!!Close", "file": "src/lib/Menu.js", "start": { - "line": 156, + "line": 155, "column": 9 }, "end": { - "line": 159, + "line": 158, "column": 3 } }, @@ -446,11 +446,11 @@ "defaultMessage": "!!!Learn More", "file": "src/lib/Menu.js", "start": { - "line": 160, + "line": 159, "column": 13 }, "end": { - "line": 163, + "line": 162, "column": 3 } }, @@ -459,11 +459,11 @@ "defaultMessage": "!!!Changelog", "file": "src/lib/Menu.js", "start": { - "line": 164, + "line": 163, "column": 13 }, "end": { - "line": 167, + "line": 166, "column": 3 } }, @@ -472,11 +472,11 @@ "defaultMessage": "!!!Support", "file": "src/lib/Menu.js", "start": { - "line": 168, + "line": 167, "column": 11 }, "end": { - "line": 171, + "line": 170, "column": 3 } }, @@ -485,11 +485,11 @@ "defaultMessage": "!!!Copy Debug Information", "file": "src/lib/Menu.js", "start": { - "line": 172, + "line": 171, "column": 13 }, "end": { - "line": 175, + "line": 174, "column": 3 } }, @@ -498,11 +498,11 @@ "defaultMessage": "!!!Publish Debug Information", "file": "src/lib/Menu.js", "start": { - "line": 176, + "line": 175, "column": 20 }, "end": { - "line": 179, + "line": 178, "column": 3 } }, @@ -511,11 +511,11 @@ "defaultMessage": "!!!Ferdi Debug Information", "file": "src/lib/Menu.js", "start": { - "line": 180, + "line": 179, "column": 27 }, "end": { - "line": 183, + "line": 182, "column": 3 } }, @@ -524,11 +524,11 @@ "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.", "file": "src/lib/Menu.js", "start": { - "line": 184, + "line": 183, "column": 23 }, "end": { - "line": 187, + "line": 186, "column": 3 } }, @@ -537,11 +537,11 @@ "defaultMessage": "!!!Unlock with Touch ID", "file": "src/lib/Menu.js", "start": { - "line": 188, + "line": 187, "column": 11 }, "end": { - "line": 191, + "line": 190, "column": 3 } }, @@ -550,11 +550,11 @@ "defaultMessage": "!!!unlock via Touch ID", "file": "src/lib/Menu.js", "start": { - "line": 192, + "line": 191, "column": 17 }, "end": { - "line": 195, + "line": 194, "column": 3 } }, @@ -563,11 +563,11 @@ "defaultMessage": "!!!Terms of Service", "file": "src/lib/Menu.js", "start": { - "line": 196, + "line": 195, "column": 7 }, "end": { - "line": 199, + "line": 198, "column": 3 } }, @@ -576,11 +576,11 @@ "defaultMessage": "!!!Privacy Statement", "file": "src/lib/Menu.js", "start": { - "line": 200, + "line": 199, "column": 11 }, "end": { - "line": 203, + "line": 202, "column": 3 } }, @@ -589,11 +589,11 @@ "defaultMessage": "!!!File", "file": "src/lib/Menu.js", "start": { - "line": 204, + "line": 203, "column": 8 }, "end": { - "line": 207, + "line": 206, "column": 3 } }, @@ -602,11 +602,11 @@ "defaultMessage": "!!!View", "file": "src/lib/Menu.js", "start": { - "line": 208, + "line": 207, "column": 8 }, "end": { - "line": 211, + "line": 210, "column": 3 } }, @@ -615,11 +615,11 @@ "defaultMessage": "!!!Services", "file": "src/lib/Menu.js", "start": { - "line": 212, + "line": 211, "column": 12 }, "end": { - "line": 215, + "line": 214, "column": 3 } }, @@ -628,11 +628,11 @@ "defaultMessage": "!!!Window", "file": "src/lib/Menu.js", "start": { - "line": 216, + "line": 215, "column": 10 }, "end": { - "line": 219, + "line": 218, "column": 3 } }, @@ -641,11 +641,11 @@ "defaultMessage": "!!!Help", "file": "src/lib/Menu.js", "start": { - "line": 220, + "line": 219, "column": 8 }, "end": { - "line": 223, + "line": 222, "column": 3 } }, @@ -654,11 +654,11 @@ "defaultMessage": "!!!About Ferdi", "file": "src/lib/Menu.js", "start": { - "line": 224, + "line": 223, "column": 9 }, "end": { - "line": 227, + "line": 226, "column": 3 } }, @@ -667,11 +667,11 @@ "defaultMessage": "!!!What's new?", "file": "src/lib/Menu.js", "start": { - "line": 228, + "line": 227, "column": 16 }, "end": { - "line": 231, + "line": 230, "column": 3 } }, @@ -680,11 +680,11 @@ "defaultMessage": "!!!Settings", "file": "src/lib/Menu.js", "start": { - "line": 232, + "line": 231, "column": 12 }, "end": { - "line": 235, + "line": 234, "column": 3 } }, @@ -693,11 +693,11 @@ "defaultMessage": "!!!Check for updates", "file": "src/lib/Menu.js", "start": { - "line": 236, + "line": 235, "column": 19 }, "end": { - "line": 239, + "line": 238, "column": 3 } }, @@ -706,11 +706,11 @@ "defaultMessage": "!!!Hide", "file": "src/lib/Menu.js", "start": { - "line": 240, + "line": 239, "column": 8 }, "end": { - "line": 243, + "line": 242, "column": 3 } }, @@ -719,11 +719,11 @@ "defaultMessage": "!!!Hide Others", "file": "src/lib/Menu.js", "start": { - "line": 244, + "line": 243, "column": 14 }, "end": { - "line": 247, + "line": 246, "column": 3 } }, @@ -732,11 +732,11 @@ "defaultMessage": "!!!Unhide", "file": "src/lib/Menu.js", "start": { - "line": 248, + "line": 247, "column": 10 }, "end": { - "line": 251, + "line": 250, "column": 3 } }, @@ -745,11 +745,11 @@ "defaultMessage": "!!!Auto-hide menu bar", "file": "src/lib/Menu.js", "start": { - "line": 252, + "line": 251, "column": 19 }, "end": { - "line": 255, + "line": 254, "column": 3 } }, @@ -758,11 +758,11 @@ "defaultMessage": "!!!Quit", "file": "src/lib/Menu.js", "start": { - "line": 256, + "line": 255, "column": 8 }, "end": { - "line": 259, + "line": 258, "column": 3 } }, @@ -771,11 +771,11 @@ "defaultMessage": "!!!Add New Service...", "file": "src/lib/Menu.js", "start": { - "line": 260, + "line": 259, "column": 17 }, "end": { - "line": 263, + "line": 262, "column": 3 } }, @@ -784,11 +784,11 @@ "defaultMessage": "!!!Add New Workspace...", "file": "src/lib/Menu.js", "start": { - "line": 264, + "line": 263, "column": 19 }, "end": { - "line": 267, + "line": 266, "column": 3 } }, @@ -797,11 +797,11 @@ "defaultMessage": "!!!Open workspace drawer", "file": "src/lib/Menu.js", "start": { - "line": 268, + "line": 267, "column": 23 }, "end": { - "line": 271, + "line": 270, "column": 3 } }, @@ -810,11 +810,11 @@ "defaultMessage": "!!!Close workspace drawer", "file": "src/lib/Menu.js", "start": { - "line": 272, + "line": 271, "column": 24 }, "end": { - "line": 275, + "line": 274, "column": 3 } }, @@ -823,11 +823,11 @@ "defaultMessage": "!!!Activate next service...", "file": "src/lib/Menu.js", "start": { - "line": 276, + "line": 275, "column": 23 }, "end": { - "line": 279, + "line": 278, "column": 3 } }, @@ -836,11 +836,11 @@ "defaultMessage": "!!!Activate previous service...", "file": "src/lib/Menu.js", "start": { - "line": 280, + "line": 279, "column": 27 }, "end": { - "line": 283, + "line": 282, "column": 3 } }, @@ -849,11 +849,11 @@ "defaultMessage": "!!!Disable notifications & audio", "file": "src/lib/Menu.js", "start": { - "line": 284, + "line": 283, "column": 11 }, "end": { - "line": 287, + "line": 286, "column": 3 } }, @@ -862,11 +862,11 @@ "defaultMessage": "!!!Enable notifications & audio", "file": "src/lib/Menu.js", "start": { - "line": 288, + "line": 287, "column": 13 }, "end": { - "line": 291, + "line": 290, "column": 3 } }, @@ -875,11 +875,11 @@ "defaultMessage": "!!!Workspaces", "file": "src/lib/Menu.js", "start": { - "line": 292, + "line": 291, "column": 14 }, "end": { - "line": 295, + "line": 294, "column": 3 } }, @@ -888,11 +888,11 @@ "defaultMessage": "!!!Default", "file": "src/lib/Menu.js", "start": { - "line": 296, + "line": 295, "column": 20 }, "end": { - "line": 299, + "line": 298, "column": 3 } }, @@ -901,11 +901,11 @@ "defaultMessage": "!!!Todos", "file": "src/lib/Menu.js", "start": { - "line": 300, + "line": 299, "column": 9 }, "end": { - "line": 303, + "line": 302, "column": 3 } }, @@ -914,11 +914,11 @@ "defaultMessage": "!!!Open Todos drawer", "file": "src/lib/Menu.js", "start": { - "line": 304, + "line": 303, "column": 19 }, "end": { - "line": 307, + "line": 306, "column": 3 } }, @@ -927,11 +927,11 @@ "defaultMessage": "!!!Close Todos drawer", "file": "src/lib/Menu.js", "start": { - "line": 308, + "line": 307, "column": 20 }, "end": { - "line": 311, + "line": 310, "column": 3 } }, @@ -940,11 +940,11 @@ "defaultMessage": "!!!Enable Todos", "file": "src/lib/Menu.js", "start": { - "line": 312, + "line": 311, "column": 15 }, "end": { - "line": 315, + "line": 314, "column": 3 } }, @@ -953,11 +953,11 @@ "defaultMessage": "!!!Home", "file": "src/lib/Menu.js", "start": { - "line": 316, + "line": 315, "column": 17 }, "end": { - "line": 319, + "line": 318, "column": 3 } } diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 8118b4e26..d66fa009f 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -4,7 +4,7 @@ import { } from '@electron/remote'; import { autorun, observable } from 'mobx'; import { defineMessages } from 'react-intl'; -import { GITHUB_FERDI_URL, LIVE_API_FERDI_WEBSITE } from '../config'; +import { CUSTOM_WEBSITE_RECIPE_ID, GITHUB_FERDI_URL, LIVE_API_FERDI_WEBSITE } from '../config'; import { cmdKey, ctrlKey, isLinux, isMac, termsBase, } from '../environment'; @@ -12,7 +12,6 @@ import { announcementsStore } from '../features/announcements'; import { announcementActions } from '../features/announcements/actions'; import { todosStore } from '../features/todos'; import { todoActions } from '../features/todos/actions'; -import { CUSTOM_WEBSITE_ID } from '../features/webControls/constants'; import { workspaceActions } from '../features/workspaces/actions'; import { workspaceStore } from '../features/workspaces/index'; import * as buildInfo from '../buildInfo.json'; // eslint-disable-line import/no-unresolved @@ -884,7 +883,7 @@ export default class FranzMenu { click: () => { if (this.stores.user.isLoggedIn && this.stores.services.enabled.length > 0) { - if (this.stores.services.active.recipe.id === CUSTOM_WEBSITE_ID) { + if (this.stores.services.active.recipe.id === CUSTOM_WEBSITE_RECIPE_ID) { this.stores.services.active.webview.reload(); } else { this.actions.service.reloadActive(); @@ -1165,7 +1164,7 @@ export default class FranzMenu { }, }))); - if (services.active && services.active.recipe.id === CUSTOM_WEBSITE_ID) { + if (services.active && services.active.recipe.id === CUSTOM_WEBSITE_RECIPE_ID) { menu.push({ type: 'separator', }, { -- cgit v1.2.3-70-g09d2