Merge pull request #299 from nparrish/master

Feat: Allow custom translate function when slider steps are specified

Author: ValentinH

dist/rzslider.css

@@ -1,7 +1,7 @@
-/*! angularjs-slider - v2.10.4 - 
- (c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> - 
- https://github.com/angular-slider/angularjs-slider - 
- 2016-03-16 */
+/*! angularjs-slider - v2.10.4 -
+ (c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> -
+ https://github.com/angular-slider/angularjs-slider -
+ 2016-03-28 */
 rzslider {
   position: relative;
   display: inline-block;
@@ -227,4 +227,4 @@ rzslider.rz-vertical .rz-ticks .rz-tick .rz-tick-value {
   top: auto;
   right: -30px;
   transform: translate(0, -28%);
-}
+}

dist/rzslider.js

@@ -1,7 +1,7 @@
-/*! angularjs-slider - v2.10.4 - 
- (c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> - 
- https://github.com/angular-slider/angularjs-slider - 
- 2016-03-16 */
+/*! angularjs-slider - v2.10.4 -
+ (c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> -
+ https://github.com/angular-slider/angularjs-slider -
+ 2016-03-28 */
 /*jslint unparam: true */
 /*global angular: false, console: false, define, module */
 (function(root, factory) {
@@ -423,9 +423,14 @@
           this.options.floor = 0;
           this.options.ceil = this.options.stepsArray.length - 1;
           this.options.step = 1;
-          this.customTrFn = function(value) {
-            return this.options.stepsArray[value];
-          };
+          if (this.options.translate) {
+            this.customTrFn = this.options.translate;
+          }
+          else {
+            this.customTrFn = function(value) {
+              return this.options.stepsArray[value];
+            };
+          }
         } else if (this.options.translate)
           this.customTrFn = this.options.translate;
         else

dist/rzslider.min.css

@@ -427,9 +427,14 @@
           this.options.floor = 0;
           this.options.ceil = this.options.stepsArray.length - 1;
           this.options.step = 1;
-          this.customTrFn = function(value) {
-            return this.options.stepsArray[value];
-          };
+          if (this.options.translate) {
+            this.customTrFn = this.options.translate;
+          }
+          else {
+            this.customTrFn = function(value) {
+              return this.options.stepsArray[value];
+            };
+          }
         } else if (this.options.translate)
           this.customTrFn = this.options.translate;
         else

dist/rzslider.min.js

@@ -115,6 +115,24 @@
         expect(helper.slider.customTrFn(2)).to.equal('C');
       });
 
+      it('should allow a custom translate function when stepsArray is used', function() {
+        helper.scope.slider.options.stepsArray = [{'foo': 'barA'}, {'foo': 'barB'}, {'foo': 'barC'}];
+        helper.scope.slider.options.translate = function(value, sliderId, label) {
+          if (value >= 0 && value < helper.scope.slider.options.stepsArray.length) {
+            return helper.scope.slider.options.stepsArray[value]['foo'];
+          } else {
+            return ""
+          }
+        };
+        helper.scope.$digest();
+        expect(helper.slider.options.step).to.equal(1);
+        expect(helper.slider.options.floor).to.equal(0);
+        expect(helper.slider.options.ceil).to.equal(2);
+
+        expect(helper.slider.customTrFn(0)).to.equal('barA');
+        expect(helper.slider.customTrFn(2)).to.equal('barC');
+      });
+
       it('should sanitize rzSliderModel between floor and ceil', function() {
         helper.scope.slider.options.enforceRange = true;
         helper.scope.slider.value = 1000;