← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11808: (DV) Minor bug fixed.

 

------------------------------------------------------------
revno: 11808
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-08-27 09:57:32 +0200
message:
  (DV) Minor bug fixed.
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/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-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-08-26 10:12:55 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-08-27 07:57:32 +0000
@@ -1172,7 +1172,7 @@
 							headers: {'Content-Type': 'application/json'},
 							params: Ext.encode(favorite),
 							failure: function(r) {
-								dv.util.mask.hideMask();
+								dv.util.mask.hideMask(dv.viewport.centerRegion);
 								alert(r.responseText);
 							},
 							success: function(r) {
@@ -1201,7 +1201,7 @@
 							url: dv.init.contextPath + '/api/charts/' + id + '.json?viewClass=dimensional&links=false',
 							method: 'GET',
 							failure: function(r) {
-								dv.util.mask.hideMask();
+								dv.util.mask.hideMask(dv.viewport.centerRegion);
 								alert(r.responseText);
 							},
 							success: function(r) {
@@ -1214,7 +1214,7 @@
 									headers: {'Content-Type': 'application/json'},
 									params: Ext.encode(favorite),
 									failure: function(r) {
-										dv.util.mask.hideMask();
+										dv.util.mask.hideMask(dv.viewport.centerRegion);
 										alert(r.responseText);
 									},
 									success: function(r) {
@@ -1431,7 +1431,7 @@
 										url: dv.init.contextPath + '/api/sharing?type=chart&id=' + record.data.id,
 										method: 'GET',
 										failure: function(r) {
-											dv.util.mask.hideMask();
+											dv.util.mask.hideMask(dv.viewport.centerRegion);
 											alert(r.responseText);
 										},
 										success: function(r) {

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js	2013-08-16 15:18:09 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js	2013-08-27 07:57:32 +0000
@@ -2219,7 +2219,7 @@
                         },
                         disableCaching: false,
                         failure: function(r) {
-                            util.mask.hideMask();
+                            util.mask.hideMask(dv.viewport.centerRegion);
                             alert(r.responseText);
                         },
                         success: function(r) {
@@ -2227,14 +2227,14 @@
                                 response = Ext.decode(r.responseText);
 
                             if (!validateResponse(response)) {
-                                util.mask.hideMask();
+                                util.mask.hideMask(dv.viewport.centerRegion);
                                 return;
                             }
 
                             xLayout = getSyncronizedXLayout(xLayout, response);
 
                             if (!xLayout) {
-                                util.mask.hideMask();
+                                util.mask.hideMask(dv.viewport.centerRegion);
                                 return;
                             }
 
@@ -2298,7 +2298,7 @@
                 };
 
                 failure = function(responseText) {
-                    util.mask.hideMask();
+                    util.mask.hideMask(dv.viewport.centerRegion);
                     alert(responseText);
                 };