Merge pull request #2 from mattandersen/master

New option to suppress tickLabel tweening
bseth99 · Oct 22, 2013 · 85f9503 · 85f9503
2 parents 70d328a + ff55d5b
commit 85f9503
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 19 deletions.
diff --git a/dist/ext-jquery-ui.css b/dist/ext-jquery-ui.css
@@ -1,4 +1,4 @@
-/*! Ben's jQuery UI Extensions - v1.0.7 - 2013-09-18
+/*! Ben's jQuery UI Extensions - v1.0.7 - 2013-10-22
 * https://github.com/bseth99/jquery-ui-extensions
 * Includes: jquery.ui.spinner.css, jquery.ui.slidespinner.css, jquery.ui.labeledslider.css, jquery.ui.combobox.css, jquery.ui.waitbutton.css
 * Copyright 2013 Ben Olson; Licensed MIT */

diff --git a/dist/ext-jquery-ui.js b/dist/ext-jquery-ui.js
@@ -1,4 +1,4 @@
-/*! Ben's jQuery UI Extensions - v1.0.7 - 2013-09-18
+/*! Ben's jQuery UI Extensions - v1.0.7 - 2013-10-22
 * https://github.com/bseth99/jquery-ui-extensions
 * Includes: jquery.ui.spinner.js, jquery.ui.combobox.js, jquery.ui.labeledslider.js, jquery.ui.slidespinner.js, jquery.ui.waitbutton.js
 * Copyright 2013 Ben Olson; Licensed MIT */
@@ -743,11 +743,13 @@ $.widget( "ui.spinner", {
 
       options: {
          tickInterval: 0,
+         tweenLabels: true,
          tickLabels: null
       },
 
       uiSlider: null,
       tickInterval: 0,
+      tweenLabels: true,
 
       _create: function( ) {
 
@@ -794,7 +796,7 @@ $.widget( "ui.spinner", {
          for (;i<=cnt;i++) {
             $('<div>').addClass( 'ui-slider-label-ticks' )
                .css( dir, (Math.round( i / cnt * 10000 ) / 100) + '%' )
-               .html( '<span>'+( labels[i*inr+min] ? labels[i*inr+min] : i*inr+min )+'</span>' )
+               .html( '<span>'+( labels[i*inr+min] ? labels[i*inr+min] : (this.options.tweenLabels ? i*inr+min : '') )+'</span>' )
                .appendTo( $lbl );
          }
 

diff --git a/dist/ext-jquery-ui.min.css b/dist/ext-jquery-ui.min.css
diff --git a/dist/ext-jquery-ui.min.js b/dist/ext-jquery-ui.min.js
diff --git a/dist/full/jquery.ui.labeledslider.js b/dist/full/jquery.ui.labeledslider.js
@@ -39,11 +39,13 @@
 
       options: {
          tickInterval: 0,
+         tweenLabels: true,
          tickLabels: null
       },
 
       uiSlider: null,
       tickInterval: 0,
+      tweenLabels: true,
 
       _create: function( ) {
 
@@ -90,7 +92,7 @@
          for (;i<=cnt;i++) {
             $('<div>').addClass( 'ui-slider-label-ticks' )
                .css( dir, (Math.round( i / cnt * 10000 ) / 100) + '%' )
-               .html( '<span>'+( labels[i*inr+min] ? labels[i*inr+min] : i*inr+min )+'</span>' )
+               .html( '<span>'+( labels[i*inr+min] ? labels[i*inr+min] : (this.options.tweenLabels ? i*inr+min : '') )+'</span>' )
                .appendTo( $lbl );
          }
 

diff --git a/dist/minified/jquery.ui.combobox.min.js b/dist/minified/jquery.ui.combobox.min.js
diff --git a/dist/minified/jquery.ui.labeledslider.min.js b/dist/minified/jquery.ui.labeledslider.min.js
diff --git a/dist/minified/jquery.ui.slidespinner.min.js b/dist/minified/jquery.ui.slidespinner.min.js