From 12f848c899acdad7a25de9d708fdc08bdd82f250 Mon Sep 17 00:00:00 2001 From: niphlod Date: Mon, 19 Oct 2015 21:50:34 +0200 Subject: [PATCH] fixes #1083 --- applications/welcome/static/js/web2py-bootstrap3.js | 4 ++-- applications/welcome/static/js/web2py.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/applications/welcome/static/js/web2py-bootstrap3.js b/applications/welcome/static/js/web2py-bootstrap3.js index 4716f44a..f988cc20 100644 --- a/applications/welcome/static/js/web2py-bootstrap3.js +++ b/applications/welcome/static/js/web2py-bootstrap3.js @@ -6,9 +6,9 @@ * this over and over... all will be bound to the document */ /*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'); - $('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*/ $('input[type=password][data-w2p_entropy]', target).each(function() { web2py.validate_entropy($(this)); diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js index 2e77bfeb..486a2642 100644 --- a/applications/welcome/static/js/web2py.js +++ b/applications/welcome/static/js/web2py.js @@ -75,8 +75,8 @@ * this over and over... all will be bound to the document */ /*adds btn class to buttons*/ - $('button', target).addClass('btn'); - $('form input[type="submit"], form input[type="button"]', target).addClass('btn'); + $('button:not([class^="btn"])', target).addClass('btn'); + $('form input[type="submit"]:not([class^="btn"]), form input[type="button"]:not([class^="btn"])', target).addClass('btn'); /* javascript for PasswordWidget*/ $('input[type=password][data-w2p_entropy]', target).each(function() { web2py.validate_entropy($(this));