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

Merge branch 'develop' into feat/open-purchase-flow

Browse Source
This commit is contained in:
Antonella Sgarlatta
2021-10-04 20:34:39 -03:00
committed by GitHub
parent aa40354a31 bdf50de9f6
commit 71004966c2
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/ui_models/application.ts
View File

@@ -55,6 +55,7 @@ export class WebApplication extends SNApplication {
scope: angular.IScope, scope: angular.IScope,
defaultSyncServerHost: string, defaultSyncServerHost: string,
public bridge: Bridge, public bridge: Bridge,
webSocketUrl: string,
) { ) {
super( super(
bridge.environment, bridge.environment,
@@ -67,6 +68,7 @@ export class WebApplication extends SNApplication {
defaultSyncServerHost, defaultSyncServerHost,
AppVersion, AppVersion,
isDev, isDev,
webSocketUrl,
); );
this.$compile = $compile; this.$compile = $compile;
this.scope = scope; this.scope = scope;

1
app/assets/javascripts/ui_models/application_group.ts
View File

@@ -64,6 +64,7 @@ export class ApplicationGroup extends SNApplicationGroup {
scope, scope,
this.defaultSyncServerHost, this.defaultSyncServerHost,
this.bridge, this.bridge,
this.webSocketUrl,
); );
const appState = new AppState( const appState = new AppState(
this.$rootScope, this.$rootScope,