Merge branch 'develop'

sillsdev · Apr 5, 2022 · 2765dc6 · 2765dc6
2 parents 852b4b7 + e55fe68
commit 2765dc6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/angular-app/languageforge/lexicon/editor/editor.component.html b/src/angular-app/languageforge/lexicon/editor/editor.component.html
@@ -11,7 +11,7 @@
                             <span class="d-none d-md-inline-block">List</span></a>
                     </div>
                     <div class="float-right" data-ng-show="$ctrl.isAtEditorEntry()">
-                        <div class="btn-group" ng-form="validateGoto" ng-hide="$ctrl.entryListModifiers.filterActive()">
+                        <div class="btn-group hide-on-mobile" ng-form="validateGoto" ng-hide="$ctrl.entryListModifiers.filterActive()">
                             <button class="btn btn-std" data-ng-click="$ctrl.skipToEntry(-1)" ng-disabled="!$ctrl.canSkipToEntry(-1)">
                                 <span class="fa fa-arrow-left"></span> <span class="d-none d-lg-inline-block">Previous</span>
                             </button>
@@ -43,7 +43,7 @@
                 </div>
             </div>
         </div>
-        <div class="row dc-rendered-on-desktop" data-ng-if="$ctrl.isAtEditorEntry()">
+        <div class="row hide-on-mobile" data-ng-if="$ctrl.isAtEditorEntry()">
             <div class="col">
                 <div class="word-definition-title">
                     <dc-rendered config="$ctrl.lecConfig.entry" global-config="$ctrl.lecConfig"

diff --git a/src/angular-app/languageforge/lexicon/editor/editor.component.ts b/src/angular-app/languageforge/lexicon/editor/editor.component.ts
@@ -1157,6 +1157,9 @@ export class LexiconEditorController implements angular.IController {
   }
 
   private prepCustomFieldsForUpdate(data: any): any {
+    if (Array.isArray(data)) {
+      return data.map(item => this.prepCustomFieldsForUpdate(item));
+    }
     data.customFields = {};
     for (const fieldName in data) {
       if (data.hasOwnProperty(fieldName)) {

diff --git a/src/angular-app/languageforge/lexicon/editor/field/_dc-rendered.scss b/src/angular-app/languageforge/lexicon/editor/field/_dc-rendered.scss
@@ -26,7 +26,7 @@
   }
 }
 @include media-breakpoint-down(sm) {
-  .dc-rendered-on-desktop {
+  .hide-on-mobile {
     display: none;
   }
 }