bug fixes #178, #179, #180

rajeshwarpatlolla · Apr 2, 2016 · 1b82e6c · 1b82e6c
1 parent 0c2ed10
commit 1b82e6c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 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
@@ -66,13 +66,13 @@ <h1 class="title">{{selctedDateEpoch | date : mainObj.dateFormat}}</h1>
   <ion-footer-bar class="footer">
     <div class="row padding_zero">
       <button class="button button-clear button-block button_set" ng-if="!mainObj.closeOnSelect"
-              ng-click="setIonicDatePickerDate()">Set
+              ng-click="setIonicDatePickerDate()">{{mainObj.setLabel}}
       </button>
       <button class="button button-clear button-block button_today"  ng-if="mainObj.showTodayButton"
-              ng-click="setIonicDatePickerTodayDate()">Today
+              ng-click="setIonicDatePickerTodayDate()">{{mainObj.todayLabel}}
       </button>
       <button class="button button-clear button-block button_close"
-              ng-click="closeIonicDatePickerModal()">Close
+              ng-click="closeIonicDatePickerModal()">{{mainObj.closeLabel}}
       </button>
     </div>
   </ion-footer-bar>

diff --git a/src/ionic-datepicker.module.js b/src/ionic-datepicker.module.js
@@ -2,5 +2,5 @@ angular.module('ionic-datepicker', [
   'ionic',
   'ionic-datepicker.service',
   'ionic-datepicker.provider',
-  'ionic-datepicker.templates'
+  // 'ionic-datepicker.templates'
 ]);
diff --git a/src/ionic-datepicker.provider.js b/src/ionic-datepicker.provider.js
@@ -97,6 +97,7 @@ angular.module('ionic-datepicker.provider', [])
         if (!mainObj.disabledDates || mainObj.disabledDates.length === 0) {
           $scope.disabledDates = [];
         } else {
+          $scope.disabledDates = [];
           angular.forEach(mainObj.disabledDates, function (val, key) {
             val = resetHMSM(new Date(val));
             $scope.disabledDates.push(val.getTime());

diff --git a/src/ionic-datepicker.styles.css b/src/ionic-datepicker.styles.css
@@ -167,14 +167,12 @@
 .ionic_datepicker_modal .font_22px {
   font-size: 22px;
 }
-
 .platform-android .ionic_datepicker_modal .bar .title.title-left {
   text-align: center;
 }
 .platform-android .ionic_datepicker_modal select {
   left: 25%;
 }
-
 .platform-ios .ionic_datepicker_modal select {
   left: 5%;
 }