Skip to content

Commit

Permalink
Merge pull request #115 from hicknhack-software/feature/time_booking_…
Browse files Browse the repository at this point in the history
…issue

* Fixed time booking bug where momentjs parsed incorrect times.
  • Loading branch information
arBmind committed Mar 18, 2019
2 parents 097e567 + 1066ce7 commit 68124c3
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions app/views/hourglass_ui/layouts/_hourglass.slim
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,7 @@
months: #{date_strings_lookup :month_names},
monthsShort: #{date_strings_lookup :abbr_month_names},
weekdays: #{date_strings_lookup :day_names},
weekdaysShort: #{date_strings_lookup :abbr_day_names},
meridiemParse: new RegExp(/#{am_pm[0]}|#{am_pm[1]}/, 'i'),
isPM: function (input) {
return input.toLowerCase() === "#{am_pm[1]}";
},
meridiem: function (hour, _minute, isLowercase) {
var result = hour < 12 ? "#{am_pm[0]}" : "#{am_pm[1]}";
return isLowercase ? result.toLowerCase() : result.toUpperCase()
}
weekdaysShort: #{date_strings_lookup :abbr_day_names}
});
= stylesheet_link_tag 'application', plugin: Hourglass::PLUGIN_NAME
Expand Down

0 comments on commit 68124c3

Please sign in to comment.