Page MenuHomePhabricator
Files F15392368

D16290.id39180.diff
No OneTemporary
Actions

D16290.id39180.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -362,7 +362,7 @@
'rsrc/js/application/aphlict/behavior-aphlict-status.js' => 'ea681761',
'rsrc/js/application/aphlict/behavior-desktop-notifications-control.js' => 'edd1ba66',
'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18',
- 'rsrc/js/application/calendar/behavior-day-view.js' => '5c46cff2',
+ 'rsrc/js/application/calendar/behavior-day-view.js' => '1a5bb063',
'rsrc/js/application/calendar/behavior-event-all-day.js' => '38dcf3c8',
'rsrc/js/application/calendar/behavior-recurring-edit.js' => '5f1c4d5f',
'rsrc/js/application/config/behavior-reorder-fields.js' => 'b6993408',
@@ -603,7 +603,7 @@
'javelin-behavior-dashboard-move-panels' => '019f36c4',
'javelin-behavior-dashboard-query-panel-select' => '453c5375',
'javelin-behavior-dashboard-tab-panel' => 'd4eecc63',
- 'javelin-behavior-day-view' => '5c46cff2',
+ 'javelin-behavior-day-view' => '1a5bb063',
'javelin-behavior-desktop-notifications-control' => 'edd1ba66',
'javelin-behavior-detect-timezone' => '4c193c96',
'javelin-behavior-device' => 'bb1dd507',
diff --git a/src/view/phui/calendar/PHUICalendarDayView.php b/src/view/phui/calendar/PHUICalendarDayView.php
--- a/src/view/phui/calendar/PHUICalendarDayView.php
+++ b/src/view/phui/calendar/PHUICalendarDayView.php
@@ -61,7 +61,7 @@
foreach ($hours as $hour) {
$js_hours[] = array(
'hour' => $hour->format('G'),
- 'hour_meridian' => $hour->format('g A'),
+ 'displayTime' => phabricator_time($hour->format('U'), $viewer),
);
}
diff --git a/webroot/rsrc/js/application/calendar/behavior-day-view.js b/webroot/rsrc/js/application/calendar/behavior-day-view.js
--- a/webroot/rsrc/js/application/calendar/behavior-day-view.js
+++ b/webroot/rsrc/js/application/calendar/behavior-day-view.js
@@ -169,13 +169,13 @@
var cell_time = JX.$N(
'td',
{className: 'phui-calendar-day-hour'},
- hours[i]['hour_meridian']);
+ hours[i].displayTime);
var cell_event = JX.$N(
'td',
{
meta: {
- time: hours[i]['hour_meridian']
+ time: hours[i].displayTime
},
className: 'phui-calendar-day-events',
sigil: 'phui-calendar-day-event-cell'

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 16, 2:48 PM (2 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7705823
Default Alt Text
D16290.id39180.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility