Working on #7: fixed the selected month in dropdown. Last thing to do…

… : fix code when dropdown selection changes :-)
OSAMES · Jun 7, 2017 · 4e6da5b · 4e6da5b
1 parent da25c17
commit 4e6da5b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/dist/ionic-datepicker.bundle.min.js b/dist/ionic-datepicker.bundle.min.js
diff --git a/src/ionic-datepicker-modal.html b/src/ionic-datepicker-modal.html
@@ -17,7 +17,6 @@ <h1 class="title">{{mainObj.titleLabel || selctedDateEpoch | date : mainObj.date
               <label class="item item-input item-select month_select">
                 <span class="input-label">&nbsp;</span>
                 <select ng-model="data.currentMonth" ng-options="select as item.text for item in monthsList track by item.value" ng-change="monthChanged(data.currentMonth)">
-                  <!--<option ng-repeat="month in monthsList | filter:{'!!'}" ng-selected="month == data.currentMonthSelected" value="{{month}}">-->
                     {{month}}
                   </option>
                 </select>

diff --git a/src/ionic-datepicker-popup.html b/src/ionic-datepicker-popup.html
@@ -12,8 +12,7 @@
         <div class="col col-50 padding_right_5px">
           <label class="item item-input item-select month_select">
             <span class="input-label">&nbsp;</span>
-            <select ng-model="data.currentMonth" ng-change="monthChanged(data.currentMonth)">
-              <option ng-repeat="month in monthsList" ng-selected="month==data.currentMonthSelected" value="{{month}}">
+              <select ng-model="data.currentMonth" ng-options="select as item.text for item in monthsList track by item.value" ng-change="monthChanged(data.currentMonth)">
                 {{month}}
               </option>
             </select>

diff --git a/src/ionic-datepicker.provider.js b/src/ionic-datepicker.provider.js
@@ -61,7 +61,7 @@ angular.module('ionic-datepicker.provider', [])
         }
 
         $scope.currentDate = newDate;
-        $scope.data.currentMonth = $scope.monthsNames[$scope.currentDate.getMonth()];
+        $scope.data.currentMonth = findMonth($scope.currentDate.getMonth(), $scope.monthsList);
         $scope.data.currentYear = $scope.currentDate.getFullYear();
         $scope.adjustSelctedDateEpoch($scope.currentDate, true);
         refreshDateList($scope.currentDate);
@@ -88,12 +88,21 @@ angular.module('ionic-datepicker.provider', [])
         }
 
         $scope.currentDate = newDate;
-        $scope.data.currentMonth = $scope.monthsNames[$scope.currentDate.getMonth()];
+        $scope.data.currentMonth = findMonth($scope.currentDate.getMonth(), $scope.monthsList);
         $scope.data.currentYear = $scope.currentDate.getFullYear();
         $scope.adjustSelctedDateEpoch($scope.currentDate, true);
         refreshDateList($scope.currentDate);
       };
 
+      var findMonth = function(monthId, scopeMonthList) {
+        for(var i = 0; i < scopeMonthList.length; i++) {
+            if(scopeMonthList[i].value === monthId) {
+                return scopeMonthList[i];
+            }
+        }
+        return scopeMonthList[0];
+      };
+
         //Get the acceptable day
         var getAcceptableDay = function(currentDay, newMonth, newYear) {
             var nbDaysInMonth = new Date(newYear, newMonth+1, 0).getDate();
@@ -223,7 +232,7 @@ angular.module('ionic-datepicker.provider', [])
         $scope.rows = [0, 7, 14, 21, 28, 35];
         $scope.cols = [0, 1, 2, 3, 4, 5, 6];
 
-        $scope.data.currentMonth = $scope.monthsNames[currentDate.getMonth()];
+        $scope.data.currentMonth = findMonth($scope.currentDate.getMonth(), $scope.monthsList);
         $scope.data.currentYear = currentDate.getFullYear();
         $scope.data.currentMonthSelected = angular.copy($scope.data.currentMonth);
         $scope.currentYearSelected = angular.copy($scope.data.currentYear);
@@ -232,7 +241,7 @@ angular.module('ionic-datepicker.provider', [])
 
       //Month changed
       $scope.monthChanged = function (month) {
-        var monthNumber = $scope.monthsNames.indexOf(month);
+        var monthNumber = month;
         var selectedDate = new Date($scope.selctedDateEpoch);
         var newDay = getAcceptableDay(selectedDate.getDate(),
             monthNumber,

diff --git a/src/ionic-datepicker.service.js b/src/ionic-datepicker.service.js
@@ -17,7 +17,6 @@ angular.module('ionic-datepicker.service', [])
       return yearsList;
     };
 
-    // 12 items, not available months are null
     // item has "value" and "text" json keys
     this.getMonthsList = function (monthNames, from, to) {
       var monthsList = [];