From: Alan Knowles <alan@roojs.com>
Date: Thu, 11 Sep 2014 08:41:59 +0000 (+0800)
Subject: examples/bootstrap/dashboard1.bjs.6S4CMX
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=1c08d10efa824134659d58aefec5194e096d4d52;p=roojs1

examples/bootstrap/dashboard1.bjs.6S4CMX
examples/bootstrap/dashboard1.bjs
examples/bootstrap/dashboard1.js.E0ZCMX
examples/bootstrap/dashboard1.js
---

diff --git a/examples/bootstrap/dashboard1.bjs b/examples/bootstrap/dashboard1.bjs
index a7ea7a4b51..918221ea73 100644
--- a/examples/bootstrap/dashboard1.bjs
+++ b/examples/bootstrap/dashboard1.bjs
@@ -369,6 +369,7 @@
                                                                                         {
                                                                                             "xtype" : "Button",
                                                                                             "$ xns" : "Roo.bootstrap",
+                                                                                            "String html" : "test",
                                                                                             "* prop" : "before"
                                                                                         }
                                                                                     ]
diff --git a/examples/bootstrap/dashboard1.js b/examples/bootstrap/dashboard1.js
index 6ea1b20ca7..8aa99ff8e1 100644
--- a/examples/bootstrap/dashboard1.js
+++ b/examples/bootstrap/dashboard1.js
@@ -385,7 +385,8 @@ dashboard1 = new Roo.XComponent({
                                                                             	{
                                                                                     before : {
                                                                                         xtype : 'Button',
-                                                                                        xns : Roo.bootstrap
+                                                                                        xns : Roo.bootstrap,
+                                                                                        html : 'test'
                                                                                     },
                                                                                     xtype : 'Input',
                                                                                     placeholder : 'before :  - an object...    ',