Roo/bootstrap/ComboBox.js

[roojs1] / Roo / bootstrap / ComboBox.js

diff --git a/Roo/bootstrap/ComboBox.js b/Roo/bootstrap/ComboBox.js
index 266c1e0..ee0c049 100644 (file)
--- a/Roo/bootstrap/ComboBox.js
+++ b/Roo/bootstrap/ComboBox.js
@@ -106,8 +106,13 @@ Roo.bootstrap.ComboBox = function(config){
             * @param {Roo.bootstrap.ComboBox} combo This combo box
             * @param {Object} cfg set html .
             */
-        'touchviewdisplay' : true
-        
+        'touchviewdisplay' : true,
+        /**
+         * @event ontouchviewload
+         * Fires when touch view load (local store)
+         * @param {Roo.bootstrap.ComboBox} combo This combo box
+        */
+        'ontouchviewload' : true
     });
     
     this.item = [];
@@ -960,11 +965,16 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
         this.list.on('scroll', this.onViewScroll, this);
         
         if(!this.tpl){
-            this.tpl = '<li class="roo-select2-result"><div class="checkbox"><input id="{roo-id}" type="checkbox" {roo-data-checked}><label for="{roo-id}"><b>{' + this.displayField + '}</b></label></div></li>';
+            this.tpl = '<li class="roo-select2-result"><div class="checkbox"><input id="{roo-id}"' + 
+                'type="checkbox" {roo-data-checked}><label for="{roo-id}"><b>{' + this.displayField + '}</b></label></div></li>';
         }
 
         this.view = new Roo.View(this.list, this.tpl, {
-            singleSelect:true, tickable:true, parent:this, store: this.store, selectedClass: this.selectedClass
+            singleSelect:true,
+            tickable:true,
+            parent:this,
+            store: this.store,
+            selectedClass: this.selectedClass
         });
         
         //this.view.wrapEl.setDisplayed(false);
@@ -2130,7 +2140,7 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
     
     validate : function()
     {
-        if(this.getVisibilityEl().hasClass('hidden') || !this.getVisibilityEl().isVisible()){
+        if(this.getVisibilityEl().hasClass('hidden')){
             return true;
         }
         
@@ -2721,6 +2731,8 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
             (function() { firstChecked.findParent('li').scrollIntoView(_this.touchViewListGroup.dom); }).defer(500);
         }
         
+        this.fireEvent('ontouchviewload', this);
+        
     },
     
     onTouchViewLoadException : function()