dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16018 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-07-08 15:22:03 +0200
message:
  PT DV ER dim store listener issue fixed.
modified:
  dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.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-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js	2014-07-08 12:26:31 +0000
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js	2014-07-08 13:11:10 +0000
@@ -5655,19 +5655,8 @@
 			};
 
 			web.multiSelect.setHeight = function(ms, panel, fill) {
-                //fill = fill || 0;
-
-				//for (var i = 0, height, ms, hasToolbar; i < multiSelects.length; i++) {
-                    //ms = multiSelects[i];
-                    //hasToolbar = Ext.isArray(ms.tbar) && ms.tbar.length;
-
-					//height = panel.getHeight() - 4 - fill - (hasToolbar ? 27 : 0);
-					//ms.setHeight(height);
-				//}
-
 				for (var i = 0, height; i < ms.length; i++) {
 					height = panel.getHeight() - fill - (ms[i].hasToolbar ? 25 : 0);
-console.log("panel.getHeight()", panel.getHeight(), "fill", fill, "pluss", ms[i].hasToolbar ? 25 : 0, "MS HEIGHT", height);
 					ms[i].setHeight(height);
 				}
 			};

=== 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-06-26 14:37:15 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-07-08 13:20:46 +0000
@@ -4898,6 +4898,9 @@
                     },
                     remove: function() {
                         onSelect();
+                    },
+                    clear: function() {
+                        onSelect();
                     }
                 }
 			});

=== 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	2014-07-08 11:10:49 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2014-07-08 13:20:46 +0000
@@ -4869,6 +4869,9 @@
                     },
                     remove: function() {
                         onSelect();
+                    },
+                    clear: function() {
+                        onSelect();
                     }
                 }
 			});