File tree Expand file tree Collapse file tree 3 files changed +56
-9
lines changed Expand file tree Collapse file tree 3 files changed +56
-9
lines changed Original file line number Diff line number Diff line change 24
24
}
25
25
} ( function ( $ ) {
26
26
27
- var baseClasses = "ui-widget ui-corner-all" ,
27
+ var baseClasses = "ui-button ui- widget ui-corner-all" ,
28
28
typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons" +
29
29
" ui-button-text-only ui-icon-beginning ui-icon-end ui-icon-top ui-icon-bottom" ,
30
30
formResetHandler = function ( ) {
@@ -97,7 +97,7 @@ $.widget( "ui.button", {
97
97
_enhance : function ( ) {
98
98
this . _setOption ( "disabled" , this . options . disabled ) ;
99
99
100
- this . element . addClass ( this . _classes ( "ui-button" ) + " " + baseClasses ) . attr ( "role" , "button" ) ;
100
+ this . element . addClass ( baseClasses ) . attr ( "role" , "button" ) ;
101
101
102
102
// Check to see if the label needs to be set or if its already correct
103
103
if ( this . options . label && this . options . label !== this . originalLabel ) {
@@ -124,10 +124,11 @@ $.widget( "ui.button", {
124
124
_updateIcon : function ( icon ) {
125
125
if ( ! this . icon ) {
126
126
this . icon = $ ( "<span>" ) . addClass ( this . _classes ( "ui-button-icon" ) + " ui-icon" ) ;
127
- this . element . addClass ( "ui-icon-" + this . options . iconPosition ) ;
128
127
129
128
if ( ! this . options . showLabel ) {
130
129
this . element . addClass ( this . _classes ( "ui-button-icon-only" ) ) ;
130
+ } else {
131
+ this . element . addClass ( "ui-icon-" + this . options . iconPosition ) ;
131
132
}
132
133
} else {
133
134
this . icon . removeClass ( this . options . icon ) ;
Original file line number Diff line number Diff line change @@ -31,13 +31,13 @@ return $.widget( "ui.tabs", {
31
31
active : null ,
32
32
classes : {
33
33
"ui-tabs" : "ui-corner-all" ,
34
- "ui-tabs-collapsible" : null ,
35
- "ui-tabs-active" : null ,
34
+ "ui-tabs-collapsible" : "" ,
35
+ "ui-tabs-active" : "" ,
36
36
"ui-tabs-nav" : "ui-corner-all" ,
37
37
"ui-tab" : "ui-corner-top" ,
38
- "ui-tabs-anchor" : null ,
38
+ "ui-tabs-anchor" : "" ,
39
39
"ui-tabs-panel" : "ui-corner-bottom" ,
40
- "ui-tabs-loading" : null
40
+ "ui-tabs-loading" : ""
41
41
} ,
42
42
collapsible : false ,
43
43
event : "click" ,
@@ -275,6 +275,33 @@ return $.widget( "ui.tabs", {
275
275
return index ;
276
276
} ,
277
277
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
+
278
305
_setOption : function ( key , value ) {
279
306
if ( key === "active" ) {
280
307
// _activate() will handle invalid values and update this.options
Original file line number Diff line number Diff line change @@ -365,7 +365,22 @@ $.Widget.prototype = {
365
365
366
366
return this ;
367
367
} ,
368
+ _elementsFromClassKey : function ( classKey ) {
369
+ return $ ( ) ;
370
+ } ,
368
371
_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
+
369
384
this . options [ key ] = value ;
370
385
371
386
if ( key === "disabled" ) {
@@ -382,19 +397,23 @@ $.Widget.prototype = {
382
397
return this ;
383
398
} ,
384
399
385
- _classes : function ( key ) {
400
+ _classesFromObject : function ( key , classes ) {
386
401
var out = [ ] ,
387
402
parts = key . split ( " " ) ,
388
403
i = parts . length ;
389
404
390
405
while ( i -- ) {
391
406
out . push ( parts [ i ] ) ;
392
- out . push ( this . options . classes [ parts [ i ] ] ) ;
407
+ out . push ( classes [ parts [ i ] ] ) ;
393
408
}
394
409
395
410
return out . join ( " " ) ;
396
411
} ,
397
412
413
+ _classes : function ( key ) {
414
+ return this . _classesFromObject ( key , this . options . classes ) ;
415
+ } ,
416
+
398
417
enable : function ( ) {
399
418
return this . _setOptions ( { disabled : false } ) ;
400
419
} ,
You can’t perform that action at this time.
0 commit comments