]> 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: a00c025)
Controlgroup: Fix headers and demos
authorAlexander Schmitz <arschmitz@gmail.com>
Sun, 9 Aug 2015 15:48:43 +0000 (11:48 -0400)
committerAlexander Schmitz <arschmitz@gmail.com>
Thu, 8 Oct 2015 18:02:36 +0000 (14:02 -0400)
demos/controlgroup/default.html patch | blob | history
demos/controlgroup/splitbutton.html patch | blob | history
demos/controlgroup/toolbar.html patch | blob | history
ui/widgets/controlgroup.js patch | blob | history

diff --git a/demos/controlgroup/default.html b/demos/controlgroup/default.html
index 3206c74cba86ba5e9dad8030287f1513797b1aba..a9243e12e99ef061c9482d93260c64b20ac9a23b 100644 (file)
--- 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 763c14dad3773625fd7534e28f7e039a1462d4ce..ec2b78876d61fcccb2079d9eb71636e8be3337f6 100644 (file)
--- 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 6153dff875c57112fd3e945815ce650b302cf36c..d9abd664a0a2c35bd8f53d754efb8f9f1893f1de 100644 (file)
--- 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 1614f91e408a148e3ef6fe5ca82f1d17a5d1cbc4..a8736a808a0e85bfe4e1632cbb2768f19e99d2dc 100644 (file)
--- 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 ) {
 
The official jQuery user interface library: https://github.com/jquery/jquery-ui