------------------------------------------------------------
revno: 19662
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: dhis2
timestamp: Thu 2015-07-16 00:48:48 +0200
message:
GIS dashboard updates.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.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-mapping/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js 2015-07-15 21:40:39 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js 2015-07-15 22:48:48 +0000
@@ -1734,7 +1734,10 @@
// Legend
gis.viewport.eastRegion.doLayout();
- layer.legendPanel.expand();
+
+ if (layer.legendPanel) {
+ layer.legendPanel.expand();
+ }
// Layer
if (layer.item) {
@@ -2544,7 +2547,10 @@
// Legend
gis.viewport.eastRegion.doLayout();
- layer.legendPanel.expand();
+
+ if (layer.legendPanel) {
+ layer.legendPanel.expand();
+ }
// Layer
layer.setLayerOpacity(view.opacity);
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js 2015-07-15 22:44:46 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js 2015-07-15 22:48:48 +0000
@@ -3221,7 +3221,10 @@
// Legend
gis.viewport.eastRegion.doLayout();
- layer.legendPanel.expand();
+
+ if (layer.legendPanel) {
+ layer.legendPanel.expand();
+ }
// Layer
if (layer.item) {
@@ -4031,7 +4034,10 @@
// Legend
gis.viewport.eastRegion.doLayout();
- layer.legendPanel.expand();
+
+ if (layer.legendPanel) {
+ layer.legendPanel.expand();
+ }
// Layer
layer.setLayerOpacity(view.opacity);
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js 2015-07-15 22:44:46 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js 2015-07-15 22:48:48 +0000
@@ -3221,7 +3221,10 @@
// Legend
gis.viewport.eastRegion.doLayout();
- layer.legendPanel.expand();
+
+ if (layer.legendPanel) {
+ layer.legendPanel.expand();
+ }
// Layer
if (layer.item) {
@@ -4031,7 +4034,10 @@
// Legend
gis.viewport.eastRegion.doLayout();
- layer.legendPanel.expand();
+
+ if (layer.legendPanel) {
+ layer.legendPanel.expand();
+ }
// Layer
layer.setLayerOpacity(view.opacity);
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js 2015-07-15 22:44:46 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js 2015-07-15 22:48:48 +0000
@@ -3221,7 +3221,10 @@
// Legend
gis.viewport.eastRegion.doLayout();
- layer.legendPanel.expand();
+
+ if (layer.legendPanel) {
+ layer.legendPanel.expand();
+ }
// Layer
if (layer.item) {
@@ -4031,7 +4034,10 @@
// Legend
gis.viewport.eastRegion.doLayout();
- layer.legendPanel.expand();
+
+ if (layer.legendPanel) {
+ layer.legendPanel.expand();
+ }
// Layer
layer.setLayerOpacity(view.opacity);
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
