Merge pull request seiyria#59 from hmillet/master

Add an alternative for tooltip conflict

Author: seiyria

README.md

@@ -16,3 +16,17 @@ Sample Usage
 <!-- ..or an attribute -->
 <span slider ng-model="sliders.secondSliderValue" min="minTest"></span>
 ```
+
+Troubleshooting
+============
+#### Tooltips
+If you Want to hide the tooltip on your slider (or define a value for the bootstrap-slider `data-slider-tooltip` options, such as "show", "hide" or "always"), you should use the `tooltip` attribute, like this :
+```html
+<!-- it can be used as an element -->
+<slider ng-model="sliders.sliderValue" min="testOptions.min" step="testOptions.step" max="testOptions.max" value="testOptions.value" tooltip="hide"></slider>
+```
+But, if the `tooltip` attribute is in conflict with another angular directive, you can use the alternative `slider-tooltip` attribute :
+```html
+<!-- it can be used as an element -->
+<slider ng-model="sliders.sliderValue" min="testOptions.min" step="testOptions.step" max="testOptions.max" value="testOptions.value" slider-tooltip="hide"></slider>
+```

slider.js

@@ -46,7 +46,7 @@ angular.module('ui.bootstrap-slider', [])
                     setOption('orientation', attrs.orientation, 'horizontal');
                     setOption('selection', attrs.selection, 'before');
                     setOption('handle', attrs.handle, 'round');
-                    setOption('tooltip', attrs.tooltip, 'show');
+                    setOption('tooltip', attrs.sliderTooltip || attrs.tooltip, 'show');
                     setOption('tooltipseparator', attrs.tooltipseparator, ':');
 
                     setFloatOption('min', $scope.min, 0);