roojs-bootstrap.js

roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 8e779fc..45b7bf1 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -26072,28 +26072,30 @@ Roo.extend(Roo.bootstrap.form.Password, Roo.bootstrap.form.Input, {
 
         this.el.addClass('form-password');
 
-        this.inputEl().addClass('password-hidden');
+        this.toggleEl().addClass('password-hidden');
 
-        this.inputEl().on('click', this.onPasswordClick, this);
+        this.toggleEl().on('click', this.onToggleClick, this);;
     },
 
-    onPasswordClick : function(e) 
+    toggleEl: function()
     {
-        var input = this.inputEl();
+        return this.el.select('button.password-toggle',true).first();
+    },
 
-        if(e.getPageX() < input.getX() + input.getWidth() - 30) {
-            return;
-        }
+    onToggleClick : function(e) 
+    {
+        var input = this.inputEl();
+        var toggle = this.toggleEl();
 
-        input.removeClass(['password-visible', 'password-hidden']);
+        toggle.removeClass(['password-visible', 'password-hidden']);
 
         if(input.attr('type') == 'password') {
             input.attr('type', 'text');
-            input.addClass('password-visible');
+            toggle.addClass('password-visible');
         }
         else {
             input.attr('type', 'password');
-            input.addClass('password-hidden');
+            toggle.addClass('password-hidden');
         }
     }
 });Roo.rtf = {}; // namespace

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 633031a..0b329a2 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -1115,9 +1115,9 @@ break;}}}var E=0;for(var D=0;D<B.length;++D){if(B[D].fResult){++E;}}if(E<nb){ret
 },ClientSideWeakPassword:function(A){return this.IsLongEnough(A,6)||!this.IsLongEnough(A,0);}});
 // Roo/bootstrap/form/Password.js
 Roo.bootstrap.form.Password=function(A){Roo.bootstrap.form.Password.superclass.constructor.call(this,A);this.inputType='password';};Roo.extend(Roo.bootstrap.form.Password,Roo.bootstrap.form.Input,{getAutoCreate:function(){this.after={xns:Roo.bootstrap,xtype:'Button',cls:'password-toggle'}
-;return Roo.bootstrap.form.Password.superclass.getAutoCreate.call(this);},initEvents:function(){Roo.bootstrap.form.Password.superclass.initEvents.call(this);this.el.addClass('form-password');this.inputEl().addClass('password-hidden');this.inputEl().on('click',this.onPasswordClick,this);
-},onPasswordClick:function(e){var A=this.inputEl();if(e.getPageX()<A.getX()+A.getWidth()-30){return;}A.removeClass(['password-visible','password-hidden']);if(A.attr('type')=='password'){A.attr('type','text');A.addClass('password-visible');}else{A.attr('type','password');
-A.addClass('password-hidden');}}});
+;return Roo.bootstrap.form.Password.superclass.getAutoCreate.call(this);},initEvents:function(){Roo.bootstrap.form.Password.superclass.initEvents.call(this);this.el.addClass('form-password');this.toggleEl().addClass('password-hidden');this.toggleEl().on('click',this.onToggleClick,this);
+;},toggleEl:function(){return this.el.select('button.password-toggle',true).first();},onToggleClick:function(e){var A=this.inputEl();var B=this.toggleEl();B.removeClass(['password-visible','password-hidden']);if(A.attr('type')=='password'){A.attr('type','text');
+B.addClass('password-visible');}else{A.attr('type','password');B.addClass('password-hidden');}}});
 // Roo/rtf/namespace.js
 Roo.rtf={};
 // Roo/rtf/Hex.js