Fix #5665 - pre-commit hooks for roojs

[roojs1] / Roo / bootstrap / Alert.js

diff --git a/Roo/bootstrap/Alert.js b/Roo/bootstrap/Alert.js
index 57eceb3..cf85568 100644 (file)
--- a/Roo/bootstrap/Alert.js
+++ b/Roo/bootstrap/Alert.js
@@ -1,14 +1,12 @@
-/*
- * - LGPL
- *
- * Alert
- * 
- */
-
 /**
  * @class Roo.bootstrap.Alert
  * @extends Roo.bootstrap.Component
- * Bootstrap Alert class
+ * Bootstrap Alert class - shows an alert area box
+ * eg
+ * <div class="alert alert-danger" role="alert"><span class="fa fa-exclamation-triangle"></span><span class="sr-only">Error:</span>
+  Enter a valid email address
+</div>
+ * @licence LGPL
  * @cfg {String} title The title of alert
  * @cfg {String} html The content of alert
  * @cfg {String} weight (  success | info | warning | danger )
@@ -39,6 +37,11 @@ Roo.extend(Roo.bootstrap.Alert, Roo.bootstrap.Component,  {
             tag : 'div',
             cls : 'alert',
             cn : [
+                {
+                    tag : 'i',
+                    cls : 'roo-alert-icon'
+                    
+                },
                 {
                     tag : 'b',
                     cls : 'roo-alert-title',
@@ -53,10 +56,7 @@ Roo.extend(Roo.bootstrap.Alert, Roo.bootstrap.Component,  {
         };
         
         if(this.faicon){
-            cfg.cn.unshift({
-                tag : 'i',
-                cls : 'fa ' + this.faicon
-            });
+            cfg.cn[0].cls += ' fa ' + this.faicon;
         }
         
         if(this.weight){
@@ -92,9 +92,15 @@ Roo.extend(Roo.bootstrap.Alert, Roo.bootstrap.Component,  {
         this.el.select('.alert',true).first().addClass('alert-' + this.weight);
     },
     
-    setIcon : function(str)
+    setIcon : function(icon)
     {
-        this.el.select('.roo-alert-text',true).first().dom.innerHTML = str;
+        if(this.faicon){
+            this.el.select('.roo-alert-icon',true).first().removeClass(['fa', 'fa-' + this.faicon]);
+        }
+        
+        this.faicon = icon;
+        
+        this.el.select('.roo-alert-icon',true).first().addClass(['fa', 'fa-' + this.faicon]);
     },
     
     hide: function()