X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-bootstrap-debug.js;fp=roojs-bootstrap-debug.js;h=c769875c8e17717947102333d2878d8ffecf8856;hb=3c96167464480be6d7fa2b0d6fb20adf26193ce0;hp=e9febac739b5bf2d4c6d43d6eea916cb4845a36b;hpb=37528e2dbba25db3cd2bdb8442205d5d16842635;p=roojs1

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index e9febac739..c769875c8e 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -3720,19 +3720,22 @@ Roo.extend(Roo.bootstrap.Menu, Roo.bootstrap.Component,  {
         
        // Roo.log("ADD event");
        // Roo.log(this.triggerEl.dom);
-        
-        this.triggerEl.on('click', this.onTriggerClick, this);
-        
-        this.triggerEl.on(Roo.isTouch ? 'touchstart' : 'mouseup', this.onTriggerPress, this);
-        
-	if (!this.hideTrigger) {
-	    if (this.triggerEl.hasClass('nav-item') && this.triggerEl.select('.nav-link',true).length) {
-		// dropdown toggle on the 'a' in BS4?
-		this.triggerEl.select('.nav-link',true).first().addClass('dropdown-toggle');
-	    } else {
-		this.triggerEl.addClass('dropdown-toggle');
+        if (this.triggerEl) {
+	    
+	    this.triggerEl.on('click', this.onTriggerClick, this);
+	    
+	    this.triggerEl.on(Roo.isTouch ? 'touchstart' : 'mouseup', this.onTriggerPress, this);
+	    
+	    if (!this.hideTrigger) {
+		if (this.triggerEl.hasClass('nav-item') && this.triggerEl.select('.nav-link',true).length) {
+		    // dropdown toggle on the 'a' in BS4?
+		    this.triggerEl.select('.nav-link',true).first().addClass('dropdown-toggle');
+		} else {
+		    this.triggerEl.addClass('dropdown-toggle');
+		}
 	    }
 	}
+	
         if (Roo.isTouch) {
             this.el.on('touchstart'  , this.onTouch, this);
         }
@@ -3894,7 +3897,10 @@ Roo.extend(Roo.bootstrap.Menu, Roo.bootstrap.Component,  {
         //this.el.show();
         this.hideMenuItems();
         this.hidden = false;
-        this.triggerEl.addClass('open');
+	if (this.triggerEl) {
+	    this.triggerEl.addClass('open');
+	}
+        
 	this.el.addClass('show');
         
 	
@@ -16374,7 +16380,7 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
             this.inputEl().on('mousedown', this.onTriggerClick,  this);
             this.inputEl().addClass('x-combo-noedit');
         }else{
-            this.inputEl().dom.setAttribute('readOnly', false);
+            this.inputEl().dom.removeAttribute('readOnly');
             this.inputEl().un('mousedown', this.onTriggerClick,  this);
             this.inputEl().removeClass('x-combo-noedit');
         }