widgets/SecurePass.js

[Pman.Core] / widgets / SecurePass.js

diff --git a/widgets/SecurePass.js b/widgets/SecurePass.js
index 006df22..a529945 100644 (file)
--- a/widgets/SecurePass.js
+++ b/widgets/SecurePass.js
@@ -75,9 +75,6 @@ Ext.extend(Ext.form.SecurePass, Ext.form.TextField, {
         
             if(this.el.is('input[type=password]') && Roo.isSafari){
                 this.el.on('keydown', this.SafariOnKeyDown, this);
-//                this.el.on("focus", function(){
-//                    this.setValue('');
-//                }, this);
             }
 
             this.el.on('keyup', this.checkStrength, this, {buffer:50});
@@ -299,10 +296,13 @@ Ext.extend(Ext.form.SecurePass, Ext.form.TextField, {
         
     // private
         SafariOnKeyDown : function(event){
-            var isSelectAll = this.el.dom.selectionEnd - this.el.dom.selectionStart - this.getValue().length;
-            if(((event.getKey() == 8 || event.getKey() == 46) && this.getValue().length ==1) || isSelectAll == 0){ // backspace and delete key
+            var isSelectAll = false;
+            if(this.el.dom.selectionEnd > 0){
+                isSelectAll = (this.el.dom.selectionEnd - this.el.dom.selectionStart - this.getValue().length == 0) ? true : false;
+            }
+            if(((event.getKey() == 8 || event.getKey() == 46) && this.getValue().length ==1) || isSelectAll){ // backspace and delete key
                 event.preventDefault();
-                this.setValue('');
+                this.setValue(event.getKey());
             };
         }
 })
\ No newline at end of file