Skip to content

Commit c290839

Browse files
committed
Build: Update to latest versions of ui widgets
1 parent fffdb18 commit c290839

File tree

3 files changed

+56
-9
lines changed

3 files changed

+56
-9
lines changed

external/jquery-ui/button.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525
}(function( $ ) {
2626

27-
var baseClasses = "ui-widget ui-corner-all",
27+
var baseClasses = "ui-button ui-widget ui-corner-all",
2828
typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons" +
2929
" ui-button-text-only ui-icon-beginning ui-icon-end ui-icon-top ui-icon-bottom",
3030
formResetHandler = function() {
@@ -97,7 +97,7 @@ $.widget( "ui.button", {
9797
_enhance: function() {
9898
this._setOption( "disabled", this.options.disabled );
9999

100-
this.element.addClass( this._classes( "ui-button" ) + " " + baseClasses ).attr( "role", "button" );
100+
this.element.addClass( baseClasses ).attr( "role", "button" );
101101

102102
// Check to see if the label needs to be set or if its already correct
103103
if ( this.options.label && this.options.label !== this.originalLabel ) {
@@ -124,10 +124,11 @@ $.widget( "ui.button", {
124124
_updateIcon: function( icon ) {
125125
if ( !this.icon ) {
126126
this.icon = $( "<span>" ).addClass( this._classes( "ui-button-icon" ) + " ui-icon" );
127-
this.element.addClass( "ui-icon-" + this.options.iconPosition );
128127

129128
if ( !this.options.showLabel ){
130129
this.element.addClass( this._classes( "ui-button-icon-only" ) );
130+
} else {
131+
this.element.addClass( "ui-icon-" + this.options.iconPosition );
131132
}
132133
} else {
133134
this.icon.removeClass( this.options.icon );

external/jquery-ui/tabs.js

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ return $.widget( "ui.tabs", {
3131
active: null,
3232
classes: {
3333
"ui-tabs": "ui-corner-all",
34-
"ui-tabs-collapsible": null,
35-
"ui-tabs-active": null,
34+
"ui-tabs-collapsible": "",
35+
"ui-tabs-active": "",
3636
"ui-tabs-nav": "ui-corner-all",
3737
"ui-tab": "ui-corner-top",
38-
"ui-tabs-anchor": null,
38+
"ui-tabs-anchor": "",
3939
"ui-tabs-panel": "ui-corner-bottom",
40-
"ui-tabs-loading": null
40+
"ui-tabs-loading": ""
4141
},
4242
collapsible: false,
4343
event: "click",
@@ -275,6 +275,33 @@ return $.widget( "ui.tabs", {
275275
return index;
276276
},
277277

278+
_elementsFromClassKey: function( classKey ) {
279+
switch( classKey ) {
280+
case "ui-tabs":
281+
return this.element;
282+
case "ui-tabs-collapsible":
283+
if ( this.options.collapsible ) {
284+
return this.element;
285+
}
286+
case "ui-tabs-active":
287+
return this.active;
288+
case "ui-tabs-nav":
289+
return this.tablist;
290+
case "ui-tab"
291+
return this.tabs;
292+
case "ui-tabs-anchor":
293+
return this.anchors;
294+
case "ui-tabs-panel":
295+
return this.panels;
296+
case "ui-tabs-loading":
297+
if( this.tab.hasClass( classKey ) ) {
298+
return this.tab;
299+
}
300+
default:
301+
return this._superApply( arguments );
302+
}
303+
},
304+
278305
_setOption: function( key, value ) {
279306
if ( key === "active" ) {
280307
// _activate() will handle invalid values and update this.options

external/jquery-ui/widget.js

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,22 @@ $.Widget.prototype = {
365365

366366
return this;
367367
},
368+
_elementsFromClassKey: function( classKey ) {
369+
return $();
370+
},
368371
_setOption: function( key, value ) {
372+
var classKey;
373+
374+
if ( key === "classes" ) {
375+
for ( classKey in value ) {
376+
if ( value[ classKey ] !== this.options.classes[ classKey ] ) {
377+
this._elementsFromClassKey( classKey )
378+
.removeClass( this._classesFromObject( classKey, this.options.classes ) )
379+
.addClass( this._classesFromObject( classKey, value ) );
380+
}
381+
}
382+
}
383+
369384
this.options[ key ] = value;
370385

371386
if ( key === "disabled" ) {
@@ -382,19 +397,23 @@ $.Widget.prototype = {
382397
return this;
383398
},
384399

385-
_classes: function( key ) {
400+
_classesFromObject: function( key, classes ) {
386401
var out = [],
387402
parts = key.split( " " ),
388403
i = parts.length;
389404

390405
while ( i-- ) {
391406
out.push( parts[ i ] );
392-
out.push( this.options.classes[ parts[ i ] ] );
407+
out.push( classes[ parts[ i ] ] );
393408
}
394409

395410
return out.join( " " );
396411
},
397412

413+
_classes: function( key ) {
414+
return this._classesFromObject( key, this.options.classes );
415+
},
416+
398417
enable: function() {
399418
return this._setOptions({ disabled: false });
400419
},

0 commit comments

Comments
 (0)