dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1088 from niphlod/fix/1083

Browse Source 
fixes #1083
This commit is contained in:
mdipierro
2015-10-30 23:07:58 -05:00
parent 935c95ccfc 12f848c899
commit fb6fa0c448
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/welcome/static/js/web2py-bootstrap3.js
+2 -2
View File
@@ -6,9 +6,9 @@
* this over and over... all will be bound to the document * this over and over... all will be bound to the document
*/ */
/*adds btn class to buttons*/ /*adds btn class to buttons*/
$('button', target).addClass('btn btn-default'); $('button:not([class^="btn"])', target).addClass('btn btn-default');
$("p.w2p-autocomplete-widget input").addClass('form-control'); $("p.w2p-autocomplete-widget input").addClass('form-control');
$('form input[type="submit"], form input[type="button"]', target).addClass('btn btn-default'); $('form input[type="submit"]:not([class^="btn"]), form input[type="button"]:not([class^="btn"])', target).addClass('btn btn-default');
/* javascript for PasswordWidget*/ /* javascript for PasswordWidget*/
$('input[type=password][data-w2p_entropy]', target).each(function() { $('input[type=password][data-w2p_entropy]', target).each(function() {
web2py.validate_entropy($(this)); web2py.validate_entropy($(this));
applications/welcome/static/js/web2py.js
+2 -2
View File
@@ -75,8 +75,8 @@
* this over and over... all will be bound to the document * this over and over... all will be bound to the document
*/ */
/*adds btn class to buttons*/ /*adds btn class to buttons*/
$('button', target).addClass('btn'); $('button:not([class^="btn"])', target).addClass('btn');
$('form input[type="submit"], form input[type="button"]', target).addClass('btn'); $('form input[type="submit"]:not([class^="btn"]), form input[type="button"]:not([class^="btn"])', target).addClass('btn');
/* javascript for PasswordWidget*/ /* javascript for PasswordWidget*/
$('input[type=password][data-w2p_entropy]', target).each(function() { $('input[type=password][data-w2p_entropy]', target).each(function() {
web2py.validate_entropy($(this)); web2py.validate_entropy($(this));