fix: use enable unfinished features env var to set enableV4

standardnotes · Oct 6, 2021 · 1190ebb · 1190ebb
1 parent 05b7337
commit 1190ebb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/app/assets/javascripts/app.ts b/app/assets/javascripts/app.ts
@@ -89,6 +89,7 @@ function reloadHiddenFirefoxTab(): boolean {
 const startApplication: StartApplication = async function startApplication(
   defaultSyncServerHost: string,
   bridge: Bridge,
+  enableUnfinishedFeatures: boolean,
   webSocketUrl: string,
 ) {
   if (reloadHiddenFirefoxTab()) {
@@ -107,6 +108,7 @@ const startApplication: StartApplication = async function startApplication(
     .constant('bridge', bridge)
     .constant('defaultSyncServerHost', defaultSyncServerHost)
     .constant('appVersion', bridge.appVersion)
+    .constant('enableUnfinishedFeatures', enableUnfinishedFeatures)
     .constant('webSocketUrl', webSocketUrl);
 
   // Controllers
@@ -194,6 +196,7 @@ if (IsWebPlatform) {
     (window as any)._default_sync_server,
     new BrowserBridge(AppVersion),
     (window as any)._websocket_url,
+    (window as any)._enable_unfinished_features,
   );
 } else {
   (window as any).startApplication = startApplication;

diff --git a/app/assets/javascripts/startApplication.ts b/app/assets/javascripts/startApplication.ts
@@ -3,5 +3,6 @@ import { Bridge } from "./services/bridge";
 export type StartApplication = (
   defaultSyncServerHost: string,
   bridge: Bridge,
+  enableUnfinishedFeatures: boolean,
   webSocketUrl: string,
 ) => Promise<void>;
diff --git a/app/assets/javascripts/ui_models/application.ts b/app/assets/javascripts/ui_models/application.ts
@@ -55,6 +55,7 @@ export class WebApplication extends SNApplication {
     scope: angular.IScope,
     defaultSyncServerHost: string,
     public bridge: Bridge,
+    enableUnfinishedFeatures: boolean,
     webSocketUrl: string,
   ) {
     super(
@@ -67,7 +68,7 @@ export class WebApplication extends SNApplication {
       [],
       defaultSyncServerHost,
       AppVersion,
-      isDev,
+      enableUnfinishedFeatures,
       webSocketUrl,
     );
     this.$compile = $compile;

diff --git a/app/assets/javascripts/ui_models/application_group.ts b/app/assets/javascripts/ui_models/application_group.ts
@@ -29,7 +29,8 @@ export class ApplicationGroup extends SNApplicationGroup {
     $timeout: ng.ITimeoutService,
     private defaultSyncServerHost: string,
     private bridge: Bridge,
-    private webSocketUrl: string
+    private enableUnfinishedFeatures: boolean,
+    private webSocketUrl: string,
   ) {
     super(new WebDeviceInterface($timeout, bridge));
     this.$compile = $compile;
@@ -64,6 +65,7 @@ export class ApplicationGroup extends SNApplicationGroup {
       scope,
       this.defaultSyncServerHost,
       this.bridge,
+      this.enableUnfinishedFeatures,
       this.webSocketUrl,
     );
     const appState = new AppState(