1- /*! Ben's jQuery UI Extensions - v1.0.13 - 2014-02-26
1+ /*! Ben's jQuery UI Extensions - v1.0.14 - 2014-03-05
22* https://github.com/bseth99/jquery-ui-extensions
33* Includes: jquery.ui.spinner.js, jquery.ui.combobox.js, jquery.ui.labeledslider.js, jquery.ui.slidespinner.js, jquery.ui.waitbutton.js
44* Copyright 2014 Ben Olson; Licensed MIT */
@@ -16,7 +16,7 @@ function modifier( fn ) {
1616}
1717
1818$ . widget ( "ui.spinner" , {
19- version : "1.0.13 " ,
19+ version : "1.0.14 " ,
2020 defaultElement : "<input>" ,
2121 widgetEventPrefix : "spin" ,
2222 options : {
@@ -526,7 +526,7 @@ $.widget( "ui.spinner", {
526526
527527 $ . widget ( "ui.combobox" , {
528528
529- version : "1.0.13 " ,
529+ version : "1.0.14 " ,
530530
531531 widgetEventPrefix : "combobox" ,
532532
@@ -775,7 +775,7 @@ $.widget( "ui.spinner", {
775775
776776 $ . widget ( "ui.labeledslider" , $ . ui . slider , {
777777
778- version : "1.0.13 " ,
778+ version : "1.0.14 " ,
779779
780780 options : {
781781 tickInterval : 0 ,
@@ -825,32 +825,28 @@ $.widget( "ui.spinner", {
825825 min = this . options . min ,
826826 max = this . options . max ,
827827 inr = this . tickInterval ,
828- cnt = ( max - min ) / inr ,
828+ cnt = ( max - min ) ,
829829 tickArray = this . options . tickArray ,
830+ ta = tickArray . length > 0 ,
831+ label , pt ,
830832 i = 0 ;
831833
832834 $lbl . html ( '' ) ;
833835
834- if ( tickArray . length > 0 ) {
835- // tickArray provided, print labels only in the array
836- for ( i = 0 ; i < tickArray . length ; i ++ ) {
837- var label = labels [ tickArray [ i ] ] ;
838- label = label ? label : tickArray [ i ] ;
836+ for ( ; i <= cnt ; i ++ ) {
839837
840- $ ( '<div>' ) . addClass ( 'ui-slider-label-ticks' ) . addClass ( 'ui-slider-label-tick-' + tickArray [ i ] )
841- . css ( dir , ( Math . round ( ( tickArray [ i ] - min ) / cnt * 10000 ) / 100 ) + '%' )
842- . html ( '<span>' + label + '</span>' )
838+ if ( ( ! ta && i % inr == 0 ) || ( ta && tickArray . indexOf ( i + min ) > - 1 ) ) {
839+
840+ label = labels [ i + min ] ? labels [ i + min ] : ( this . options . tweenLabels ? i + min : '' ) ;
841+
842+ $ ( '<div>' ) . addClass ( 'ui-slider-label-ticks' )
843+ . css ( dir , ( Math . round ( ( i / cnt ) * 10000 ) / 100 ) + '%' )
844+ . html ( '<span>' + ( label ) + '</span>' )
843845 . appendTo ( $lbl ) ;
846+
844847 }
845848 }
846- else {
847- for ( ; i <= cnt ; i ++ ) {
848- $ ( '<div>' ) . addClass ( 'ui-slider-label-ticks' )
849- . css ( dir , ( Math . round ( i / cnt * 10000 ) / 100 ) + '%' )
850- . html ( '<span>' + ( labels [ i * inr + min ] ? labels [ i * inr + min ] : ( this . options . tweenLabels ? i * inr + min : '' ) ) + '</span>' )
851- . appendTo ( $lbl ) ;
852- }
853- }
849+
854850 } ,
855851
856852 _setOption : function ( key , value ) {
@@ -905,7 +901,7 @@ $.widget( "ui.spinner", {
905901
906902$ . widget ( "ui.slidespinner" , $ . ui . spinner , {
907903
908- version : "1.0.13 " ,
904+ version : "1.0.14 " ,
909905
910906 widgetEventPrefix : "slidespinner" ,
911907
@@ -998,7 +994,7 @@ $.widget( "ui.slidespinner", $.ui.spinner, {
998994( function ( $ , undefined ) {
999995 $ . widget ( "ui.waitbutton" , $ . ui . button , {
1000996
1001- version : "1.0.13 " ,
997+ version : "1.0.14 " ,
1002998
1003999 // Keep button prefix instead of waitbutton
10041000 // otherwise waiting event is waitbuttonwaiting
0 commit comments