Roo/data/Store.js

roojs-bootstrap.js
roojs-bootstrap-debug.js

diff --git a/Roo/data/Store.js b/Roo/data/Store.js
index d96ad69..4a81d0d 100644 (file)
--- a/Roo/data/Store.js
+++ b/Roo/data/Store.js
@@ -341,6 +341,7 @@ Roo.extend(Roo.data.Store, Roo.util.Observable, {
      * </ul>
      */
     load : function(options){
+        Roo.log(options);
         options = options || {};
         if(this.fireEvent("beforeload", this, options) !== false){
             this.storeOptions(options);

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 91a4845..e0e1205 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -11017,6 +11017,7 @@ Roo.extend(Roo.data.Store, Roo.util.Observable, {
      * </ul>
      */
     load : function(options){
+        Roo.log(options);
         options = options || {};
         if(this.fireEvent("beforeload", this, options) !== false){
             this.storeOptions(options);
@@ -37913,6 +37914,8 @@ Roo.bootstrap.PhoneInput = function(config) {
 
 Roo.extend(Roo.bootstrap.PhoneInput, Roo.bootstrap.TriggerField,  {
         
+        triggerList : true,
+        
         getAutoCreate : function()
         {
             var align = this.labelAlign || this.parentLabelAlign();
@@ -38061,18 +38064,49 @@ Roo.extend(Roo.bootstrap.PhoneInput, Roo.bootstrap.TriggerField,  {
             
             this.trigger = this.el.select('div.flag-container',true).first();
             this.trigger.on("click", this.onTriggerClick, this, {preventDefault:true});
-        }
-        /*
-        createList : function()
+        },
+        
+        onTriggerClick : function(e)
         {
-            this.list = Roo.get(document.body).createChild({
-                tag: 'ul',
-                cls: 'typeahead typeahead-long dropdown-menu',
-                style: 'display:none'
-            });
-            this.list.setVisibilityMode(Roo.Element.DISPLAY).originalDisplay = 'block';
+            Roo.log('trigger click');
+            
+            if(this.disabled || !this.triggerList){
+                return;
+            }
+            
+            this.page = 0;
+            this.loadNext = false;
+            
+            if(this.isExpanded()){
+                this.collapse();
+            }else {
+                this.hasFocus = true;
+                if(this.triggerAction == 'all') {
+                    //???
+                    this.doQuery(this.allQuery, true);
+                } else {
+                    this.doQuery(this.getRawValue());
+                }
+                if (!this.blockFocus) {
+                    this.inputEl().focus();
+                }
+            }
         },
         
-        onTriggerClick : Roo.emptyFn
-        */
+        isExpanded : function(){
+            return this.list.isVisible();
+        },
+        
+        collapse : function(){
+            if(!this.isExpanded()){
+                return;
+            }
+            this.list.hide();
+            this.hasFocus = false;
+            Roo.get(document).un('mousedown', this.collapseIf, this);
+            Roo.get(document).un('mousewheel', this.collapseIf, this);
+            this.fireEvent('collapse', this);
+            
+            this.validate();
+        }
 });
\ No newline at end of file

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 88f89f7..b6eea8b 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -435,7 +435,7 @@ this.proxy.xmodule=this.xmodule||false;this.relayEvents(this.proxy,["loadexcepti
 for(var i=0,B=A.length;i<B;i++){A[i].join(this);}var C=this.data.length;this.data.addAll(A);this.fireEvent("add",this,A,C);},remove:function(A){var B=this.data.indexOf(A);this.data.removeAt(B);if(this.pruneModifiedRecords){this.modified.remove(A);}this.fireEvent("remove",this,A,B);
 },removeAll:function(){this.data.clear();if(this.pruneModifiedRecords){this.modified=[];}this.fireEvent("clear",this);},insert:function(A,B){B=[].concat(B);for(var i=0,C=B.length;i<C;i++){this.data.insert(A,B[i]);B[i].join(this);}this.fireEvent("add",this,B,A);
 },indexOf:function(A){return this.data.indexOf(A);},indexOfId:function(id){return this.data.indexOfKey(id);},getById:function(id){return this.data.key(id);},getAt:function(A){return this.data.itemAt(A);},getRange:function(A,B){return this.data.getRange(A,B);
-},storeOptions:function(o){o=Roo.apply({},o);delete o.callback;delete o.scope;this.lastOptions=o;},load:function(A){A=A||{};if(this.fireEvent("beforeload",this,A)!==false){this.storeOptions(A);var p=Roo.apply(A.params||{},this.baseParams);if(!this.reader.metaFromRemote){p._requestMeta=1;
+},storeOptions:function(o){o=Roo.apply({},o);delete o.callback;delete o.scope;this.lastOptions=o;},load:function(A){Roo.log(A);A=A||{};if(this.fireEvent("beforeload",this,A)!==false){this.storeOptions(A);var p=Roo.apply(A.params||{},this.baseParams);if(!this.reader.metaFromRemote){p._requestMeta=1;
 }if(this.sortInfo&&this.remoteSort){var pn=this.paramNames;p[pn["sort"]]=this.sortInfo.field;p[pn["dir"]]=this.sortInfo.direction;}if(this.multiSort){var pn=this.paramNames;p[pn["multisort"]]=Roo.encode({sort:this.sortToggle,order:this.sortOrder});}this.proxy.load(p,this.reader,this.loadRecords,this,A);
 }},reload:function(A){this.load(Roo.applyIf(A||{},this.lastOptions));},loadRecords:function(o,A,B){if(!o||B===false){if(B!==false){this.fireEvent("load",this,[],A,o);}if(A.callback){A.callback.call(A.scope||this,[],A,false);}return;}if(o.success===false){if(!this.hasListener('loadexception')&&typeof(o.raw.errorMsg)!='undefined'){Roo.MessageBox.alert("Error loading",o.raw.errorMsg);
 }this.fireEvent("loadexception",this,o,A,o.raw.errorMsg);return;}var r=o.records,t=o.totalRecords||r.length;this.fireEvent("beforeloadadd",this,r,A,o);if(!A||A.add!==true){if(this.pruneModifiedRecords){this.modified=[];}for(var i=0,C=r.length;i<C;i++){r[i].join(this);
@@ -1599,10 +1599,13 @@ this.pnode.addClass("disabled");}},enable:function(){this.disabled=false;this.pn
 }},refresh:function(){if(this.refreshDelegate){this.loaded=false;this.refreshDelegate();}},_setLoaded:function(){this.loaded=true;},closeClick:function(e){var o={};e.stopEvent();this.fireEvent("beforeclose",this,o);if(o.cancel!==true){this.tabPanel.removeTab(this.id);
 }},closeText:"Close this tab"});
 // Roo/bootstrap/PhoneInput.js
-Roo.bootstrap.PhoneInput=function(A){Roo.bootstrap.PhoneInput.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.PhoneInput,Roo.bootstrap.TriggerField,{getAutoCreate:function(){var A=this.labelAlign||this.parentLabelAlign();var id=Roo.id();var B={cls:'form-group',cn:[]}
-;var C={tag:'input',id:id,type:'tel',cls:'form-control tel-input',autocomplete:'new-password'};if(this.name){C.name=this.name;}if(this.disabled){C.disabled=true;}var D={tag:'div',cls:'flag-container',cn:[{tag:'div',cls:'flag'},{tag:'div',cls:'caret'}]};var E={tag:'div',cls:this.hasFeedback?'has-feedback':'',cn:[C]}
-;var F={cls:'roo-select2-container input-group',cn:[D,E]};if(this.fieldLabel.length){var G={tag:'i',tooltip:'This field is required'};var H={tag:'label','for':id,cls:'control-label',cn:[]};var I={tag:'span',html:this.fieldLabel};G.cls='roo-required-indicator text-danger fa fa-lg fa-star left-indicator';
-H.cn=[G,I];if(this.indicatorpos=='right'){G.cls='roo-required-indicator text-danger fa fa-lg fa-star right-indicator';H.cn=[I,G];}if(A=='left'){F={tag:'div',cn:[F]};if(this.labelWidth>12){H.style="width: "+this.labelWidth+'px';}if(this.labelWidth<13&&this.labelmd==0){this.labelmd=this.labelWidth;
-}if(this.labellg>0){H.cls+=' col-lg-'+this.labellg;C.cls+=' col-lg-'+(12-this.labellg);}if(this.labelmd>0){H.cls+=' col-md-'+this.labelmd;F.cls+=' col-md-'+(12-this.labelmd);}if(this.labelsm>0){H.cls+=' col-sm-'+this.labelsm;F.cls+=' col-sm-'+(12-this.labelsm);
-}if(this.labelxs>0){H.cls+=' col-xs-'+this.labelxs;F.cls+=' col-xs-'+(12-this.labelxs);}}}B.cn=[H,F];var J=this;['xs','sm','md','lg'].map(function(K){if(J[K]){B.cls+=' col-'+K+'-'+J[K];}});return B;},initEvents:function(){this.createList();Roo.bootstrap.PhoneInput.superclass.initEvents.call(this);
-this.trigger=this.el.select('div.flag-container',true).first();this.trigger.on("click",this.onTriggerClick,this,{preventDefault:true});}});
+Roo.bootstrap.PhoneInput=function(A){Roo.bootstrap.PhoneInput.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.PhoneInput,Roo.bootstrap.TriggerField,{triggerList:true,getAutoCreate:function(){var A=this.labelAlign||this.parentLabelAlign();var id=Roo.id();
+var B={cls:'form-group',cn:[]};var C={tag:'input',id:id,type:'tel',cls:'form-control tel-input',autocomplete:'new-password'};if(this.name){C.name=this.name;}if(this.disabled){C.disabled=true;}var D={tag:'div',cls:'flag-container',cn:[{tag:'div',cls:'flag'}
+,{tag:'div',cls:'caret'}]};var E={tag:'div',cls:this.hasFeedback?'has-feedback':'',cn:[C]};var F={cls:'roo-select2-container input-group',cn:[D,E]};if(this.fieldLabel.length){var G={tag:'i',tooltip:'This field is required'};var H={tag:'label','for':id,cls:'control-label',cn:[]}
+;var I={tag:'span',html:this.fieldLabel};G.cls='roo-required-indicator text-danger fa fa-lg fa-star left-indicator';H.cn=[G,I];if(this.indicatorpos=='right'){G.cls='roo-required-indicator text-danger fa fa-lg fa-star right-indicator';H.cn=[I,G];}if(A=='left'){F={tag:'div',cn:[F]}
+;if(this.labelWidth>12){H.style="width: "+this.labelWidth+'px';}if(this.labelWidth<13&&this.labelmd==0){this.labelmd=this.labelWidth;}if(this.labellg>0){H.cls+=' col-lg-'+this.labellg;C.cls+=' col-lg-'+(12-this.labellg);}if(this.labelmd>0){H.cls+=' col-md-'+this.labelmd;
+F.cls+=' col-md-'+(12-this.labelmd);}if(this.labelsm>0){H.cls+=' col-sm-'+this.labelsm;F.cls+=' col-sm-'+(12-this.labelsm);}if(this.labelxs>0){H.cls+=' col-xs-'+this.labelxs;F.cls+=' col-xs-'+(12-this.labelxs);}}}B.cn=[H,F];var J=this;['xs','sm','md','lg'].map(function(K){if(J[K]){B.cls+=' col-'+K+'-'+J[K];
+}});return B;},initEvents:function(){this.createList();Roo.bootstrap.PhoneInput.superclass.initEvents.call(this);this.trigger=this.el.select('div.flag-container',true).first();this.trigger.on("click",this.onTriggerClick,this,{preventDefault:true});},onTriggerClick:function(e){Roo.log('trigger click');
+if(this.disabled||!this.triggerList){return;}this.page=0;this.loadNext=false;if(this.isExpanded()){this.collapse();}else{this.hasFocus=true;if(this.triggerAction=='all'){this.doQuery(this.allQuery,true);}else{this.doQuery(this.getRawValue());}if(!this.blockFocus){this.inputEl().focus();
+}}},isExpanded:function(){return this.list.isVisible();},collapse:function(){if(!this.isExpanded()){return;}this.list.hide();this.hasFocus=false;Roo.get(document).un('mousedown',this.collapseIf,this);Roo.get(document).un('mousewheel',this.collapseIf,this);
+this.fireEvent('collapse',this);this.validate();}});