]> source.dussan.org Git - jquery-ui.git/commitdiff
projects / jquery-ui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c5d6ea4)
Button: address review comments
authorAlexander Schmitz <arschmitz@gmail.com>
Wed, 16 Sep 2015 05:48:03 +0000 (01:48 -0400)
committerAlexander Schmitz <arschmitz@gmail.com>
Thu, 8 Oct 2015 18:02:57 +0000 (14:02 -0400)
demos/button/icons.html patch | blob | history
tests/visual/button/button.html [deleted file] patch | blob | history
tests/visual/button/performance.html [deleted file] patch | blob | history
themes/base/button.css patch | blob | history
ui/widgets/button.js patch | blob | history

diff --git a/demos/button/icons.html b/demos/button/icons.html
index af4e3000cda6660279371a04f54fd14125f8fd6a..f3d4a385211f5ec1fb3f92111732a1dc82691aad 100644 (file)
--- 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 (file)
index bb80d8a..0000000
--- 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 (file)
index 0d807d1..0000000
--- 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 599b5ea6a5540e6b479f3af40ffd3b41c4fa7d27..4a3a57d484cbd0c768274efccda2ab2942029b0a 100644 (file)
--- 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 2e6cc1f3c635e872ddd4171ff21238a1b0622e5d..34a2afa407ddb0b38c0bbb9bd2ca83693910afc5 100644 (file)
--- 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 ) {
The official jQuery user interface library: https://github.com/jquery/jquery-ui