Skip to content

Commit 8f1d280

Browse files
Gabriel Schulhofarschmitz
Gabriel Schulhof
authored and
arschmitz
committed
All: Address review comments
1 parent 36e1289 commit 8f1d280

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1527
-2609
lines changed

‎build/tasks/options/bowercopy.js

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,33 @@ return {
4545
},
4646
files: {
4747
"jquery-ui/core.js": "jquery-ui/ui/core.js",
48-
"jquery-ui/version.js": "jquery-ui/ui/version.js",
48+
"jquery-ui/data.js": "jquery-ui/ui/data.js",
49+
"jquery-ui/disable-selection.js": "jquery-ui/ui/disable-selection.js",
50+
"jquery-ui/escape-selector.js": "jquery-ui/ui/escape-selector.js",
51+
"jquery-ui/focusable.js": "jquery-ui/ui/focusable.js",
4952
"jquery-ui/form.js": "jquery-ui/ui/form.js",
5053
"jquery-ui/form-reset-mixin.js": "jquery-ui/ui/form-reset-mixin.js",
51-
"jquery-ui/form-reset-mixin.js": "jquery-ui/ui/form-reset-mixin.js",
54+
"jquery-ui/ie.js": "jquery-ui/ui/ie.js",
55+
"jquery-ui/jquery-1-7.js": "jquery-ui/ui/jquery-1-7.js",
56+
"jquery-ui/keycode.js": "jquery-ui/ui/keycode.js",
57+
"jquery-ui/labels.js": "jquery-ui/ui/labels.js",
58+
"jquery-ui/LICENSE.txt": "jquery-ui/ui/LICENSE.txt",
59+
"jquery-ui/LICENSE.txt~HEAD": "jquery-ui/ui/LICENSE.txt~HEAD",
60+
"jquery-ui/LICENSE.txt~Widgets": "jquery-ui/ui/LICENSE.txt~Widgets",
61+
"jquery-ui/MIT-LICENSE.txt": "jquery-ui/ui/MIT-LICENSE.txt",
62+
"jquery-ui/plugin.js": "jquery-ui/ui/plugin.js",
63+
"jquery-ui/safe-active-element.js": "jquery-ui/ui/safe-active-element.js",
64+
"jquery-ui/safe-blur.js": "jquery-ui/ui/safe-blur.js",
65+
"jquery-ui/scroll-parent.js": "jquery-ui/ui/scroll-parent.js",
66+
"jquery-ui/tabbable.js": "jquery-ui/ui/tabbable.js",
67+
"jquery-ui/unique-id.js": "jquery-ui/ui/unique-id.js",
68+
"jquery-ui/version.js": "jquery-ui/ui/version.js",
5269
"jquery-ui/widget.js": "jquery-ui/ui/widget.js",
53-
"jquery-ui/accordion.js": "jquery-ui/ui/accordion.js",
54-
"jquery-ui/tabs.js": "jquery-ui/ui/tabs.js",
55-
"jquery-ui/button.js": "jquery-ui/ui/button.js",
56-
"jquery-ui/checkboxradio.js": "jquery-ui/ui/checkboxradio.js",
57-
"jquery-ui/controlgroup.js": "jquery-ui/ui/controlgroup.js",
58-
"jquery-ui/LICENSE.txt": "jquery-ui/LICENSE.txt"
70+
"jquery-ui/widgets/accordion.js": "jquery-ui/ui/widgets/accordion.js",
71+
"jquery-ui/widgets/button.js": "jquery-ui/ui/widgets/button.js",
72+
"jquery-ui/widgets/checkboxradio.js": "jquery-ui/ui/widgets/checkboxradio.js",
73+
"jquery-ui/widgets/controlgroup.js": "jquery-ui/ui/widgets/controlgroup.js",
74+
"jquery-ui/widgets/tabs.js": "jquery-ui/ui/widgets/tabs.js"
5975
}
6076
}
6177
};

