diff options
| author | Alexander Schmitz <arschmitz@gmail.com> | 2015-08-09 11:48:43 -0400 |
|---|---|---|
| committer | Alexander Schmitz <arschmitz@gmail.com> | 2015-10-08 14:02:36 -0400 |
| commit | f6879fc0f52f3d3538fd0f2c1840addb73b476a2 (patch) | |
| tree | 64229e342eb53ecb78d152350ae3e897aee4e742 | |
| parent | a00c02513d81ed5d86b056f8734105a1c2d82ea8 (diff) | |
| download | jquery-ui-f6879fc0f52f3d3538fd0f2c1840addb73b476a2.tar.gz jquery-ui-f6879fc0f52f3d3538fd0f2c1840addb73b476a2.zip | |
Controlgroup: Fix headers and demos
| -rw-r--r-- | demos/controlgroup/default.html | 14 | ||||
| -rw-r--r-- | demos/controlgroup/splitbutton.html | 7 | ||||
| -rw-r--r-- | demos/controlgroup/toolbar.html | 41 | ||||
| -rw-r--r-- | ui/widgets/controlgroup.js | 13 |
4 files changed, 47 insertions, 28 deletions
diff --git a/demos/controlgroup/default.html b/demos/controlgroup/default.html index 3206c74cb..a9243e12e 100644 --- a/demos/controlgroup/default.html +++ b/demos/controlgroup/default.html @@ -5,13 +5,6 @@ <title>jQuery UI Controlgroup - Default Functionality</title> <link rel="stylesheet" href="../../themes/base/all.css"> <link rel="stylesheet" href="../demos.css"> - <script src="../../external/requirejs/require.js"></script> - <script src="../bootstrap.js"> - $( ".controlgroup" ).controlgroup() - $( ".controlgroup-vertical" ).controlgroup({ - "direction": "vertical" - }); - </script> <style> .ui-controlgroup-vertical { width: 150px; @@ -20,6 +13,13 @@ text-align: center; } </style> + <script src="../../external/requirejs/require.js"></script> + <script src="../bootstrap.js" data-modules="button checkboxradio selectmenu"> + $( ".controlgroup" ).controlgroup() + $( ".controlgroup-vertical" ).controlgroup({ + "direction": "vertical" + }); + </script> </head> <body> <div class="widget"> diff --git a/demos/controlgroup/splitbutton.html b/demos/controlgroup/splitbutton.html index 763c14dad..ec2b78876 100644 --- a/demos/controlgroup/splitbutton.html +++ b/demos/controlgroup/splitbutton.html @@ -5,11 +5,16 @@ <title>jQuery UI Controlgroup - Split Button</title> <link rel="stylesheet" href="../../themes/base/all.css"> <link rel="stylesheet" href="../demos.css"> + <style> + .ui-button-icon-only.demo-splitbutton-select { + width: 1em; + } + </style> <script src="../../external/requirejs/require.js"></script> <script src="../bootstrap.js" data-modules="button checkboxradio selectmenu"> $( "select" ).selectmenu({ classes: { - "ui-selectmenu-button": "ui-button-icon-only" + "ui-selectmenu-button": "ui-button-icon-only demo-splitbutton-select" }, change: function(){ $( ".output" ).append( "<li>" + this.value + "</li>" ); diff --git a/demos/controlgroup/toolbar.html b/demos/controlgroup/toolbar.html index 6153dff87..d9abd664a 100644 --- a/demos/controlgroup/toolbar.html +++ b/demos/controlgroup/toolbar.html @@ -5,6 +5,30 @@ <title>jQuery UI Controlgroup - Toolbar</title> <link rel="stylesheet" href="../../themes/base/all.css"> <link rel="stylesheet" href="../demos.css"> + <style> + .toolbar { + font-size: .75em; + } + .toolbar .ui-selectmenu-button { + width: auto; + float: left; + } + #zoom, #fontsize { + min-width: 75px; + } + #input { + display: none; + } + #input, #display { + width: 98%; + height: 300px; + border: 2px inset #ccc; + font-size: 11px; + font-family: "Lucida Grande"; + zoom: 100%; + padding: 5px; + } + </style> <script src="../../external/requirejs/require.js"></script> <script src="../bootstrap.js" data-modules="button checkboxradio selectmenu"> var iframe = $( "<iframe id='display' contenteditable='true'>" ), @@ -46,23 +70,6 @@ }); }); </script> - <style> - #zoom, #fontsize { - min-width: 75px; - } - #input { - display: none; - } - #input, #display { - width: 98%; - height: 300px; - border: 2px inset #ccc; - font-size: 11px; - font-family: "Lucida Grande"; - zoom: 100%; - padding: 5px; - } - </style> </head> <body> <div class="toolbar"> diff --git a/ui/widgets/controlgroup.js b/ui/widgets/controlgroup.js index 1614f91e4..a8736a808 100644 --- a/ui/widgets/controlgroup.js +++ b/ui/widgets/controlgroup.js @@ -2,12 +2,19 @@ * jQuery UI Controlgroup @VERSION * http://jqueryui.com * - * Copyright 2014 jQuery Foundation and other contributors + * Copyright jQuery Foundation and other contributors * Released under the MIT license. * http://jquery.org/license - * - * http://api.jqueryui.com/controlgroup/ */ + +//>>label: Controlgroup +//>>group: Widgets +//>>description: Visually groups form control widgets +//>>docs: http://api.jqueryui.com/controlgroup/ +//>>demos: http://jqueryui.com/controlgroup/ +//>>css.structure: ../themes/base/core.css, ../themes/base/controlgroup.css +//>>css.theme: ../themes/base/theme.css + ( function( factory ) { if ( typeof define === "function" && define.amd ) { |