From 4442e341c5b540806e811997007cf5aee5f091fd Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Thu, 11 Sep 2014 17:14:35 +0800
Subject: [PATCH] Roo/bootstrap/ComboBox.js
 examples/bootstrap/dashboard1.bjs.IAPHMX examples/bootstrap/dashboard1.bjs
 examples/bootstrap/dashboard1.js.1F1FMX examples/bootstrap/dashboard1.js

---
 examples/bootstrap/dashboard1.bjs |  9 ++++++++-
 examples/bootstrap/dashboard1.js  | 10 +++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/examples/bootstrap/dashboard1.bjs b/examples/bootstrap/dashboard1.bjs
index 0e8a987c6d..246ee43eb6 100644
--- a/examples/bootstrap/dashboard1.bjs
+++ b/examples/bootstrap/dashboard1.bjs
@@ -371,7 +371,14 @@
                                                                                             "xtype" : "Button",
                                                                                             "$ xns" : "Roo.bootstrap",
                                                                                             "String html" : "test",
-                                                                                            "* prop" : "before"
+                                                                                            "* prop" : "before",
+                                                                                            "items" : [
+                                                                                                {
+                                                                                                    "xtype" : "Menu",
+                                                                                                    "$ xns" : "Roo.bootstrap",
+                                                                                                    "* prop" : "menu"
+                                                                                                }
+                                                                                            ]
                                                                                         }
                                                                                     ]
                                                                                 }
diff --git a/examples/bootstrap/dashboard1.js b/examples/bootstrap/dashboard1.js
index 51b7616e4a..6407b436ad 100644
--- a/examples/bootstrap/dashboard1.js
+++ b/examples/bootstrap/dashboard1.js
@@ -384,10 +384,18 @@ dashboard1 = new Roo.XComponent({
                                                                                 },
                                                                             	{
                                                                                     before : {
+                                                                                        menu : {
+                                                                                            xtype : 'Menu',
+                                                                                            xns : Roo.bootstrap
+                                                                                        },
                                                                                         weight : 'primary',
                                                                                         xtype : 'Button',
                                                                                         xns : Roo.bootstrap,
-                                                                                        html : 'test'
+                                                                                        html : 'test',
+                                                                                        items : [
+
+                                                                                        ]
+
                                                                                     },
                                                                                     xtype : 'Input',
                                                                                     placeholder : 'before :  - an object...    ',
-- 
2.39.2