dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17970: DV EV plugin override fix.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 14 Jan 2015 08:57:28 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 17970 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-01-14 09:55:23 +0100
message:
  DV EV plugin override fix.
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js	2015-01-13 17:48:51 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js	2015-01-14 08:53:47 +0000
@@ -355,7 +355,7 @@
 
             for (i = 0; i < ln; i++) {
                 point = inflections[i];
-                text = me.label.renderer(labels[i]);
+                text = me.label.renderer(labels[i]) || '';
                 textLabel = me.getOrCreateLabel(i, text);
                 bbox = textLabel._bbox;
                 maxHeight = max(maxHeight, bbox.height + me.dashSize + me.label.padding);

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js	2015-01-13 17:57:47 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js	2015-01-14 08:53:47 +0000
@@ -355,7 +355,7 @@
 
             for (i = 0; i < ln; i++) {
                 point = inflections[i];
-                text = me.label.renderer(labels[i]);
+                text = me.label.renderer(labels[i]) || '';
                 textLabel = me.getOrCreateLabel(i, text);
                 bbox = textLabel._bbox;
                 maxHeight = max(maxHeight, bbox.height + me.dashSize + me.label.padding);