Skip to content

Commit

Permalink
v0.2.1 released
Browse files Browse the repository at this point in the history
  • Loading branch information
rajeshwarpatlolla committed Aug 2, 2015
1 parent f8f92aa commit 5a93653
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions dist/ionic-timepicker.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion src/ionic-timepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ angular.module('ionic-timepicker', ['ionic', 'ionic-timepicker.templates'])
scope.time.meridian = (scope.time.meridian === "AM") ? "PM" : "AM";
};

//Showing time picker modal for 12 hour format
$ionicPopup.show({
templateUrl: 'time-picker-12-hour.html',
title: obj.title || '<strong>12-Hour Format</strong>',
Expand Down Expand Up @@ -143,14 +144,15 @@ angular.module('ionic-timepicker', ['ionic', 'ionic-timepicker.templates'])
]
})

}else if (obj.format == 24) {
} else if (obj.format == 24) {

scope.time.hours = (objDate.getUTCHours());
scope.time.minutes = (objDate.getUTCMinutes());

scope.time.hours = (scope.time.hours < 10) ? ('0' + scope.time.hours) : scope.time.hours;
scope.time.minutes = (scope.time.minutes < 10) ? ('0' + scope.time.minutes) : scope.time.minutes;

//Showing time picker modal for 24 hour format
$ionicPopup.show({
templateUrl: 'time-picker-24-hour.html',
title: obj.title || '<strong>24-Hour Format</strong>',
Expand Down

0 comments on commit 5a93653

Please sign in to comment.