Merge branch 'develop'

sillsdev · Jul 3, 2023 · b05638b · b05638b
2 parents 6461936 + 629a88a
commit b05638b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,6 +4,7 @@ version: '3.5'
 services:
   ui-builder:
     build:
+      context: .
       dockerfile: docker/ui-builder/Dockerfile
     image: lf-ui-builder
     container_name: lf-ui-builder
@@ -25,6 +26,7 @@ services:
 
   app:
     build:
+      context: .
       dockerfile: docker/app/Dockerfile
       args:
         - ENVIRONMENT=development
@@ -236,6 +238,7 @@ services:
 
   e2e-app:
     build:
+      context: .
       dockerfile: docker/app/Dockerfile
       args:
         - ENVIRONMENT=development
@@ -275,6 +278,7 @@ services:
 
   test-php:
     build:
+      context: .
       dockerfile: docker/test-php/Dockerfile
     image: lf-test-php
     container_name: lf-test-php
@@ -302,6 +306,7 @@ services:
 
   composer-dev:
     build:
+      context: .
       dockerfile: docker/composer-dev/Dockerfile
     image: lf-composer-dev
     container_name: lf-composer-dev

diff --git a/src/angular-app/bellows/shared/audio-recorder/audio-recorder.component.ts b/src/angular-app/bellows/shared/audio-recorder/audio-recorder.component.ts
@@ -88,8 +88,12 @@ export class AudioRecorderController implements angular.IController {
         //Stopping the media stream tracks releases the red recording indicator from browser tabs
         this.mediaRecorder.addEventListener("stop",
           () => {
-            stream.getTracks().forEach(function(track) {
-              track.stop();
+            stream.getTracks().forEach(function (track) {
+              try {
+                console.log('Sample rate', track.getSettings().sampleRate);
+              } finally {
+                track.stop();
+              }
             });
           }
         );

diff --git a/src/angular-app/languageforge/lexicon/editor/field/dc-text.component.ts b/src/angular-app/languageforge/lexicon/editor/field/dc-text.component.ts
@@ -29,7 +29,7 @@ export class FieldTextController implements angular.IController {
   fteMultiline: boolean;
   fteDir: string;
   fteFieldName: string;
-  
+
   fte: any = {};
   textFieldValue: string = '';
   autocapitalize: string
@@ -72,7 +72,11 @@ export class FieldTextController implements angular.IController {
   }
 
   inputChanged(): void {
-    this.fteModel = FieldTextController.escapeHTML(this.textFieldValue);
+    this.fteModel = FieldTextController
+      .escapeHTML(this.textFieldValue);
+    if (!this.fteMultiline) {
+      this.fteModel = this.fteModel.replace(/\n/g, ' ');
+    }
   }
 
   private static unescapeHTML(str: string): string {