dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33805
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17314: DV ie fix for radar charts.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 17314 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-10-29 15:31:59 +0100
message:
DV ie fix for radar charts.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/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-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js 2014-10-29 00:37:18 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js 2014-10-29 14:29:27 +0000
@@ -2881,17 +2881,20 @@
chart.setTitlePosition = function() {
if (this.items) {
var title = this.items[0],
- subTitle = this.items[1];
+ subTitle = this.items[1],
+ titleXFallback = 10;
if (title) {
- var titleX = (ns.app.centerRegion.getWidth() / 2) - (title.el.getWidth() / 2);
+ var titleWidth = Ext.isIE ? title.el.dom.scrollWidth : title.el.getWidth(),
+ titleX = titleWidth ? (ns.app.centerRegion.getWidth() / 2) - (titleWidth / 2) : titleXFallback;
title.setAttributes({
x: titleX
}, true);
}
if (subTitle) {
- var subTitleX = (ns.app.centerRegion.getWidth() / 2) - (subTitle.el.getWidth() / 2);
+ var subTitleWidth = Ext.isIE ? subTitle.el.dom.scrollWidth : subTitle.el.getWidth(),
+ subTitleX = subTitleWidth ? (ns.app.centerRegion.getWidth() / 2) - (subTitleWidth / 2) : titleXFallback;
subTitle.setAttributes({
x: subTitleX
}, true);