Merge lp:~methanal-developers/methanal/1277052-timestamp-column-null into lp:methanal

Proposed by Jonathan Jacobs
Status: Merged
Approved by: Jonathan Jacobs
Approved revision: 200
Merged at revision: 200
Proposed branch: lp:~methanal-developers/methanal/1277052-timestamp-column-null
Merge into: lp:methanal
Diff against target: 15 lines (+5/-1)
1 file modified
methanal/js/Methanal/Widgets.js (+5/-1)
To merge this branch: bzr merge lp:~methanal-developers/methanal/1277052-timestamp-column-null
Reviewer Review Type Date Requested Status
Methanal maintainers Pending
Review via email: mp+205142@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'methanal/js/Methanal/Widgets.js'
2--- methanal/js/Methanal/Widgets.js 2013-11-13 13:14:34 +0000
3+++ methanal/js/Methanal/Widgets.js 2014-02-06 12:18:06 +0000
4@@ -205,8 +205,12 @@
5 */
6 Methanal.Widgets.Column.subclass(Methanal.Widgets, 'TimestampColumn').methods(
7 function valueToDOM(self, columnValue) {
8+ var value = columnValue && columnValue.asHumanly();
9+ if (value == null) {
10+ value = '\u2014'; // EM DASH
11+ }
12 return Methanal.Widgets.TimestampColumn.upcall(
13- self, 'valueToDOM', columnValue.asHumanly());
14+ self, 'valueToDOM', value);
15 });
16
17

Subscribers

People subscribed via source and target branches

to all changes: