Fixed the autofocus on currently selected accordion tab.

diff --git a/www/js/htsw.js b/www/js/htsw.js
index 9e3c7ef6ece9ab9cb6bfdf2b24b5d00da92a86cb..a5b557ffb79ce771b437faacce2035482344edb0 100644 (file)
--- a/www/js/htsw.js
+++ b/www/js/htsw.js
@@ -1,8 +1,31 @@
 
 $(document).ready(function(){
-    /*var menuAccordionPanel = new Ext.Panel({
-    
-    });*/
+    var menuAccordionPanel = new Ext.Panel({
+        id: 'menu_accordion',
+        flex: 1,
+        layout: 'accordion',
+        layoutConfig: {
+            animate: true,
+            fill: true
+        },
+        items: [{
+            title: 'Freezers',
+            id: 'freezers_menu_panel',
+            contentEl: 'freezer_menu'
+        },{
+            title: 'Containers',
+            id: 'containers_menu_panel',
+            contentEl: 'container_menu'
+        },{
+            title: 'Samples',
+            id: 'samples_menu_panel',
+            contentEl: 'sample_menu'
+        },{
+            title: 'Settings',
+            id: 'settings_menu_panel',
+            contentEl: 'settings_menu'
+        }]
+    });
     
     var mainBorderPanel = new Ext.Viewport({
        layout: 'border',
@@ -22,7 +45,7 @@ $(document).ready(function(){
                     xtype: 'toolbar',
                     //height: 100,
                     items: [{
-                        text: "Button"  
+                        text: "Button"
                     }],
                     margins: '2 0 0 0'
             }],
@@ -41,32 +64,8 @@ $(document).ready(function(){
                 pack: 'start'
             },
             items: [
+                    menuAccordionPanel,
                 {
-                    flex: 1,
-                    id: 'menu_accordion',
-                    layout: 'accordion',
-                    layoutConfig: {
-                        animate: true,
-                        fill: false
-                    },
-                    items: [{
-                        title: 'Freezers',
-                        id: 'freezers_menu_panel',
-                        contentEl: 'freezer_menu'
-                    },{
-                        title: 'Containers',
-                        id: 'containers_menu_panel',
-                        contentEl: 'container_menu'
-                    },{
-                        title: 'Samples',
-                        id: 'samples_menu_panel',
-                        contentEl: 'sample_menu'
-                    },{
-                        title: 'Settings',
-                        id: 'settings_menu_panel',
-                        contentEl: 'settings_menu'
-                    }]
-                },{
                     xtype: 'box',
                     applyTo: 'bcmagic_div',
                     height: 200
@@ -87,5 +86,13 @@ $(document).ready(function(){
        }]
     });
     
+    /*
+    Ext.MessageBox.show({
+        title: 'Debug',
+        msg: 'menuAccordionPanel id: ' + menuAccordionPanel.getItemId(),
+        buttons: Ext.MessageBox.OK,
+        icon: Ext.MessageBox.INFO
+    })
+    */
     
 });
\ No newline at end of file

diff --git a/www/js/menu.js b/www/js/menu.js
index a298bdb3fb3e55fb699710161333d11478006808..44d2fe585de74106c242ee1d754cea14daa1cc55 100644 (file)
--- a/www/js/menu.js
+++ b/www/js/menu.js
@@ -3,7 +3,7 @@
 var select_menu = function(item){
     var choices = {'freezer': 'freezers_menu_panel',
         'container': 'containers_menu_panel',
-        'samples': 'freezers_menu_panel',
+        'samples': 'samples_menu_panel',
         'settings': 'settings_menu_panel'};
-    $('#menu_accordion').setActiveItem(choices[item]);
+    Ext.getCmp(choices[item]).expand();
 }