From: Michael <michael@roojs.com>
Date: Thu, 5 Feb 2015 10:46:35 +0000 (+0800)
Subject: Roo/bootstrap/ComboBox.js
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=d9de0eb59273a3586087fc24cfdabe6cfc6c0cc7

Roo/bootstrap/ComboBox.js
---

diff --git a/Roo/bootstrap/ComboBox.js b/Roo/bootstrap/ComboBox.js
index e97c140315..fdd714428e 100644
--- a/Roo/bootstrap/ComboBox.js
+++ b/Roo/bootstrap/ComboBox.js
@@ -1433,7 +1433,7 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
     {
         Roo.log('trigger click');
         
-        if(this.disabled){
+        if(this.disabled || this.editNotList){
             return;
         }