Merge pull request #158 from rzajac/2.0.0

Refactor to add an rzSliderOptions attribute

CHANGELOG.md

+# 2.0.0 (2015-11-XX)
+## Breaking changes
+- All attributes except `rzSliderModel` and `rzSliderHigh` are moved to `rzSliderOptions`. (See the new documentation in ReadMe)
+
+## Features
+- Add a `rzSliderOptions` attribute to pass options to the slider.
+- Add a `RzSliderOptions.options()` method to set global options.
+- Add a `scale` option to fix sliders displayed in an element that uses `transform: scale(0.5)`.
+- Add a `stepsArray` option (#163)
+- Add an `id` option that is passed to the translate function as second arg (#161)
+- Add a `ticksValuesTooltip` option that is used to display a tooltip on the ticks values (requires angular-ui bootstrap).
+
 # 1.1.0 (2015-11-07)
 ## Features
 - Configurable update interval (#153)

Gruntfile.js

@@ -71,16 +71,17 @@ module.exports = function(grunt) {
     replace: {
       dist: {
         options: {
-                    patterns: [
-                        {
+          patterns: [{
             match: /\/\*templateReplacement\*\//,
             replacement: '<%= grunt.file.read("temp/templates.js") %>'
-                        }
-                    ]
+          }]
         },
-                files: [
-                    {expand: true, flatten: true, src: ['src/rzslider.js'], dest: 'dist/'}
-                ]
+        files: [{
+          expand: true,
+          flatten: true,
+          src: ['src/rzslider.js'],
+          dest: 'dist/'
+        }]
       }
     },
 
@@ -94,8 +95,7 @@ module.exports = function(grunt) {
         }, {
           expand: true,
           src: ['dist/rzslider.js']
-                }
-                ]
+        }]
       }
     },
     watch: {

bower.json

 {
   "name": "angularjs-slider",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "homepage": "https://github.com/rzajac/angularjs-slider",
   "authors": [
     "Rafal Zajac <rzajac@gmail.com>",

demo/demo.css

 * { margin: 0; padding: 0; }
-body { font-family: 'Open Sans', sans-serif; color: #1f2636; font-size: 14px; }
+body { font-family: 'Open Sans', sans-serif; color: #1f2636; font-size: 14px; padding-bottom: 40px; }
 header { background: #0db9f0; color: #fff; margin: -40px; margin-bottom: 40px; text-align: center; padding: 40px 0; }
 h1 { font-weight: 300; }
+h2 {margin-bottom:10px;}
 .wrapper { background: #fff; padding: 40px; }
-article { margin-bottom: 40px; }
-
+article { margin-bottom: 10px; }
+.tab-pane{
+  padding-top: 10px;
+}
+.field-title {
+  width: 100px;
+}

demo/demo.js

+var app = angular.module('rzSliderDemo', ['rzModule', 'ui.bootstrap']);
+
+app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
+  //Minimal slider config
+  $scope.minSlider = {
+    value: 10
+  };
+
+  //Slider with selection bar
+  $scope.slider_visible_bar = {
+    value: 10,
+    options: {
+      showSelectionBar: true
+    }
+  };
+
+  //Range slider config
+  $scope.minRangeSlider = {
+    minValue: 10,
+    maxValue: 90,
+    options: {
+      floor: 0,
+      ceil: 100,
+      step: 1
+    }
+  };
+
+  //Slider config with floor, ceil and step
+  $scope.slider_floor_ceil = {
+    value: 12,
+    options: {
+      floor: 10,
+      ceil: 100,
+      step: 5
+    }
+  };
+
+  //Slider config with callbacks
+  $scope.slider_callbacks = {
+    value: 100,
+    options: {
+      onStart: function() {
+        $scope.otherData.start = $scope.slider_callbacks.value * 10;
+      },
+      onChange: function() {
+        $scope.otherData.change = $scope.slider_callbacks.value * 10;
+      },
+      onEnd: function() {
+        $scope.otherData.end = $scope.slider_callbacks.value * 10;
+      }
+    }
+  };
+  $scope.otherData = {start: 0, change: 0, end: 0};
+
+  //Slider config with custom display function
+  $scope.slider_translate = {
+    minValue: 100,
+    maxValue: 400,
+    options: {
+      ceil: 500,
+      floor: 0,
+      translate: function(value) {
+        return '$' + value;
+      }
+    }
+  };
+
+  //Slider config with steps array of letters
+  $scope.slider_alphabet = {
+    value: 0,
+    options: {
+      stepsArray:'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('')
+    }
+  };
+
+  //Slider with ticks
+  $scope.slider_ticks = {
+    value: 5,
+    options: {
+      ceil: 10,
+      floor: 0,
+      showTicks: true
+    }
+  };
+
+  //Slider with ticks and values
+  $scope.slider_ticks_values = {
+    value: 5,
+    options: {
+      ceil: 10,
+      floor: 0,
+      showTicksValues: true,
+      ticksValuesTooltip: function(v) {
+        return 'Tooltip for ' + v;
+      }
+    }
+  };
+
+  //Range slider with ticks and values
+  $scope.range_slider_ticks_values = {
+    minValue: 1,
+    maxValue: 8,
+    options: {
+      ceil: 10,
+      floor: 0,
+      showTicksValues: true
+    }
+  };
+
+  //Slider with draggable range
+  $scope.slider_draggable_range = {
+    minValue: 1,
+    maxValue: 8,
+    options: {
+      ceil: 10,
+      floor: 0,
+      draggableRange: true
+    }
+  };
+
+  //Read-only slider
+  $scope.read_only_slider = {
+    value: 50,
+    options: {
+      ceil: 100,
+      floor: 0,
+      readOnly: true
+    }
+  };
+
+  //Disabled slider
+  $scope.disabled_slider = {
+    value: 50,
+    options: {
+      ceil: 100,
+      floor: 0,
+      disabled: true
+    }
+  };
+
+  // Slider inside ng-show
+  $scope.visible = false;
+  $scope.slider_toggle = {
+    value: 5,
+    options: {
+      ceil: 10,
+      floor: 0
+    }
+  };
+  $scope.toggle = function() {
+    $scope.visible = !$scope.visible;
+    $timeout(function() {
+      $scope.$broadcast('rzSliderForceRender');
+    });
+  };
+
+  //Slider inside modal
+  $scope.percentages = {
+    normal: {
+      low: 15
+    },
+    range: {
+      low: 10,
+      high: 50
+    }
+  };
+  $scope.openModal = function() {
+    var modalInstance = $modal.open({
+      templateUrl: 'sliderModal.html',
+      controller: function($scope, $modalInstance, values) {
+        $scope.percentages = JSON.parse(JSON.stringify(values)); //Copy of the object in order to keep original values in $scope.percentages in parent controller.
+
+
+        var formatToPercentage = function(value) {
+          return value + '%';
+        };
+
+        $scope.percentages.normal.options = {
+          floor: 0,
+          ceil: 100,
+          translate: formatToPercentage,
+          showSelectionBar: true
+        };
+        $scope.percentages.range.options = {
+          floor: 0,
+          ceil: 100,
+          translate: formatToPercentage
+        };
+        $scope.ok = function() {
+          $modalInstance.close($scope.percentages);
+        };
+        $scope.cancel = function() {
+          $modalInstance.dismiss();
+        };
+      },
+      resolve: {
+        values: function() {
+          return $scope.percentages;
+        }
+      }
+    });
+    modalInstance.result.then(function(percentages) {
+      $scope.percentages = percentages;
+    });
+    modalInstance.rendered.then(function() {
+      $rootScope.$broadcast('rzSliderForceRender');//Force refresh sliders on render. Otherwise bullets are aligned at left side.
+    });
+  };
+
+
+  //Slider inside tabs
+  $scope.tabSliders = {
+    slider1: {
+      value: 100
+    },
+    slider2: {
+      value: 200
+    }
+  };
+  $scope.refreshSlider = function() {
+    $timeout(function() {
+      $scope.$broadcast('rzSliderForceRender');
+    });
+  };
+
+
+  //Slider with draggable range
+  $scope.slider_all_options = {
+    minValue: 2,
+    options: {
+      floor: 0,
+      ceil: 10,
+      step: 1,
+      precision: 0,
+      draggableRange: false,
+      showSelectionBar: false,
+      hideLimitLabels: false,
+      readOnly: false,
+      disabled: false,
+      showTicks: false,
+      showTicksValues: false
+    }
+  };
+  $scope.toggleHighValue = function() {
+    if($scope.slider_all_options.maxValue != null) {
+      $scope.slider_all_options.maxValue = undefined;
+    }
+    else {
+      $scope.slider_all_options.maxValue = 8;
+    }
+  }
+});

demo/sliderModal.html

+<div class="modal-body">
+  <div class="container-fluid">
+    <div class="row">
+      <div class="col-md-12 col-lg-12">
+        <label class="control-label">Normal slider into modal</label>
+        <rzslider
+          rz-slider-model="percentages.normal.low"
+          rz-slider-options="percentages.normal.options">
+        </rzslider>
+      </div>
+    </div>
+    <div class="row">
+      <div class=" col-md-12 col-lg-12">
+        <label class="control-label">Range slider into modal</label>
+        <rzslider
+          rz-slider-model="percentages.range.low"
+          rz-slider-high="percentages.range.high"
+          rz-slider-options="percentages.range.options">
+        </rzslider>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-12">
+        <button type="button" ng-click="ok()" class="btn btn-primary">Save</button>
+        <button type="button" ng-click="cancel()" class="btn btn-default">Cancel</button>
+      </div>
+    </div>
+  </div>
+</div>

dist/rzslider.css

@@ -16,7 +16,7 @@ rzslider {
   display: inline-block;
   width: 100%;
   height: 4px;
-  margin: 30px 0 15px 0;
+  margin: 35px 0 15px 0;
   vertical-align: middle;
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -55,6 +55,10 @@ rzslider .rz-bar-wrapper {
   box-sizing: border-box;
 }
 
+rzslider .rz-bar-wrapper.rz-draggable {
+  cursor: move;
+}
+
 rzslider .rz-bar {
   left: 0;
   z-index: 1;

dist/rzslider.min.css

-/*! angularjs-slider - v1.1.0 - (c) Rafal Zajac <rzajac@gmail.com>, Valentin Hervieu <valentin@hervieu.me>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com>, https://github.com/rzajac/angularjs-slider.git - 2015-11-07 */
-rzslider{position:relative;display:inline-block;width:100%;height:4px;margin:30px 0 15px 0;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}rzslider[disabled]{cursor:not-allowed}rzslider[disabled] .rz-pointer{cursor:not-allowed;background-color:#d8e0f3}rzslider span{position:absolute;display:inline-block;white-space:nowrap}rzslider .rz-base{width:100%;height:100%;padding:0}rzslider .rz-bar-wrapper{left:0;z-index:1;width:100%;height:32px;padding-top:16px;margin-top:-16px;box-sizing:border-box}rzslider .rz-bar{left:0;z-index:1;width:100%;height:4px;background:#d8e0f3;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}rzslider .rz-bar.rz-selection{z-index:2;background:#0db9f0;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}rzslider .rz-pointer{top:-14px;z-index:3;width:32px;height:32px;cursor:pointer;background-color:#0db9f0;-webkit-border-radius:16px;-moz-border-radius:16px;border-radius:16px}rzslider .rz-pointer:after{position:absolute;top:12px;left:12px;width:8px;height:8px;background:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;content:''}rzslider .rz-pointer:hover:after{background-color:#fff}rzslider .rz-pointer.rz-active:after{background-color:#451aff}rzslider .rz-bubble{bottom:16px;padding:1px 3px;color:#55637d;cursor:default}rzslider .rz-bubble.rz-selection{top:16px}rzslider .rz-bubble.rz-limit{color:#55637d}rzslider .rz-ticks{position:absolute;top:-3px;left:0;z-index:1;display:flex;width:100%;padding:0 11px;margin:0;list-style:none;box-sizing:border-box;justify-content:space-between}rzslider .rz-ticks .tick{width:10px;height:10px;text-align:center;cursor:pointer;background:#d8e0f3;border-radius:50%}rzslider .rz-ticks .tick.selected{background:#0db9f0}rzslider .rz-ticks .tick .tick-value{position:absolute;top:-30px;transform:translate(-50%,0)}
+/*! angularjs-slider - v2.0.0 - (c) Rafal Zajac <rzajac@gmail.com>, Valentin Hervieu <valentin@hervieu.me>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com>, https://github.com/rzajac/angularjs-slider.git - 2015-11-12 */
+rzslider{position:relative;display:inline-block;width:100%;height:4px;margin:35px 0 15px 0;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}rzslider[disabled]{cursor:not-allowed}rzslider[disabled] .rz-pointer{cursor:not-allowed;background-color:#d8e0f3}rzslider span{position:absolute;display:inline-block;white-space:nowrap}rzslider .rz-base{width:100%;height:100%;padding:0}rzslider .rz-bar-wrapper{left:0;z-index:1;width:100%;height:32px;padding-top:16px;margin-top:-16px;box-sizing:border-box}rzslider .rz-bar-wrapper.rz-draggable{cursor:move}rzslider .rz-bar{left:0;z-index:1;width:100%;height:4px;background:#d8e0f3;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}rzslider .rz-bar.rz-selection{z-index:2;background:#0db9f0;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}rzslider .rz-pointer{top:-14px;z-index:3;width:32px;height:32px;cursor:pointer;background-color:#0db9f0;-webkit-border-radius:16px;-moz-border-radius:16px;border-radius:16px}rzslider .rz-pointer:after{position:absolute;top:12px;left:12px;width:8px;height:8px;background:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;content:''}rzslider .rz-pointer:hover:after{background-color:#fff}rzslider .rz-pointer.rz-active:after{background-color:#451aff}rzslider .rz-bubble{bottom:16px;padding:1px 3px;color:#55637d;cursor:default}rzslider .rz-bubble.rz-selection{top:16px}rzslider .rz-bubble.rz-limit{color:#55637d}rzslider .rz-ticks{position:absolute;top:-3px;left:0;z-index:1;display:flex;width:100%;padding:0 11px;margin:0;list-style:none;box-sizing:border-box;justify-content:space-between}rzslider .rz-ticks .tick{width:10px;height:10px;text-align:center;cursor:pointer;background:#d8e0f3;border-radius:50%}rzslider .rz-ticks .tick.selected{background:#0db9f0}rzslider .rz-ticks .tick .tick-value{position:absolute;top:-30px;transform:translate(-50%,0)}
\ No newline at end of file

package.json

 {
   "name": "angularjs-slider",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "AngularJS slider directive with no external dependencies. Mobile friendly!.",
   "main": "dist/rzslider.js",
   "repository": {

src/rzslider.less

@@ -14,7 +14,7 @@ rzslider {
   position: relative;
   height: @barHeight;
   width: 100%;
-  margin: 30px 0 15px 0;
+  margin: 35px 0 15px 0;
   vertical-align: middle;
   -webkit-user-select: none;
   -moz-user-select: none;
@@ -49,6 +49,9 @@ rzslider {
     width: 100%;
     height: @handleSize;
     z-index: 1;
+    &.rz-draggable {
+      cursor: move;
+    }
   }
 
   .rz-bar {