sync

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 4dbc3e4..e7313a1 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -4955,11 +4955,7 @@ Roo.extend(Roo.bootstrap.Element, Roo.bootstrap.Component,  {
         Roo.bootstrap.Element.superclass.initEvents.call(this);
         
         if(this.clickable){
-            if(!Roo.isTouch){
-                this.el.on('click', this.onClick, this);
-            } else {
-                this.el.on('touchstart', this.onClick, this);
-            }
+            this.el.on('click', this.onClick, this);
         }
         
     },
@@ -20406,6 +20402,7 @@ Roo.extend(Roo.bootstrap.CheckBox, Roo.bootstrap.Input,  {
     weight : false,
     inline: false,
     tooltip : '',
+    useFontAwesomeCheckBox : false,
     
     getAutoCreate : function()
     {
@@ -20585,6 +20582,10 @@ Roo.extend(Roo.bootstrap.CheckBox, Roo.bootstrap.Input,  {
                 html: this.boxLabel
             };
             
+            if(this.useFontAwesomeCheckBox) {
+                boxLabelCfg.cls = 'box-label fa-checkbox'
+            }
+            
             if(this.tooltip){
                 boxLabelCfg.tooltip = this.tooltip;
             }