diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2019-02-12 13:26:50 +0100 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2019-02-12 13:26:50 +0100 |
| commit | 3d2b58b387ce8b22cd7b674445d56d81019ef16c (patch) | |
| tree | 7bf922ae2932ca9467246fca7288a49deb29ea9b /src/webview/recipe.js | |
| parent | Add withTheme context to button (diff) | |
| parent | Fix windows token login (diff) | |
| download | ferdium-app-3d2b58b387ce8b22cd7b674445d56d81019ef16c.tar.gz ferdium-app-3d2b58b387ce8b22cd7b674445d56d81019ef16c.tar.zst ferdium-app-3d2b58b387ce8b22cd7b674445d56d81019ef16c.zip | |
Merge branch 'develop' into chore/lerna
Diffstat (limited to 'src/webview/recipe.js')
| -rw-r--r-- | src/webview/recipe.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webview/recipe.js b/src/webview/recipe.js index 9aa89ce01..c718b348e 100644 --- a/src/webview/recipe.js +++ b/src/webview/recipe.js | |||
| @@ -73,7 +73,7 @@ class RecipeController { | |||
| 73 | require(modulePath)(new RecipeWebview(), {...config, recipe,}); | 73 | require(modulePath)(new RecipeWebview(), {...config, recipe,}); |
| 74 | debug('Initialize Recipe', config, recipe); | 74 | debug('Initialize Recipe', config, recipe); |
| 75 | 75 | ||
| 76 | this.settings.service = config; | 76 | this.settings.service = Object.assign(config, { recipe }); |
| 77 | } catch (err) { | 77 | } catch (err) { |
| 78 | console.error('Recipe initialization failed', err); | 78 | console.error('Recipe initialization failed', err); |
| 79 | } | 79 | } |