sync
authorAlan Knowles <alan@akbkhome.com>
Mon, 18 Oct 2010 02:25:11 +0000 (10:25 +0800)
committerAlan Knowles <alan@akbkhome.com>
Mon, 18 Oct 2010 02:25:11 +0000 (10:25 +0800)
Roo/form/ComboBox.js
css/form.css
css/toolbard.css [deleted file]
roojs-all.js
roojs-debug.js
roojs-ui-debug.js
roojs-ui.js

index 855b21e..f1ae866 100644 (file)
@@ -999,9 +999,10 @@ Roo.extend(Roo.form.ComboBox, Roo.form.TriggerField, {
         }
         var k = String.fromCharCode(e.getKey()).toUpperCase();
         //Roo.log(k);
-        var match  = false
+        var match  = false;
+        
         this.store.each(function(v) { 
-            if (v.get(combo.displayField).substring(0,1).toUpperCase() == k) {
+            if (v.get(this.displayField) && v.get(this.displayField).substring(0,1).toUpperCase() == k) {
                 match = this.store.indexOf(v);
                 return false;
             }
@@ -1012,7 +1013,7 @@ Roo.extend(Roo.form.ComboBox, Roo.form.TriggerField, {
         }
         // scroll to?
         this.view.select(match);
-        var sn = Roo.get(combo.view.getSelectedNodes()[0])
+        var sn = Roo.get(this.view.getSelectedNodes()[0])
         sn.scrollIntoView(sn.dom.parentNode, false);
     }
 
index 89628f9..052bd99 100644 (file)
@@ -129,6 +129,10 @@ asdffff
     padding-bottom: 0px;
 }
 
+.x-form-empty-field {
+    color : #666;
+}
+
 /* ---------------------- FORM INVALID --------------------- */
 
 .x-form-invalid-icon 
diff --git a/css/toolbard.css b/css/toolbard.css
deleted file mode 100644 (file)
index 9eac4e0..0000000
+++ /dev/null
@@ -1,392 +0,0 @@
-/* ------- MAIN TOOLBAR ---------------- */
-
-.x-toolbar {\r
-       background: url(../images/default/toolbar/gray-bg.gif) repeat-x 0 0;\r
-       border-top: 1px solid #cbc7b8;
-    border-bottom: 1px solid #cbc7b8;\r
-       display: block;
-    position: relative;\r
-       padding: 2px;\r
-}
-.x-toolbar .x-btn 
-{
-    margin-left: 2px;
-    margin-right: 2px;
-}
-
-/* ------------ FONTS / colors.-----------------------*/
-.x-toolbar td,
-.x-toolbar span,
-.x-toolbar input,
-.x-toolbar div,
-.x-toolbar select,
-.x-toolbar label
-{
-       
-    font: normal 11px tahoma, verdana, helvetica;
-    white-space: nowrap;
-    line-height: normal;
-    
-}
-
-
-/* ------------ VERTICAL ALIGNMENT -----------------------*/
-.x-toolbar td
-{
-    vertical-align: middle;
-}
-
-/* ------------ TOOLBAR BUTTONS -----------------------*/
-
-.x-toolbar .x-btn-left,
-.x-toolbar .x-btn-right,
-.x-toolbar .x-btn-center
-{
-
- /*   background: none; */
-   
-}
-.x-toolbar .x-btn-center
-{
-    padding: 0px;
-}
-
-/*  ------------ TOOLBAR BUTTONS  (WITH MENU) --------- */
-.x-toolbar .x-btn-with-menu .x-btn-center em
-{
-    padding-right: 14px;
-}
-
-
-
-/* ------------ TOOLBAR ITEMS -----------------------*/
-
-.x-toolbar .ytb-text
-{
-    padding: 2px;
-}
-
-/* ------------ TOOLBAR OVER / CLICK / CENTER-----------------------*/
-
-.x-toolbar .x-btn-click .x-btn-center,
-.x-toolbar .x-btn-pressed .x-btn-center,
-.x-toolbar .x-btn-active .x-btn-center,
-.x-toolbar .x-btn-over .x-btn-center,
-
-.x-toolbar .x-btn-click .x-btn-left,
-.x-toolbar .x-btn-pressed .x-btn-left,
-.x-toolbar .x-btn-active .x-btn-left,
-.x-toolbar .x-btn-over .x-btn-left,
-
-.x-toolbar .x-btn-click .x-btn-right,
-.x-toolbar .x-btn-pressed .x-btn-right,
-.x-toolbar .x-btn-active .x-btn-right,
-.x-toolbar .x-btn-over .x-btn-right
-{
-    background-repeat: no-repeat;
-    background-image: url(../images/default/basic-dialog/btn-sprite.gif);
-    
-}
-
-.x-toolbar .x-btn-click .x-btn-center,
-.x-toolbar .x-btn-pressed .x-btn-center,
-.x-toolbar .x-btn-active .x-btn-center
-{
-    background-position:0  -42px;
-    background-repeat: repeat-x;
-}
-
-.x-toolbar .x-btn-over .x-btn-center
-{
-    background-position:  0 -105px;
-    background-repeat: repeat-x;
-} 
-
-.x-toolbar .x-btn-click .x-btn-left,
-.x-toolbar .x-btn-pressed .x-btn-left,
-.x-toolbar .x-btn-active .x-btn-left
-{
-    background-position:0  0;
-    
-}
-
-.x-toolbar .x-btn-over .x-btn-left
-{
-    background-position:  0 -63px;
-   
-} 
-
-.x-toolbar .x-btn-click .x-btn-right,
-.x-toolbar .x-btn-pressed .x-btn-right,
-.x-toolbar .x-btn-active .x-btn-right
-{
-    background-position:0  -21px;
-    
-}
-
-.x-toolbar .x-btn-over .x-btn-right
-{
-    background-position:  0 -84px;
-} 
-
-/* ------------ COMBOS/ FIELDS-----------------------*/
-.x-toolbar .x-form-text 
-{
-    height:14px;
-}
-
-
-
-/* ------------ MENUS -----------------------*/
-
-.x-menu 
-{
-    background: white url(../images/default/menu/menu-bg.gif) repeat-y 0 0;
-    font:normal 11px arial, tahoma, verdana, helvetica;
-    border: 1px solid black;
-    margin-top: 2px;
-    margin-left: 2px;
-}
-
-.x-menu-plain
-{
-    background: none;
-}
-.x-menu-plain .x-menu-list-item .x-color-palette, 
-.x-menu-plain .x-menu-list-item .x-date-picker 
-{ 
-    margin-left: 4px;
-    margin-right: 0;
-}
-.x-menu-focus
-{
-    position: absolute;
-    left: 0;
-    top: -5px;
-    width: 0;
-    height: 0;
-}
-.x-menu-list
-{
-    border: 1px solid white;
-}
-.x-menu li
-{
-    line-height; 100%;
-}
-
-.x-menu-list-item
-{
-    -moz-user-select: none;
-    display: block;
-    /* padding: 1px; */
-    white-space: nowrap;
-}
-
-
-.x-menu-item
-{
-    pointer: cursor;
-    color: #333;
-    display: block;
-    line-height: 15px;
-    outline: none;
-    padding: 3px 21px 3px 3px;
-    text-decoration:none ;
-    white-space: nowrap;
-}
-.x-menu-item-active
-{
-    background-color: #ABC9C2;
-}
-
-
-.x-menu li.x-menu-sep-li
-{
-    
-    font-size: 1px;
-    line-height: 1px;
-    background: #ccc;
-    display: block
-    height: 1px;
-    margin: 3px 3px 3px 32px;
-}
-.x-menu-item-icon
-{
-    background-position; center center;
-    border: 0px;
-    width: 16px;
-    height: 16px;
-    padding: 0px;
-    margin: 0 11px 0 0;
-    vertical-align: middle;
-    
-}
-
-
-.x-menu-list-item .x-menu-item-arrow 
-{
-    background: url(../images/default/grid/page-next.gif) no-repeat right 2px;
-}
-
-
-
-
-
-/* ------------ CHECKBOX ITEM-----------------------*/
-
-
-/* ------------ DISABLED ITEMS -----------------------*/
-.x-item-disabled .x-menu-item ,
-.x-item-disabled
-{
-    color : #ccc;
-    cursor: default !important;
-    
-}
-
-
-
-
-
-
-
-/* ------------ OLD STUFF!!! -----------------------*/
-.x-menu-check-item .x-menu-item-icon
-{
-    background: url(../images/default/menu/chk-sprite.gif) no-repeat 0 0;
-    width: 16px;
-    height: 16px;
-}
-.x-menu-item-checked .x-menu-check-item  .x-menu-item-icon
-{
-    background-position: 0 -16px;
-    width: 16px;
-    height: 16px;
-}
-
-
-
-
-/* NOT SURE WHAT THIS DOES ? - MS HACK? */
-\r
-\r
-.mso .x-toolbar, .x-grid-mso .x-toolbar
-{\r
-       border: 0px none;\r
-       background: url(../images/default/grid/mso-hd.gif);\r
-}\r
-*/
-
-
-/* disabled?? */\r
-.x-toolbar .x-tb-button-disabled .x-tb-button-inner
-{\r
-       color:gray;\r
-       cursor:default;\r
-}\r
-
-
-/* a seperator */
-
-
-
-
-
-
-
-.x-toolbar .ytb-sep {
-    background-image:url(../images/default/grid/grid-split.gif);
-    background-position:center center;
-    background-repeat:no-repeat;
-    border:0pt none;
-    cursor:default;
-    display:block;
-    font-size:1px;
-    height:16px;
-    margin:0pt 2px;
-    overflow:hidden;
-    width:4px;
-}
-
-
-
-
-\r
-/*\r
- Default button class is icon only. Add a class with a background-image property\r
- to your toolbar button\r
-*/
-/*\r
-.x-toolbar .x-tb-button-inner
-{\r
-       background-position: center;\r
-       background-repeat: no-repeat;\r
-       display: block;\r
-       height: 16px;\r
-       width: 16px;\r
-       cursor:pointer;\r
-       white-space: nowrap;\r
-}
-*/\r
-\r
-/* \r
- Button class for icon and text. Add this class and a class with a background-image \r
- to your toolbar button for both text and icon \r
-*/
-/*
-/*\r
-.x-toolbar .x-tb-text-icon
-{\r
-       background-position: 0px 0px;\r
-       background-repeat: no-repeat;\r
-       padding-left:18px;\r
-       padding-top:1px;\r
-       width:auto;\r
-       display:block;\r
-}
-*/\r
-*/\r
-/* \r
- Button class for a button with only text. Add this class  \r
- to your toolbar button for a just text button\r
-*/
-/*\r
-.x-toolbar .x-tb-text-only{\r
-       background:none;\r
-       padding-left:0px;\r
-       padding-top:1px;\r
-       width:auto;\r
-       display:block;\r
-}\r
-.x-toolbar .x-tb-text{\r
-   padding:2px;\r
-}\r
-.x-toolbar .x-tb-button{\r
-   padding:2px 3px;\r
-       display:block;\r
-}\r
-.x-toolbar .x-tb-button-over{\r
-   background:#c3d3ed url(../images/default/toolbar/btn-over-bg.gif) repeat-x;\r
-       border:1px solid #6593cf;\r
-       padding:1px 2px;\r
-}\r
-.x-toolbar .x-tb-sep {\r
-       background-image: url(../images/default/grid/grid-split.gif);\r
-       background-position: center;\r
-       background-repeat: no-repeat;\r
-       display: block;\r
-       font-size: 1px;\r
-       height: 16px;\r
-       width:4px;\r
-       overflow: hidden;\r
-       cursor:default;\r
-       margin: 0px 2px 0px;\r
-       border:0px;\r
-}\r
-.mso .x-toolbar .x-tb-sep, .x-grid-mso .x-toolbar .x-tb-sep{\r
-       background-image: url(../images/default/grid/grid-blue-split.gif);\r
-}\r
-\r
-*/
\ No newline at end of file
index 2263305..31f7631 100644 (file)
@@ -688,8 +688,8 @@ this.onLoad();}else {this.store.baseParams[this.queryParam]=q;this.store.load({p
 this.list.hide();Roo.get(document).un('mousedown',this.collapseIf,this);Roo.get(document).un('mousewheel',this.collapseIf,this);if(!this.editable){Roo.get(document).un('keydown',this.listKeyPress,this);}
 this.fireEvent('collapse',this);},collapseIf:function(e){if(!e.within(this.wrap)&&!e.within(this.list)){this.collapse();}},expand:function(){if(this.isExpanded()||!this.hasFocus){return;}
 this.list.alignTo(this.el,this.listAlign);this.list.show();Roo.get(document).on('mousedown',this.collapseIf,this);Roo.get(document).on('mousewheel',this.collapseIf,this);if(!this.editable){Roo.get(document).on('keydown',this.listKeyPress,this);}
-this.fireEvent('expand',this);},onTriggerClick:function(){if(this.disabled){return;}if(this.isExpanded()){this.collapse();if(!this.blockFocus){this.el.focus();}}else {this.hasFocus=true;if(this.triggerAction=='all'){this.doQuery(this.allQuery,true);}else {this.doQuery(this.getRawValue());}if(!this.blockFocus){this.el.focus();}}},listKeyPress:function(e){if(e.isSpecialKey()){return false;}var k=String.fromCharCode(e.getKey()).toUpperCase();var A=falsethis.store.each(function(v){if(v.get(combo.displayField).substring(0,1).toUpperCase()==k){A=this.store.indexOf(v);return false;}},this);if(A===false){return true;}
-this.view.select(A);var sn=Roo.get(combo.view.getSelectedNodes()[0])
+this.fireEvent('expand',this);},onTriggerClick:function(){if(this.disabled){return;}if(this.isExpanded()){this.collapse();if(!this.blockFocus){this.el.focus();}}else {this.hasFocus=true;if(this.triggerAction=='all'){this.doQuery(this.allQuery,true);}else {this.doQuery(this.getRawValue());}if(!this.blockFocus){this.el.focus();}}},listKeyPress:function(e){if(e.isSpecialKey()){return false;}var k=String.fromCharCode(e.getKey()).toUpperCase();var A=false;this.store.each(function(v){if(v.get(this.displayField)&&v.get(this.displayField).substring(0,1).toUpperCase()==k){A=this.store.indexOf(v);return false;}},this);if(A===false){return true;}
+this.view.select(A);var sn=Roo.get(this.view.getSelectedNodes()[0])
 sn.scrollIntoView(sn.dom.parentNode,false);}});
 Roo.form.Checkbox=function(A){Roo.form.Checkbox.superclass.constructor.call(this,A);this.addEvents({check:true});};Roo.extend(Roo.form.Checkbox,Roo.form.Field,{focusClass:undefined,fieldClass:"x-form-field",checked:false,defaultAutoCreate:{tag:"input",type:'hidden',autocomplete:"off"},boxLabel:"",inputValue:'1',valueOff:'0',actionMode:'viewEl',itemCls:'x-menu-check-item x-form-item',groupClass:'x-menu-group-item',inputType:'hidden',inSetChecked:false,inputElement:false,basedOn:false,isFormField:true,onResize:function(){Roo.form.Checkbox.superclass.onResize.apply(this,arguments);if(!this.boxLabel){this.el.alignTo(this.wrap,'c-c');}},initEvents:function(){Roo.form.Checkbox.superclass.initEvents.call(this);this.el.on("click",this.onClick,this);this.el.on("change",this.onClick,this);},getResizeEl:function(){return this.wrap;},getPositionEl:function(){return this.wrap;},onRender:function(ct,A){Roo.form.Checkbox.superclass.onRender.call(this,ct,A);this.wrap=this.el.wrap({cls:'x-menu-check-item '});var B=this.wrap.createChild({tag:'img',cls:'x-menu-item-icon',style:'margin: 0px;',src:Roo.BLANK_IMAGE_URL});this.viewEl=B;this.wrap.on('click',this.onClick,this);this.el.on('DOMAttrModified',this.setFromHidden,this);this.el.on('propertychange',this.setFromHidden,this);if(this.boxLabel){this.wrap.createChild({tag:'label',htmlFor:this.el.id,cls:'x-form-cb-label',html:this.boxLabel});}
 this.setChecked(this.checked);},initValue:Roo.emptyFn,getValue:function(){if(this.el){return String(this.el.dom.value)==String(this.inputValue)?this.inputValue:this.valueOff;}return this.valueOff;},onClick:function(){this.setChecked(!this.checked);},setValue:function(v,A){this.setChecked(String(v)===String(this.inputValue),A);},setChecked:function(A,B){if(this.inSetChecked){this.checked=A;return;}if(this.wrap){this.wrap[A?'addClass':'removeClass']('x-menu-item-checked');}
index beab373..31e93b4 100644 (file)
@@ -37775,9 +37775,10 @@ Roo.extend(Roo.form.ComboBox, Roo.form.TriggerField, {
         }
         var k = String.fromCharCode(e.getKey()).toUpperCase();
         //Roo.log(k);
-        var match  = false
+        var match  = false;
+        
         this.store.each(function(v) { 
-            if (v.get(combo.displayField).substring(0,1).toUpperCase() == k) {
+            if (v.get(this.displayField) && v.get(this.displayField).substring(0,1).toUpperCase() == k) {
                 match = this.store.indexOf(v);
                 return false;
             }
@@ -37788,7 +37789,7 @@ Roo.extend(Roo.form.ComboBox, Roo.form.TriggerField, {
         }
         // scroll to?
         this.view.select(match);
-        var sn = Roo.get(combo.view.getSelectedNodes()[0])
+        var sn = Roo.get(this.view.getSelectedNodes()[0])
         sn.scrollIntoView(sn.dom.parentNode, false);
     }
 
@@ -51467,5 +51468,4 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, {
  
 
 
-    
+   
\ No newline at end of file
index 73a453d..9508d5d 100644 (file)
@@ -23445,9 +23445,10 @@ Roo.extend(Roo.form.ComboBox, Roo.form.TriggerField, {
         }
         var k = String.fromCharCode(e.getKey()).toUpperCase();
         //Roo.log(k);
-        var match  = false
+        var match  = false;
+        
         this.store.each(function(v) { 
-            if (v.get(combo.displayField).substring(0,1).toUpperCase() == k) {
+            if (v.get(this.displayField) && v.get(this.displayField).substring(0,1).toUpperCase() == k) {
                 match = this.store.indexOf(v);
                 return false;
             }
@@ -23458,7 +23459,7 @@ Roo.extend(Roo.form.ComboBox, Roo.form.TriggerField, {
         }
         // scroll to?
         this.view.select(match);
-        var sn = Roo.get(combo.view.getSelectedNodes()[0])
+        var sn = Roo.get(this.view.getSelectedNodes()[0])
         sn.scrollIntoView(sn.dom.parentNode, false);
     }
 
index d90aa24..f3d9a2e 100644 (file)
@@ -447,8 +447,8 @@ this.onLoad();}else {this.store.baseParams[this.queryParam]=q;this.store.load({p
 this.list.hide();Roo.get(document).un('mousedown',this.collapseIf,this);Roo.get(document).un('mousewheel',this.collapseIf,this);if(!this.editable){Roo.get(document).un('keydown',this.listKeyPress,this);}
 this.fireEvent('collapse',this);},collapseIf:function(e){if(!e.within(this.wrap)&&!e.within(this.list)){this.collapse();}},expand:function(){if(this.isExpanded()||!this.hasFocus){return;}
 this.list.alignTo(this.el,this.listAlign);this.list.show();Roo.get(document).on('mousedown',this.collapseIf,this);Roo.get(document).on('mousewheel',this.collapseIf,this);if(!this.editable){Roo.get(document).on('keydown',this.listKeyPress,this);}
-this.fireEvent('expand',this);},onTriggerClick:function(){if(this.disabled){return;}if(this.isExpanded()){this.collapse();if(!this.blockFocus){this.el.focus();}}else {this.hasFocus=true;if(this.triggerAction=='all'){this.doQuery(this.allQuery,true);}else {this.doQuery(this.getRawValue());}if(!this.blockFocus){this.el.focus();}}},listKeyPress:function(e){if(e.isSpecialKey()){return false;}var k=String.fromCharCode(e.getKey()).toUpperCase();var A=falsethis.store.each(function(v){if(v.get(combo.displayField).substring(0,1).toUpperCase()==k){A=this.store.indexOf(v);return false;}},this);if(A===false){return true;}
-this.view.select(A);var sn=Roo.get(combo.view.getSelectedNodes()[0])
+this.fireEvent('expand',this);},onTriggerClick:function(){if(this.disabled){return;}if(this.isExpanded()){this.collapse();if(!this.blockFocus){this.el.focus();}}else {this.hasFocus=true;if(this.triggerAction=='all'){this.doQuery(this.allQuery,true);}else {this.doQuery(this.getRawValue());}if(!this.blockFocus){this.el.focus();}}},listKeyPress:function(e){if(e.isSpecialKey()){return false;}var k=String.fromCharCode(e.getKey()).toUpperCase();var A=false;this.store.each(function(v){if(v.get(this.displayField)&&v.get(this.displayField).substring(0,1).toUpperCase()==k){A=this.store.indexOf(v);return false;}},this);if(A===false){return true;}
+this.view.select(A);var sn=Roo.get(this.view.getSelectedNodes()[0])
 sn.scrollIntoView(sn.dom.parentNode,false);}});
 Roo.form.Checkbox=function(A){Roo.form.Checkbox.superclass.constructor.call(this,A);this.addEvents({check:true});};Roo.extend(Roo.form.Checkbox,Roo.form.Field,{focusClass:undefined,fieldClass:"x-form-field",checked:false,defaultAutoCreate:{tag:"input",type:'hidden',autocomplete:"off"},boxLabel:"",inputValue:'1',valueOff:'0',actionMode:'viewEl',itemCls:'x-menu-check-item x-form-item',groupClass:'x-menu-group-item',inputType:'hidden',inSetChecked:false,inputElement:false,basedOn:false,isFormField:true,onResize:function(){Roo.form.Checkbox.superclass.onResize.apply(this,arguments);if(!this.boxLabel){this.el.alignTo(this.wrap,'c-c');}},initEvents:function(){Roo.form.Checkbox.superclass.initEvents.call(this);this.el.on("click",this.onClick,this);this.el.on("change",this.onClick,this);},getResizeEl:function(){return this.wrap;},getPositionEl:function(){return this.wrap;},onRender:function(ct,A){Roo.form.Checkbox.superclass.onRender.call(this,ct,A);this.wrap=this.el.wrap({cls:'x-menu-check-item '});var B=this.wrap.createChild({tag:'img',cls:'x-menu-item-icon',style:'margin: 0px;',src:Roo.BLANK_IMAGE_URL});this.viewEl=B;this.wrap.on('click',this.onClick,this);this.el.on('DOMAttrModified',this.setFromHidden,this);this.el.on('propertychange',this.setFromHidden,this);if(this.boxLabel){this.wrap.createChild({tag:'label',htmlFor:this.el.id,cls:'x-form-cb-label',html:this.boxLabel});}
 this.setChecked(this.checked);},initValue:Roo.emptyFn,getValue:function(){if(this.el){return String(this.el.dom.value)==String(this.inputValue)?this.inputValue:this.valueOff;}return this.valueOff;},onClick:function(){this.setChecked(!this.checked);},setValue:function(v,A){this.setChecked(String(v)===String(this.inputValue),A);},setChecked:function(A,B){if(this.inSetChecked){this.checked=A;return;}if(this.wrap){this.wrap[A?'addClass':'removeClass']('x-menu-item-checked');}