From 25d0c857188c19347c869f803530289762199f92 Mon Sep 17 00:00:00 2001 From: Alexander Schmitz Date: Thu, 28 Aug 2014 15:16:51 -0400 Subject: Checkboxradio: Initial commit of new widget --- demos/controlgroup/default.html | 90 +++++++++++++ demos/controlgroup/index.html | 17 +++ demos/controlgroup/splitbutton.html | 58 ++++++++ demos/controlgroup/toolbar.html | 256 ++++++++++++++++++++++++++++++++++++ 4 files changed, 421 insertions(+) create mode 100644 demos/controlgroup/default.html create mode 100644 demos/controlgroup/index.html create mode 100644 demos/controlgroup/splitbutton.html create mode 100644 demos/controlgroup/toolbar.html (limited to 'demos/controlgroup') diff --git a/demos/controlgroup/default.html b/demos/controlgroup/default.html new file mode 100644 index 000000000..9e4bcdd80 --- /dev/null +++ b/demos/controlgroup/default.html @@ -0,0 +1,90 @@ + + + + + jQuery UI Controlgroup - Default Functionality + + + + + + + + + + + + + + + +
+

A Controlgroup featuring various form controls

+
+
+

Controlgroup

+
+ Rental Car +
+ + + + + + + + +
+
+
+
+ Rental Car +
+ + + + + + + + +
+
+>>>>>>> 423b976... Checkboxradio: Fixed demos and tests +
+ + + diff --git a/demos/controlgroup/index.html b/demos/controlgroup/index.html new file mode 100644 index 000000000..58e2f7eda --- /dev/null +++ b/demos/controlgroup/index.html @@ -0,0 +1,17 @@ + + + + + + jQuery UI Checkboxradio Demos + + + + + + + diff --git a/demos/controlgroup/splitbutton.html b/demos/controlgroup/splitbutton.html new file mode 100644 index 000000000..5d4c7b3ce --- /dev/null +++ b/demos/controlgroup/splitbutton.html @@ -0,0 +1,58 @@ + + + + + jQuery UI Controlgroup - Split Button + + + + + + + + + + + + + + + +
+

A Controlgroup creating a split button

+
+
+

Split button

+
+ + +
+
+
+

A Controlgroup creating a split button

+
+ + diff --git a/demos/controlgroup/toolbar.html b/demos/controlgroup/toolbar.html new file mode 100644 index 000000000..f90fb3040 --- /dev/null +++ b/demos/controlgroup/toolbar.html @@ -0,0 +1,256 @@ + + + + + jQuery UI Controlgroup - Toolbar + + + + + + + + + + + + + + + +
+

A sample editor toolbar

+

Highlight text and edit it using the buttons and dropdowns in the toolbar

+
+
+ + + + + + + + + + + + +
+

+
+The Rime of the Ancient Mariner (text of 1834)
+BY SAMUEL TAYLOR COLERIDGE
+Argument 
+
+How a Ship having passed the Line was driven by storms to the cold Country towards the South Pole;
+and how from thence she made her course to the tropical Latitude of the Great Pacific Ocean; and 
+of the strange things that befell; and in what manner the Ancyent Marinere came back to his own
+Country.
+
+PART I
+It is an ancient Mariner,
+And he stoppeth one of three.
+'By thy long grey beard and glittering eye,
+Now wherefore stopp'st thou me?
+
+The Bridegroom's doors are opened wide,
+And I am next of kin;
+The guests are met, the feast is set:
+May'st hear the merry din.'
+
+He holds him with his skinny hand,
+'There was a ship,' quoth he.
+'Hold off! unhand me, grey-beard loon!'
+Eftsoons his hand dropt he.
+
+He holds him with his glittering eye—
+The Wedding-Guest stood still,
+And listens like a three years' child:
+The Mariner hath his will.
+
+The Wedding-Guest sat on a stone:
+He cannot choose but hear;
+And thus spake on that ancient man,
+The bright-eyed Mariner.
+
+'The ship was cheered, the harbour cleared,
+Merrily did we drop
+Below the kirk, below the hill,
+Below the lighthouse top.
+
+The Sun came up upon the left,
+Out of the sea came he!
+And he shone bright, and on the right
+Went down into the sea.
+
+Higher and higher every day,
+Till over the mast at noon—'
+The Wedding-Guest here beat his breast,
+For he heard the loud bassoon.
+
+The bride hath paced into the hall,
+Red as a rose is she;
+Nodding their heads before her goes
+The merry minstrelsy.
+
+The Wedding-Guest he beat his breast,
+Yet he cannot choose but hear;
+And thus spake on that ancient man,
+The bright-eyed Mariner.
+
+And now the STORM-BLAST came, and he
+Was tyrannous and strong:
+He struck with his o'ertaking wings,
+And chased us south along.
+
+With sloping masts and dipping prow,
+As who pursued with yell and blow
+Still treads the shadow of his foe,
+And forward bends his head,
+The ship drove fast, loud roared the blast,
+And southward aye we fled.
+
+And now there came both mist and snow,
+And it grew wondrous cold:
+And ice, mast-high, came floating by,
+As green as emerald.
+
+And through the drifts the snowy clifts
+Did send a dismal sheen:
+Nor shapes of men nor beasts we ken—
+The ice was all between.
+
+The ice was here, the ice was there,
+The ice was all around:
+It cracked and growled, and roared and howled,
+Like noises in a swound!
+
+At length did cross an Albatross,
+Thorough the fog it came;
+As if it had been a Christian soul,
+We hailed it in God's name.
+
+It ate the food it ne'er had eat,
+And round and round it flew.
+The ice did split with a thunder-fit;
+The helmsman steered us through!
+
+And a good south wind sprung up behind;
+The Albatross did follow,
+And every day, for food or play,
+Came to the mariner's hollo!
+
+In mist or cloud, on mast or shroud,
+It perched for vespers nine;
+Whiles all the night, through fog-smoke white,
+Glimmered the white Moon-shine.'
+
+'God save thee, ancient Mariner!
+From the fiends, that plague thee thus!—
+Why look'st thou so?'—With my cross-bow
+I shot the ALBATROSS.
+
+ + -- 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/controlgroup') 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 = $( "