Upgrade to ExtJS 3.1.0 - Released 12/16/2009

[extjs.git] / src / widgets / form / TextField.js

diff --git a/src/widgets/form/TextField.js b/src/widgets/form/TextField.js
index aed69eb..25a6df9 100644 (file)
--- a/src/widgets/form/TextField.js
+++ b/src/widgets/form/TextField.js
@@ -1,5 +1,5 @@
 /*!
 /*!

- * Ext JS Library 3.0.3
+ * Ext JS Library 3.1.0

  * Copyright(c) 2006-2009 Ext JS, LLC
  * licensing@extjs.com
  * http://www.extjs.com/license
  * Copyright(c) 2006-2009 Ext JS, LLC
  * licensing@extjs.com
  * http://www.extjs.com/license


@@ -278,10 +278,15 @@ var myField = new Ext.form.NumberField({
 
     // private
     onKeyUpBuffered : function(e){
 
     // private
     onKeyUpBuffered : function(e){

-        if(!e.isNavKeyPress()){
+        if(this.doAutoSize(e)){

             this.autoSize();
         }
     },
             this.autoSize();
         }
     },

+    
+    // private
+    doAutoSize : function(e){
+        return !e.isNavKeyPress();
+    },

 
     // private
     onKeyUp : function(e){
 
     // private
     onKeyUp : function(e){


@@ -336,12 +341,18 @@ var myField = new Ext.form.NumberField({
 
     // private
     filterKeys : function(e){
 
     // private
     filterKeys : function(e){

-        // special keys don't generate charCodes, so leave them alone
-        if(e.ctrlKey || e.isSpecialKey()){
+        if(e.ctrlKey){
+            return;
+        }
+        var k = e.getKey();
+        if(Ext.isGecko && (e.isNavKeyPress() || k == e.BACKSPACE || (k == e.DELETE && e.button == -1))){
+            return;
+        }
+        var cc = String.fromCharCode(e.getCharCode());
+        if(!Ext.isGecko && e.isSpecialKey() && !cc){

             return;
         }
             return;
         }

-        
-        if(!this.maskRe.test(String.fromCharCode(e.getCharCode()))){
+        if(!this.maskRe.test(cc)){

             e.stopEvent();
         }
     },
             e.stopEvent();
         }
     },


@@ -508,8 +519,8 @@ var myField = new Ext.form.NumberField({
         var d = document.createElement('div');
         d.appendChild(document.createTextNode(v));
         v = d.innerHTML;
         var d = document.createElement('div');
         d.appendChild(document.createTextNode(v));
         v = d.innerHTML;

-        d = null;

         Ext.removeNode(d);
         Ext.removeNode(d);

+        d = null;

         v += ' ';
         var w = Math.min(this.growMax, Math.max(this.metrics.getWidth(v) + /* add extra padding */ 10, this.growMin));
         this.el.setWidth(w);
         v += ' ';
         var w = Math.min(this.growMax, Math.max(this.metrics.getWidth(v) + /* add extra padding */ 10, this.growMin));
         this.el.setWidth(w);