dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 6366 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-03-23 11:08:19 +0000
message:
  (GIS) IE8 fixes.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/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-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js	2012-02-09 15:02:07 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js	2012-03-23 11:06:09 +0000
@@ -288,7 +288,7 @@
         },
         fileOverlay: {
             getActivatedOpenLayersStyleMap: function(layer) {
-                var style = layer.styleMap.styles.default.defaultStyle;
+                var style = layer.styleMap.styles['default'].defaultStyle;
                 return new OpenLayers.StyleMap({
                     'default' : new OpenLayers.Style(
                         OpenLayers.Util.applyDefaults({
@@ -308,7 +308,7 @@
                 });
             },
             getDeactivatedOpenLayersStyleMap: function(layer) {
-                var style = layer.styleMap.styles.default.defaultStyle;
+                var style = layer.styleMap.styles['default'].defaultStyle;
                 return new OpenLayers.StyleMap({
                     'default' : new OpenLayers.Style(
                         OpenLayers.Util.applyDefaults({

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2012-02-09 15:12:23 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2012-03-23 11:06:09 +0000
@@ -546,7 +546,6 @@
                         labelSeparator: G.conf.labelseparator,
                         selectOnFocus: true,
                         width: G.conf.combo_width_fieldset,
-                        listWidth: 'auto',
                         store: G.stores.mapView
                     }
                 ]

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2012-02-08 15:15:18 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2012-03-23 11:06:09 +0000
@@ -421,7 +421,6 @@
             emptyText: G.i18n.optional,
             selectOnFocus: true,
             width: G.conf.combo_width,
-            listWidth: 'auto',
             store: G.stores.mapView,
             listeners: {
                 'select': {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2012-01-20 15:06:41 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2012-03-23 11:06:09 +0000
@@ -421,7 +421,6 @@
             emptyText: G.i18n.optional,
             selectOnFocus: true,
             width: G.conf.combo_width,
-            listWidth: 'auto',
             store: G.stores.mapView,
             listeners: {
                 'select': {

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-03-21 15:17:23 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-03-22 12:39:14 +0000
@@ -2407,7 +2407,7 @@
                                         store: DV.store.dimension(),
                                         value: DV.conf.finals.dimension.period.value,
                                         listeners: {
-                                            afterrender: function(cb) {
+                                            added: function(cb) {
                                                 DV.cmp.settings.category = this;
                                             },
                                             select: function(cb) {
@@ -2441,7 +2441,7 @@
                                         store: DV.store.dimension(),
                                         value: DV.conf.finals.dimension.organisationunit.value,
                                         listeners: {
-                                            afterrender: function(cb) {
+                                            added: function(cb) {
                                                 DV.cmp.settings.filter = this;
                                             }
                                         }