diff options
| author | Alexander Schmitz <arschmitz@gmail.com> | 2015-09-16 01:48:03 -0400 |
|---|---|---|
| committer | Alexander Schmitz <arschmitz@gmail.com> | 2015-10-08 14:02:57 -0400 |
| commit | 197061be5645fd3e9b521e63ecbd13630612d8c7 (patch) | |
| tree | 861f044d084b49909db44b114be279ebfd6c9387 | |
| parent | c5d6ea4baae74f54ab5f44239e9239a61a5f0ce9 (diff) | |
| download | jquery-ui-197061be5645fd3e9b521e63ecbd13630612d8c7.tar.gz jquery-ui-197061be5645fd3e9b521e63ecbd13630612d8c7.zip | |
Button: address review comments
| -rw-r--r-- | demos/button/icons.html | 14 | ||||
| -rw-r--r-- | tests/visual/button/button.html | 67 | ||||
| -rw-r--r-- | tests/visual/button/performance.html | 21 | ||||
| -rw-r--r-- | themes/base/button.css | 2 | ||||
| -rw-r--r-- | ui/widgets/button.js | 3 |
5 files changed, 10 insertions, 97 deletions
diff --git a/demos/button/icons.html b/demos/button/icons.html index af4e3000c..f3d4a3852 100644 --- a/demos/button/icons.html +++ b/demos/button/icons.html @@ -8,20 +8,20 @@ <link rel="stylesheet" href="../demos.css"> <script src="../../external/requirejs/require.js"></script> <script src="../bootstrap.js"> - $( ".widget button" ).first() - .button() - .next().button( { + $( ".widget button" ) + .eq( 0 ).button() + .end().eq( 1 ).button( { icon: "ui-icon-gear", showLabel: false - } ).next().button( { + } ).end().eq( 2 ).button( { icon: "ui-icon-gear" - } ).next().button( { + } ).end().eq( 3 ).button( { icon: "ui-icon-gear", iconPosition: "end" - } ).next().button( { + } ).end().eq( 4 ).button( { icon: "ui-icon-gear", iconPosition: "top" - } ).next().button( { + } ).end().eq( 5 ).button( { icon: "ui-icon-gear", iconPosition: "bottom" } ); diff --git a/tests/visual/button/button.html b/tests/visual/button/button.html deleted file mode 100644 index bb80d8a85..000000000 --- a/tests/visual/button/button.html +++ /dev/null @@ -1,67 +0,0 @@ -<!doctype html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <title>Button Visual Test</title> - <link rel="stylesheet" href="../../../themes/base/all.css"> - <script src="../../../external/requirejs/require.js"></script> - <script src="../../../demos/bootstrap.js"> - $( ".buttons" ).each(function() { - $( this ).children() - .eq( 0 ) - .button({ - showLabel: false, - icon: "ui-icon-help" - }) - .end() - .eq( 1 ) - .button({ - icon: "ui-icon-help", - disabled: true - }) - .end() - .eq( 2 ) - .button(); - }); - </script> -</head> -<body> - -<div class="buttons"> - <button>button</button> - <button>button</button> - <button>button</button> -</div> - -<div class="buttons"> - <button type="button">button button</button> - <button type="button">button button</button> - <button type="button">button button</button> -</div> - -<div class="buttons"> - <button type="submit">button submit</button> - <button type="submit">button submit</button> - <button type="submit">button submit</button> -</div> - -<div class="buttons"> - <input type="button" value="input button"> - <input type="button" value="input button"> - <input type="button" value="input button"> -</div> - -<div class="buttons"> - <input type="submit" value="input submit"> - <input type="submit" value="input submit"> - <input type="submit" value="input submit"> -</div> - -<div class="buttons"> - <a href="#">anchor</a> - <a href="#">anchor</a> - <a href="#">anchor</a> -</div> - -</body> -</html> diff --git a/tests/visual/button/performance.html b/tests/visual/button/performance.html deleted file mode 100644 index 0d807d167..000000000 --- a/tests/visual/button/performance.html +++ /dev/null @@ -1,21 +0,0 @@ -<!doctype html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <title>Button Visual Test: Initialization Performance</title> - <link rel="stylesheet" href="../../../themes/base/all.css"> - <script src="../../../external/requirejs/require.js"></script> - <script src="../../../demos/bootstrap.js"> - var start, - html = new Array( 500 ).join( "<button>button</button>" ); - $( html ).appendTo( "body" ); - - start = $.now(); - $( "button" ).button(); - $( "<p>" ).text( "Time to initialize: " + ($.now() - start) + "ms" ).prependTo( "body" ); - </script> -</head> -<body> - -</body> -</html> diff --git a/themes/base/button.css b/themes/base/button.css index 599b5ea6a..4a3a57d48 100644 --- a/themes/base/button.css +++ b/themes/base/button.css @@ -74,7 +74,7 @@ input.ui-button.ui-icon-notext .ui-icon { } /* workarounds */ -/* Support: FireFox >= 4 */ +/* Support: Firefox 5 - 40 */ input.ui-button::-moz-focus-inner, button.ui-button::-moz-focus-inner { border: 0; diff --git a/ui/widgets/button.js b/ui/widgets/button.js index 2e6cc1f3c..34a2afa40 100644 --- a/ui/widgets/button.js +++ b/ui/widgets/button.js @@ -12,7 +12,8 @@ //>>description: Enhances a form with themeable buttons. //>>docs: http://api.jqueryui.com/button/ //>>demos: http://jqueryui.com/button/ -//>>css.structure: ../themes/base/core.css, ../themes/base/button.css +//>>css.structure: ../themes/base/core.css +//>>css.structure: ../themes/base/button.css //>>css.theme: ../themes/base/theme.css ( function( factory ) { |