fix filter dropdown blank on init

remove unnecessary filter width property - previously set button width
e-mission · Dec 20, 2022 · fb83c24 · fb83c24
1 parent bc9caa1
commit fb83c24
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/www/js/diary/infinite_scroll_list.js b/www/js/diary/infinite_scroll_list.js
@@ -54,7 +54,7 @@ angular.module('emission.main.diary.infscrolllist',['ui-leaflet',
     f.state = false;
   });
   $scope.filterInputs[0].state = true;
-  $scope.data.selFilter = $scope.filterInputs[0].key;
+  $scope.selFilter = $scope.filterInputs[0].key;
   ClientStats.addReading(ClientStats.getStatKeys().LABEL_TAB_SWITCH, {"source": null, "dest": $scope.getActiveFilters()});
   $scope.allTrips = false;
   const ONE_WEEK = 7 * 24 * 60 * 60; // seconds

diff --git a/www/js/survey/enketo/infinite_scroll_filters.js b/www/js/survey/enketo/infinite_scroll_filters.js
@@ -21,15 +21,13 @@ angular.module('emission.survey.enketo.trip.infscrollfilters',[
     sf.UNLABELED = {
         key: "unlabeled",
         text: $translate.instant(".unlabeled"),
-        filter: unlabeledCheck,
-        width: "col-50"
+        filter: unlabeledCheck
     }
 
     sf.TO_LABEL = {
         key: "to_label",
         text: $translate.instant(".to-label"),
-        filter: unlabeledCheck,
-        width: "col-50"
+        filter: unlabeledCheck
     }
 
     sf.configuredFilters = [

diff --git a/www/templates/diary/infinite_scroll_list.html b/www/templates/diary/infinite_scroll_list.html
@@ -5,11 +5,11 @@
         <button class="button button-icon" ng-click="increaseHeight()">
             <i class="icon ion-arrow-resize"></i>
         </button>
-        <select ng-model="data.selFilter" ng-change="updateFilterSel(data.selFilter)">
-            <option ng-repeat="filter in filterInputs" ng-value="filter.key" ng-selected="{{filter.state==true}}" translate>
+        <select ng-model="selFilter" ng-change="updateFilterSel(selFilter)">
+            <option ng-repeat="filter in filterInputs" value="{{filter.key}}" translate>
                 {{filter.text}}
             </option>
-            <option ng-selected="{{getActiveFilters().length < 1}}" ng-value="show-all" translate>
+            <option value="show-all" translate>
                 {{'.show-all'}}
             </option>
         </select>