dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 4390 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2011-08-20 03:36:16 +0200
message:
  Minor fix.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.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	2011-08-20 01:07:01 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js	2011-08-20 01:35:18 +0000
@@ -634,16 +634,6 @@
                             {
                                 text: 'Search..',
                                 iconCls: 'menu-layeroptions-locate',
-                                cmp: {
-                                    highlightColor: new Ext.ux.ColorField({
-                                        emptyText: G.conf.emptytext,
-                                        labelSeparator: G.conf.labelseparator,
-                                        fieldLabel: G.i18n.highlight_color,
-                                        allowBlank: false,
-                                        width: G.conf.combo_width_fieldset,
-                                        value: "#0000FF"
-                                    })
-                                },
                                 showSearchWindow: function() {
                                     var layer = this.parentMenu.parent.widget.layer;
 
@@ -660,11 +650,7 @@
                                             sortInfo: {field: 'name', direction: 'ASC'},
                                             autoDestroy: true,
                                             data: data
-                                        });   
-                                        
-                                        if (this.cmp.window) {
-                                            this.cmp.window.destroy();
-                                        }
+                                        });
                                         
                                         this.window = new Ext.Window({
                                             title: '<span id="window-locate-title">Organisation unit search</span>',