activeadmin 3.2.1 → 3.2.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +26 -0
- data/README.md +2 -2
- data/app/assets/stylesheets/active_admin/_forms.scss +1 -2
- data/app/assets/stylesheets/active_admin/components/_comments.scss +1 -1
- data/app/assets/stylesheets/active_admin/components/_dropdown_menu.scss +7 -4
- data/app/assets/stylesheets/active_admin/components/_pagination.scss +5 -2
- data/app/assets/stylesheets/active_admin/components/_table_tools.scss +9 -6
- data/app/assets/stylesheets/active_admin/components/_tabs.scss +10 -7
- data/app/assets/stylesheets/active_admin/mixins/_buttons.scss +2 -2
- data/app/assets/stylesheets/active_admin/pages/_logged_out.scss +1 -1
- data/app/assets/stylesheets/active_admin/structure/_footer.scss +1 -1
- data/app/assets/stylesheets/active_admin/structure/_title_bar.scss +6 -3
- data/lib/active_admin/pundit_adapter.rb +1 -1
- data/lib/active_admin/resource/attributes.rb +8 -1
- data/lib/active_admin/version.rb +1 -1
- data/lib/active_admin/views/components/active_admin_form.rb +1 -1
- data/vendor/assets/javascripts/jquery-ui/data.js +12 -8
- data/vendor/assets/javascripts/jquery-ui/disable-selection.js +10 -7
- data/vendor/assets/javascripts/jquery-ui/focusable.js +12 -9
- data/vendor/assets/javascripts/jquery-ui/form-reset-mixin.js +60 -57
- data/vendor/assets/javascripts/jquery-ui/form.js +15 -12
- data/vendor/assets/javascripts/jquery-ui/ie.js +5 -2
- data/vendor/assets/javascripts/jquery-ui/keycode.js +11 -7
- data/vendor/assets/javascripts/jquery-ui/labels.js +46 -40
- data/vendor/assets/javascripts/jquery-ui/plugin.js +5 -2
- data/vendor/assets/javascripts/jquery-ui/position.js +30 -17
- data/vendor/assets/javascripts/jquery-ui/safe-active-element.js +6 -2
- data/vendor/assets/javascripts/jquery-ui/safe-blur.js +6 -2
- data/vendor/assets/javascripts/jquery-ui/scroll-parent.js +10 -7
- data/vendor/assets/javascripts/jquery-ui/tabbable.js +11 -8
- data/vendor/assets/javascripts/jquery-ui/unique-id.js +10 -7
- data/vendor/assets/javascripts/jquery-ui/version.js +6 -3
- data/vendor/assets/javascripts/jquery-ui/widget.js +53 -30
- data/vendor/assets/javascripts/jquery-ui/widgets/button.js +87 -24
- data/vendor/assets/javascripts/jquery-ui/widgets/checkboxradio.js +276 -273
- data/vendor/assets/javascripts/jquery-ui/widgets/controlgroup.js +15 -11
- data/vendor/assets/javascripts/jquery-ui/widgets/datepicker.js +182 -62
- data/vendor/assets/javascripts/jquery-ui/widgets/dialog.js +53 -36
- data/vendor/assets/javascripts/jquery-ui/widgets/draggable.js +28 -19
- data/vendor/assets/javascripts/jquery-ui/widgets/mouse.js +22 -11
- data/vendor/assets/javascripts/jquery-ui/widgets/resizable.js +47 -26
- data/vendor/assets/javascripts/jquery-ui/widgets/sortable.js +186 -125
- data/vendor/assets/javascripts/jquery-ui/widgets/tabs.js +20 -20
- metadata +3 -4
- data/vendor/assets/javascripts/jquery-ui/escape-selector.js +0 -23
@@ -1,291 +1,294 @@
|
|
1
|
-
//= require jquery-ui/escape-selector
|
2
1
|
//= require jquery-ui/form-reset-mixin
|
3
2
|
//= require jquery-ui/labels
|
4
3
|
//= require jquery-ui/widget
|
5
4
|
|
6
5
|
/*!
|
7
|
-
* jQuery UI Checkboxradio 1.
|
8
|
-
*
|
6
|
+
* jQuery UI Checkboxradio 1.13.3
|
7
|
+
* https://jqueryui.com
|
9
8
|
*
|
10
|
-
* Copyright
|
9
|
+
* Copyright OpenJS Foundation and other contributors
|
11
10
|
* Released under the MIT license.
|
12
|
-
*
|
11
|
+
* https://jquery.org/license
|
13
12
|
*/
|
14
13
|
|
15
14
|
//>>label: Checkboxradio
|
16
15
|
//>>group: Widgets
|
17
16
|
//>>description: Enhances a form with multiple themeable checkboxes or radio buttons.
|
18
|
-
//>>docs:
|
19
|
-
//>>demos:
|
17
|
+
//>>docs: https://api.jqueryui.com/checkboxradio/
|
18
|
+
//>>demos: https://jqueryui.com/checkboxradio/
|
20
19
|
//>>css.structure: ../../themes/base/core.css
|
21
20
|
//>>css.structure: ../../themes/base/button.css
|
22
21
|
//>>css.structure: ../../themes/base/checkboxradio.css
|
23
22
|
//>>css.theme: ../../themes/base/theme.css
|
24
23
|
|
25
24
|
( function( factory ) {
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
}
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
|
269
|
-
|
270
|
-
|
271
|
-
|
272
|
-
|
273
|
-
|
274
|
-
|
275
|
-
|
276
|
-
|
277
|
-
|
278
|
-
|
279
|
-
|
280
|
-
|
281
|
-
|
282
|
-
|
283
|
-
|
284
|
-
|
285
|
-
|
286
|
-
|
287
|
-
|
288
|
-
|
289
|
-
|
290
|
-
|
291
|
-
}
|
25
|
+
"use strict";
|
26
|
+
|
27
|
+
if ( typeof define === "function" && define.amd ) {
|
28
|
+
|
29
|
+
// AMD. Register as an anonymous module.
|
30
|
+
define( [
|
31
|
+
"jquery",
|
32
|
+
"../form-reset-mixin",
|
33
|
+
"../labels",
|
34
|
+
"../widget"
|
35
|
+
], factory );
|
36
|
+
} else {
|
37
|
+
|
38
|
+
// Browser globals
|
39
|
+
factory( jQuery );
|
40
|
+
}
|
41
|
+
} )( function( $ ) {
|
42
|
+
"use strict";
|
43
|
+
|
44
|
+
$.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
|
45
|
+
version: "1.13.3",
|
46
|
+
options: {
|
47
|
+
disabled: null,
|
48
|
+
label: null,
|
49
|
+
icon: true,
|
50
|
+
classes: {
|
51
|
+
"ui-checkboxradio-label": "ui-corner-all",
|
52
|
+
"ui-checkboxradio-icon": "ui-corner-all"
|
53
|
+
}
|
54
|
+
},
|
55
|
+
|
56
|
+
_getCreateOptions: function() {
|
57
|
+
var disabled, labels, labelContents;
|
58
|
+
var options = this._super() || {};
|
59
|
+
|
60
|
+
// We read the type here, because it makes more sense to throw a element type error first,
|
61
|
+
// rather then the error for lack of a label. Often if its the wrong type, it
|
62
|
+
// won't have a label (e.g. calling on a div, btn, etc)
|
63
|
+
this._readType();
|
64
|
+
|
65
|
+
labels = this.element.labels();
|
66
|
+
|
67
|
+
// If there are multiple labels, use the last one
|
68
|
+
this.label = $( labels[ labels.length - 1 ] );
|
69
|
+
if ( !this.label.length ) {
|
70
|
+
$.error( "No label found for checkboxradio widget" );
|
71
|
+
}
|
72
|
+
|
73
|
+
this.originalLabel = "";
|
74
|
+
|
75
|
+
// We need to get the label text but this may also need to make sure it does not contain the
|
76
|
+
// input itself.
|
77
|
+
// The label contents could be text, html, or a mix. We wrap all elements
|
78
|
+
// and read the wrapper's `innerHTML` to get a string representation of
|
79
|
+
// the label, without the input as part of it.
|
80
|
+
labelContents = this.label.contents().not( this.element[ 0 ] );
|
81
|
+
|
82
|
+
if ( labelContents.length ) {
|
83
|
+
this.originalLabel += labelContents
|
84
|
+
.clone()
|
85
|
+
.wrapAll( "<div></div>" )
|
86
|
+
.parent()
|
87
|
+
.html();
|
88
|
+
}
|
89
|
+
|
90
|
+
// Set the label option if we found label text
|
91
|
+
if ( this.originalLabel ) {
|
92
|
+
options.label = this.originalLabel;
|
93
|
+
}
|
94
|
+
|
95
|
+
disabled = this.element[ 0 ].disabled;
|
96
|
+
if ( disabled != null ) {
|
97
|
+
options.disabled = disabled;
|
98
|
+
}
|
99
|
+
return options;
|
100
|
+
},
|
101
|
+
|
102
|
+
_create: function() {
|
103
|
+
var checked = this.element[ 0 ].checked;
|
104
|
+
|
105
|
+
this._bindFormResetHandler();
|
106
|
+
|
107
|
+
if ( this.options.disabled == null ) {
|
108
|
+
this.options.disabled = this.element[ 0 ].disabled;
|
109
|
+
}
|
110
|
+
|
111
|
+
this._setOption( "disabled", this.options.disabled );
|
112
|
+
this._addClass( "ui-checkboxradio", "ui-helper-hidden-accessible" );
|
113
|
+
this._addClass( this.label, "ui-checkboxradio-label", "ui-button ui-widget" );
|
114
|
+
|
115
|
+
if ( this.type === "radio" ) {
|
116
|
+
this._addClass( this.label, "ui-checkboxradio-radio-label" );
|
117
|
+
}
|
118
|
+
|
119
|
+
if ( this.options.label && this.options.label !== this.originalLabel ) {
|
120
|
+
this._updateLabel();
|
121
|
+
} else if ( this.originalLabel ) {
|
122
|
+
this.options.label = this.originalLabel;
|
123
|
+
}
|
124
|
+
|
125
|
+
this._enhance();
|
126
|
+
|
127
|
+
if ( checked ) {
|
128
|
+
this._addClass( this.label, "ui-checkboxradio-checked", "ui-state-active" );
|
129
|
+
}
|
130
|
+
|
131
|
+
this._on( {
|
132
|
+
change: "_toggleClasses",
|
133
|
+
focus: function() {
|
134
|
+
this._addClass( this.label, null, "ui-state-focus ui-visual-focus" );
|
135
|
+
},
|
136
|
+
blur: function() {
|
137
|
+
this._removeClass( this.label, null, "ui-state-focus ui-visual-focus" );
|
138
|
+
}
|
139
|
+
} );
|
140
|
+
},
|
141
|
+
|
142
|
+
_readType: function() {
|
143
|
+
var nodeName = this.element[ 0 ].nodeName.toLowerCase();
|
144
|
+
this.type = this.element[ 0 ].type;
|
145
|
+
if ( nodeName !== "input" || !/radio|checkbox/.test( this.type ) ) {
|
146
|
+
$.error( "Can't create checkboxradio on element.nodeName=" + nodeName +
|
147
|
+
" and element.type=" + this.type );
|
148
|
+
}
|
149
|
+
},
|
150
|
+
|
151
|
+
// Support jQuery Mobile enhanced option
|
152
|
+
_enhance: function() {
|
153
|
+
this._updateIcon( this.element[ 0 ].checked );
|
154
|
+
},
|
155
|
+
|
156
|
+
widget: function() {
|
157
|
+
return this.label;
|
158
|
+
},
|
159
|
+
|
160
|
+
_getRadioGroup: function() {
|
161
|
+
var group;
|
162
|
+
var name = this.element[ 0 ].name;
|
163
|
+
var nameSelector = "input[name='" + $.escapeSelector( name ) + "']";
|
164
|
+
|
165
|
+
if ( !name ) {
|
166
|
+
return $( [] );
|
167
|
+
}
|
168
|
+
|
169
|
+
if ( this.form.length ) {
|
170
|
+
group = $( this.form[ 0 ].elements ).filter( nameSelector );
|
171
|
+
} else {
|
172
|
+
|
173
|
+
// Not inside a form, check all inputs that also are not inside a form
|
174
|
+
group = $( nameSelector ).filter( function() {
|
175
|
+
return $( this )._form().length === 0;
|
176
|
+
} );
|
177
|
+
}
|
178
|
+
|
179
|
+
return group.not( this.element );
|
180
|
+
},
|
181
|
+
|
182
|
+
_toggleClasses: function() {
|
183
|
+
var checked = this.element[ 0 ].checked;
|
184
|
+
this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
|
185
|
+
|
186
|
+
if ( this.options.icon && this.type === "checkbox" ) {
|
187
|
+
this._toggleClass( this.icon, null, "ui-icon-check ui-state-checked", checked )
|
188
|
+
._toggleClass( this.icon, null, "ui-icon-blank", !checked );
|
189
|
+
}
|
190
|
+
|
191
|
+
if ( this.type === "radio" ) {
|
192
|
+
this._getRadioGroup()
|
193
|
+
.each( function() {
|
194
|
+
var instance = $( this ).checkboxradio( "instance" );
|
195
|
+
|
196
|
+
if ( instance ) {
|
197
|
+
instance._removeClass( instance.label,
|
198
|
+
"ui-checkboxradio-checked", "ui-state-active" );
|
199
|
+
}
|
200
|
+
} );
|
201
|
+
}
|
202
|
+
},
|
203
|
+
|
204
|
+
_destroy: function() {
|
205
|
+
this._unbindFormResetHandler();
|
206
|
+
|
207
|
+
if ( this.icon ) {
|
208
|
+
this.icon.remove();
|
209
|
+
this.iconSpace.remove();
|
210
|
+
}
|
211
|
+
},
|
212
|
+
|
213
|
+
_setOption: function( key, value ) {
|
214
|
+
|
215
|
+
// We don't allow the value to be set to nothing
|
216
|
+
if ( key === "label" && !value ) {
|
217
|
+
return;
|
218
|
+
}
|
219
|
+
|
220
|
+
this._super( key, value );
|
221
|
+
|
222
|
+
if ( key === "disabled" ) {
|
223
|
+
this._toggleClass( this.label, null, "ui-state-disabled", value );
|
224
|
+
this.element[ 0 ].disabled = value;
|
225
|
+
|
226
|
+
// Don't refresh when setting disabled
|
227
|
+
return;
|
228
|
+
}
|
229
|
+
this.refresh();
|
230
|
+
},
|
231
|
+
|
232
|
+
_updateIcon: function( checked ) {
|
233
|
+
var toAdd = "ui-icon ui-icon-background ";
|
234
|
+
|
235
|
+
if ( this.options.icon ) {
|
236
|
+
if ( !this.icon ) {
|
237
|
+
this.icon = $( "<span>" );
|
238
|
+
this.iconSpace = $( "<span> </span>" );
|
239
|
+
this._addClass( this.iconSpace, "ui-checkboxradio-icon-space" );
|
240
|
+
}
|
241
|
+
|
242
|
+
if ( this.type === "checkbox" ) {
|
243
|
+
toAdd += checked ? "ui-icon-check ui-state-checked" : "ui-icon-blank";
|
244
|
+
this._removeClass( this.icon, null, checked ? "ui-icon-blank" : "ui-icon-check" );
|
245
|
+
} else {
|
246
|
+
toAdd += "ui-icon-blank";
|
247
|
+
}
|
248
|
+
this._addClass( this.icon, "ui-checkboxradio-icon", toAdd );
|
249
|
+
if ( !checked ) {
|
250
|
+
this._removeClass( this.icon, null, "ui-icon-check ui-state-checked" );
|
251
|
+
}
|
252
|
+
this.icon.prependTo( this.label ).after( this.iconSpace );
|
253
|
+
} else if ( this.icon !== undefined ) {
|
254
|
+
this.icon.remove();
|
255
|
+
this.iconSpace.remove();
|
256
|
+
delete this.icon;
|
257
|
+
}
|
258
|
+
},
|
259
|
+
|
260
|
+
_updateLabel: function() {
|
261
|
+
|
262
|
+
// Remove the contents of the label ( minus the icon, icon space, and input )
|
263
|
+
var contents = this.label.contents().not( this.element[ 0 ] );
|
264
|
+
if ( this.icon ) {
|
265
|
+
contents = contents.not( this.icon[ 0 ] );
|
266
|
+
}
|
267
|
+
if ( this.iconSpace ) {
|
268
|
+
contents = contents.not( this.iconSpace[ 0 ] );
|
269
|
+
}
|
270
|
+
contents.remove();
|
271
|
+
|
272
|
+
this.label.append( this.options.label );
|
273
|
+
},
|
274
|
+
|
275
|
+
refresh: function() {
|
276
|
+
var checked = this.element[ 0 ].checked,
|
277
|
+
isDisabled = this.element[ 0 ].disabled;
|
278
|
+
|
279
|
+
this._updateIcon( checked );
|
280
|
+
this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
|
281
|
+
if ( this.options.label !== null ) {
|
282
|
+
this._updateLabel();
|
283
|
+
}
|
284
|
+
|
285
|
+
if ( isDisabled !== this.options.disabled ) {
|
286
|
+
this._setOptions( { "disabled": isDisabled } );
|
287
|
+
}
|
288
|
+
}
|
289
|
+
|
290
|
+
} ] );
|
291
|
+
|
292
|
+
return $.ui.checkboxradio;
|
293
|
+
|
294
|
+
} );
|
@@ -1,24 +1,26 @@
|
|
1
1
|
//= require jquery-ui/widget
|
2
2
|
|
3
3
|
/*!
|
4
|
-
* jQuery UI Controlgroup 1.
|
5
|
-
*
|
4
|
+
* jQuery UI Controlgroup 1.13.3
|
5
|
+
* https://jqueryui.com
|
6
6
|
*
|
7
|
-
* Copyright
|
7
|
+
* Copyright OpenJS Foundation and other contributors
|
8
8
|
* Released under the MIT license.
|
9
|
-
*
|
9
|
+
* https://jquery.org/license
|
10
10
|
*/
|
11
11
|
|
12
12
|
//>>label: Controlgroup
|
13
13
|
//>>group: Widgets
|
14
14
|
//>>description: Visually groups form control widgets
|
15
|
-
//>>docs:
|
16
|
-
//>>demos:
|
15
|
+
//>>docs: https://api.jqueryui.com/controlgroup/
|
16
|
+
//>>demos: https://jqueryui.com/controlgroup/
|
17
17
|
//>>css.structure: ../../themes/base/core.css
|
18
18
|
//>>css.structure: ../../themes/base/controlgroup.css
|
19
19
|
//>>css.theme: ../../themes/base/theme.css
|
20
20
|
|
21
21
|
( function( factory ) {
|
22
|
+
"use strict";
|
23
|
+
|
22
24
|
if ( typeof define === "function" && define.amd ) {
|
23
25
|
|
24
26
|
// AMD. Register as an anonymous module.
|
@@ -31,11 +33,13 @@
|
|
31
33
|
// Browser globals
|
32
34
|
factory( jQuery );
|
33
35
|
}
|
34
|
-
}( function( $ ) {
|
36
|
+
} )( function( $ ) {
|
37
|
+
"use strict";
|
38
|
+
|
35
39
|
var controlgroupCornerRegex = /ui-corner-([a-z]){2,6}/g;
|
36
40
|
|
37
41
|
return $.widget( "ui.controlgroup", {
|
38
|
-
version: "1.
|
42
|
+
version: "1.13.3",
|
39
43
|
defaultElement: "<div>",
|
40
44
|
options: {
|
41
45
|
direction: "horizontal",
|
@@ -152,7 +156,7 @@ return $.widget( "ui.controlgroup", {
|
|
152
156
|
} );
|
153
157
|
} );
|
154
158
|
|
155
|
-
this.childWidgets = $( $.
|
159
|
+
this.childWidgets = $( $.uniqueSort( childWidgets ) );
|
156
160
|
this._addClass( this.childWidgets, "ui-controlgroup-item" );
|
157
161
|
},
|
158
162
|
|
@@ -236,7 +240,7 @@ return $.widget( "ui.controlgroup", {
|
|
236
240
|
var result = {};
|
237
241
|
$.each( classes, function( key ) {
|
238
242
|
var current = instance.options.classes[ key ] || "";
|
239
|
-
current =
|
243
|
+
current = String.prototype.trim.call( current.replace( controlgroupCornerRegex, "" ) );
|
240
244
|
result[ key ] = ( current + " " + classes[ key ] ).replace( /\s+/g, " " );
|
241
245
|
} );
|
242
246
|
return result;
|
@@ -297,4 +301,4 @@ return $.widget( "ui.controlgroup", {
|
|
297
301
|
}
|
298
302
|
}
|
299
303
|
} );
|
300
|
-
} )
|
304
|
+
} );
|