lib/framework/rho/rhoapplication.rb in rhodes-3.3.2.beta.5 vs lib/framework/rho/rhoapplication.rb in rhodes-3.3.2.beta.6

@@ -77,18 +77,30 @@
       return unless @@native_bar_data
       
       if @@native_bar_data[:type] == :vtabbar
         tabs = @@native_bar_data[:data]
         # normalize the list
-        tabs.map! { |tab| tab[:refresh] = false unless tab[:refresh]; tab }
+        if tabs.kind_of? Array
+             tabs.map! { |tab| tab[:refresh] = false unless tab[:refresh]; tab }
+        else
+             if tabs.kind_of? Hash
+                 tabs[:tabs].map! { |tab| tab[:refresh] = false unless tab[:refresh]; tab }
+             end
+        end
         puts "Initializing application with vertical tabs: #{tabs.inspect}"
         NativeTabbar.create_vertical(tabs)
         #NativeTabbar.create(tabs)
         NativeTabbar.switch_tab(0)
       elsif @@native_bar_data[:type] == :tabbar
         tabs = @@native_bar_data[:data]
         # normalize the list
-        tabs.map! { |tab| tab[:refresh] = false unless tab[:refresh]; tab }
+        if tabs.kind_of? Array
+             tabs.map! { |tab| tab[:refresh] = false unless tab[:refresh]; tab }
+        else
+             if tabs.kind_of? Hash
+                  tabs[:tabs].map! { |tab| tab[:refresh] = false unless tab[:refresh]; tab }
+             end
+        end
         puts "Initializing application with tabs: #{tabs.inspect}"
         NativeTabbar.create(tabs)
         NativeTabbar.switch_tab(0)
       elsif @@native_bar_data[:type] == :toolbar
         NativeToolbar.create(@@native_bar_data[:data])