widgets/SecurePass.js

[Pman.Core] / widgets / SecurePass.js

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