‎build/tasks/options/jscs.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,14 @@ return {
3535
"js/widgets/forms/flipswitch.backcompat.js",
3636
"js/widgets/forms/rangeslider.js",
3737
"js/widgets/forms/rangeslider.backcompat.js",
38+
"js/widgets/forms/select.js",
39+
"js/widgets/forms/select.custom.js",
40+
"js/widgets/forms/select.backcompat.js",
41+
"js/widgets/forms/select.custom.backcompat.js",
3842
"js/widgets/forms/slider.js",
3943
"js/widgets/forms/slider.backcompat.js",
4044
"js/widgets/controlgroup.js",
45+
"js/widgets/controlgroup.selectmenu.js",
4146
"js/widgets/controlgroup.backcompat.js",
4247
"js/widgets/tabs.ajax.js",
4348
"js/widgets/toolbar.js",
@@ -71,8 +76,13 @@ return {
7176
"tests/unit/textinput/textinput_core.js",
7277
"tests/integration/dialog/dialog_events.js",
7378
"tests/integration/navigation/navigation_core.js",
74-
"tests/integration/select/select_cached.js",
75-
"tests/integration/select/select_core.js",
79+
"tests/css/controlgroup/controlgroup_core.js",
80+
"tests/integration/dialog-extension/dialog_events.js",
81+
"tests/integration/select/select_events.js",
82+
"tests/unit/select/controlgroup_interaction_core.js",
83+
"tests/unit/select/new_backcompat_core.js",
84+
"tests/unit/select/new_core.js",
85+
"tests/unit/select/select_core.js",
7686
"tests/integration/page/page_enhance_within.js",
7787
"tests/integration/page/page_theme.js",
7888
"tests/integration/page/page_title_entity.js",

‎demos/controlgroup/index.php

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,20 @@
1616
</style>
1717
<style id="textinput-controlgroup">
1818
.controlgroup-textinput {
19-
padding-top:.22em;
20-
padding-bottom:.22em;
19+
padding-top:.35em;
20+
padding-bottom:.35em;
21+
cursor: text;
22+
padding-left: 0;
23+
padding-right: 0;
2124
}
2225
</style>
26+
<script id="textinput-controlgroup-script">
27+
$.widget( "ui.controlgroup", $.ui.controlgroup, {
28+
_textinputOptions: function( position ) {
29+
return this._buildSimpleOptions( position, "ui-textinput" );
30+
}
31+
} );
32+
</script>
2333
</head>
2434
<body>
2535
<div data-role="page" class="jqm-demos" data-quicklinks="true">
@@ -401,12 +411,12 @@
401411
<!-- TODO: This should be a separate demo -->
402412
<h2>Textinputs</h2>
403413

404-
<p>While textinputs are not officially supported by the controlgroup they can be made to work with some simple CSS.</p>
405-
<p>To make this work you will need to add one CSS rule and use textinput's <code>wrapperClass</code> option to set two classes on the textinput wrapper.</p>
414+
<p>While textinputs are not officially supported by the controlgroup they can be made to work with some simple CSS and script.</p>
415+
<p>To make this work you will need to add one CSS rule and a simple controlgroup extension which uses textinput's <code>ui-textinput</code> class key to allow the controlgroup widget to set the corner classes on the textinput wrapper.</p>
406416

407-
<div data-demo-html="true" data-demo-css="#textinput-controlgroup">
417+
<div data-demo-html="true" data-demo-css="#textinput-controlgroup" data-demo-js="#textinput-controlgroup-script">
408418
<label for="currency-controlgroup">Value</label>
409-
<div data-role="controlgroup">
419+
<div data-role="controlgroup" data-type="horizontal" data-items='{ "textinput" : "#currency-controlgroup" }'>
410420
<select>
411421
<option>$</option>
412422
<option>€</option>
@@ -419,7 +429,7 @@
419429
<button>.00</button>
420430
</div>
421431
<label for="search-control-group">Search</label>
422-
<div data-role="controlgroup">
432+
<div data-role="controlgroup" data-type="horizontal" data-items='{ "textinput" : "#search-control-group" }'>
423433
<input type="text" id="search-control-group" data-wrapper-class="controlgroup-textinput ui-button">
424434
<button>Submit</button>
425435
<button>Reset</button>

‎external/jquery-ui/controlgroup.js

Lines changed: 0 additions & 205 deletions
This file was deleted.

0 commit comments

Comments
 (0)