dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 14501 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-03-27 17:39:21 +0100
message:
  PT, improved rendering performance.
modified:
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.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-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-03-27 14:27:41 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-03-27 16:38:52 +0000
@@ -1994,7 +1994,7 @@
 					if (uuidDimUuidsMap.hasOwnProperty(key)) {
 						valueEl = Ext.get(key);
 
-						if (parseFloat(valueEl.dom.textContent)) {
+						if (valueEl && parseFloat(valueEl.dom.textContent)) {
 							valueEl.dom.onValueMouseClick = web.events.onValueMouseClick;
 							valueEl.dom.onValueMouseOver = web.events.onValueMouseOver;
 							valueEl.dom.onValueMouseOut = web.events.onValueMouseOut;

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2014-03-20 08:17:36 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2014-03-27 16:38:52 +0000
@@ -1722,7 +1722,7 @@
 
 				component.mask = new Ext.create('Ext.LoadMask', component, {
 					shadow: false,
-					message: message,
+					msg: message,
 					style: 'box-shadow:0',
 					bodyStyle: 'box-shadow:0'
 				});
@@ -1946,6 +1946,10 @@
 						return '';
 					}
 
+                    if (config.hidden || config.collapsed) {
+                        return '';
+                    }
+
 					// Background color from legend set
 					if (isNumeric && xLayout.legendSet) {
 						var value = parseFloat(config.value);