allow string based values for comboboxarray

[roojs1] / Roo / bootstrap / Component.js

diff --git a/Roo/bootstrap/Component.js b/Roo/bootstrap/Component.js
index 066e826..01b90dc 100644 (file)
--- a/Roo/bootstrap/Component.js
+++ b/Roo/bootstrap/Component.js
@@ -18,7 +18,8 @@ Roo.bootstrap = Roo.bootstrap || {};
  * @cfg {string} name Specifies name attribute
  * @cfg {string} tooltip  Text for the tooltip
  * @cfg {string} container_method method to fetch parents container element (used by NavHeaderbar -  getHeaderChildContainer)
- * 
+ * @cfg {string|object} visibilityEl (el|parent) What element to use for visibility (@see getVisibilityEl())
+ 
  * @constructor
  * Do not use directly - it does not do anything..
  * @param {Object} config The config object
@@ -248,9 +249,9 @@ Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent,  {
         if (!is_body) {
             
             // if parent was disabled, then do not try and create the children..
-            if(this[cntr](true) === false){
+            if(!this[cntr](true)){
                 tree.items = [];
-                return cn;
+                return tree;
             }
            
             cn = Roo.factory(tree);
@@ -364,23 +365,59 @@ Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent,  {
         
         return cn;
     },
+    
+    /**
+     * Set the element that will be used to show or hide
+     */
+    setVisibilityEl : function(el)
+    {
+       this.visibilityEl = el;
+    },
+    
+     /**
+     * Get the element that will be used to show or hide
+     */
+    getVisibilityEl : function()
+    {
+       if (typeof(this.visibilityEl) == 'object') {
+           return this.visibilityEl;
+       }
+       
+       if (typeof(this.visibilityEl) == 'string') {
+           return this.visibilityEl == 'parent' ? this.parent().getEl() : this.getEl();
+       }
+       
+       return this.getEl();
+    },
+    
     /**
      * Show a component - removes 'hidden' class
      */
     show : function()
     {
-        if (this.el) {
-            this.el.removeClass('hidden');
+        if(!this.getVisibilityEl()){
+            return;
         }
+         
+        this.getVisibilityEl().removeClass(['hidden','d-none']);
+        
+        this.fireEvent('show', this);
+        
+        
     },
     /**
      * Hide a component - adds 'hidden' class
      */
     hide: function()
     {
-        if (this.el && !this.el.hasClass('hidden')) {
-            this.el.addClass('hidden');
+        if(!this.getVisibilityEl()){
+            return;
         }
+        
+        this.getVisibilityEl().addClass(['hidden','d-none']);
+        
+        this.fireEvent('hide', this);
+        
     }
 });