From 02033262ee0fb1d9f33c361b3c2ddfa168604854 Mon Sep 17 00:00:00 2001 From: Alexander Schmitz Date: Wed, 22 Jan 2014 12:02:32 -0500 Subject: Button: Initial commit of button re-factor Move to using element stats rather then js class states remove ui-button-text spans. Removed button set --- demos/button/checkbox.html | 38 ---------------------- demos/button/default.html | 28 +++++++++++------ demos/button/icons.html | 78 +++++++++++++++++++++++++++++----------------- demos/button/index.html | 4 --- demos/button/radio.html | 33 -------------------- 5 files changed, 67 insertions(+), 114 deletions(-) delete mode 100644 demos/button/checkbox.html delete mode 100644 demos/button/radio.html (limited to 'demos/button') diff --git a/demos/button/checkbox.html b/demos/button/checkbox.html deleted file mode 100644 index 87abbf90f..000000000 --- a/demos/button/checkbox.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - jQuery UI Button - Checkboxes - - - - - - - - - - - - - -
- - - -
- -
-

A checkbox is styled as a toggle button with the button widget. The label element associated with the checkbox is used for the button text.

-

This demo also demonstrates three checkboxes styled as a button set by calling .buttonset() on a common container.

-
- - diff --git a/demos/button/default.html b/demos/button/default.html index 88c666e9a..5418fd8c9 100644 --- a/demos/button/default.html +++ b/demos/button/default.html @@ -11,25 +11,33 @@ +
+

Widget Buttons

+ - + - + An anchor +
+

CSS Buttons

+ + + -An anchor +An anchor

Examples of the markup that can be used for buttons: A button element, an input of type submit and an anchor.

+

Buttons can be styled via the button widget or by adding the classes yourself. This avoids the JavaScript overhead if you don't need any of the methods provided by the button widget.

diff --git a/demos/button/icons.html b/demos/button/icons.html index 0744218b2..f0b0f90fb 100644 --- a/demos/button/icons.html +++ b/demos/button/icons.html @@ -11,38 +11,58 @@ - - - - - - +
+

Widget

+ + + + + + +
+
+

CSS

+ + + + + + +

Some buttons with various combinations of text and icons.

diff --git a/demos/button/index.html b/demos/button/index.html index 5e1b8b7b3..55eacffd8 100644 --- a/demos/button/index.html +++ b/demos/button/index.html @@ -9,11 +9,7 @@ diff --git a/demos/button/radio.html b/demos/button/radio.html deleted file mode 100644 index 86c55a39a..000000000 --- a/demos/button/radio.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - jQuery UI Button - Radios - - - - - - - - - - -
-
- - - -
-
- -
-

A set of three radio buttons transformed into a button set.

-
- - -- cgit v1.2.3 From 40a9d1dfdb6a341904ae7bcd4600b0ef201d14df Mon Sep 17 00:00:00 2001 From: Alexander Schmitz Date: Fri, 22 Aug 2014 23:39:35 -0400 Subject: Controlgroup: Inital commit of new widget This widget replaces the buttonset widget --- demos/button/icons.html | 1 + demos/controlgroup/default.html | 23 ++- demos/controlgroup/index.html | 2 +- demos/controlgroup/splitbutton.html | 23 ++- demos/controlgroup/toolbar.html | 140 +++++++++--------- demos/index.html | 1 + demos/tooltip/video-player.html | 8 +- tests/unit/controlgroup/common.js | 26 ++++ tests/unit/controlgroup/controlgroup.html | 39 +++++ tests/unit/controlgroup/controlgroup_core.js | 77 ++++++++++ tests/unit/controlgroup/core.js | 69 +++++++++ tests/unit/controlgroup/methods.js | 150 ++++++++++++++++++++ tests/unit/controlgroup/options.js | 108 ++++++++++++++ tests/unit/index.html | 1 + themes/base/base.css | 1 + themes/base/button.css | 17 +++ themes/base/controlgroup.css | 30 ++++ ui/.DS_Store | Bin 0 -> 10244 bytes ui/controlgroup.js | 205 +++++++++++++++++++++++++++ 19 files changed, 820 insertions(+), 101 deletions(-) create mode 100644 tests/unit/controlgroup/common.js create mode 100644 tests/unit/controlgroup/controlgroup.html create mode 100644 tests/unit/controlgroup/core.js create mode 100644 tests/unit/controlgroup/methods.js create mode 100644 tests/unit/controlgroup/options.js create mode 100644 themes/base/controlgroup.css create mode 100644 ui/.DS_Store create mode 100644 ui/controlgroup.js (limited to 'demos/button') diff --git a/demos/button/icons.html b/demos/button/icons.html index f0b0f90fb..a8deca9cd 100644 --- a/demos/button/icons.html +++ b/demos/button/icons.html @@ -41,6 +41,7 @@ +

CSS

diff --git a/demos/controlgroup/default.html b/demos/controlgroup/default.html index 9e4bcdd80..0fc963537 100644 --- a/demos/controlgroup/default.html +++ b/demos/controlgroup/default.html @@ -16,18 +16,15 @@ -
-

A Controlgroup featuring various form controls

-

Controlgroup

@@ -64,7 +58,7 @@
Rental Car -
+
+
+

Output:

+
    -

    A Controlgroup creating a split button

    +

    A controlgroup creating a split button, by combining a button and a selectmenu. We adjust the classes option on the selectmenu to show only the icon

    diff --git a/demos/controlgroup/toolbar.html b/demos/controlgroup/toolbar.html index f90fb3040..fb3172418 100644 --- a/demos/controlgroup/toolbar.html +++ b/demos/controlgroup/toolbar.html @@ -19,10 +19,11 @@ var iframe = $( "