dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 17641 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-12-02 17:47:39 +0100
message:
  GIS minor fix
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/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-mapping/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js	2014-11-30 18:36:23 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js	2014-12-02 16:46:26 +0000
@@ -325,6 +325,8 @@
                 win.showAt(e.x + 20, e.y);
 
                 layer.dataPopups.push(win);
+
+                gis.olmap.mask.hide();
             };
 
             success = function(r) {
@@ -377,9 +379,12 @@
 
             failure = function(r) {
                 console.log(r);
+                gis.olmap.mask.hide();
             };
 
             getData = function(paramString) {
+                gis.olmap.mask.show();
+
                 if (GIS.plugin && !GIS.app) {
                     Ext.data.JsonP.request({
                         url: gis.init.contextPath + '/api/analytics.jsonp' + paramString,