From: Alan Knowles Date: Tue, 22 Jul 2014 09:49:34 +0000 (+0800) Subject: Roo/bootstrap/Button.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=99530eb000d9682311d4f656baa051a452e5b416 Roo/bootstrap/Button.js --- diff --git a/Roo/bootstrap/Button.js b/Roo/bootstrap/Button.js index 5fce2500a4..4fa7eb7f9f 100644 --- a/Roo/bootstrap/Button.js +++ b/Roo/bootstrap/Button.js @@ -95,7 +95,7 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component, { } else { cfg.tag = this.tag; } - cfg.html = this.html || cfg.html; + cfg.html = '' + (this.html || cfg.html) + ''; if (this.toggle == true) { cfg={ @@ -327,6 +327,10 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component, { this.setActive(!active); + }, + setText : function(str) + { + }