Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions app/scripts/app.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,24 @@ angular.module('nouislider', [])

callback = if scope.callback then scope.callback else 'slide'

range =
min: [parseFloat scope.start or 0]
max: [parseFloat scope.end or 100]

scope.$watch('start', (value) ->
range.min = [parseFloat value or 0];
slider.noUiSlider({ range: range }, true)
)

scope.$watch('end', (value) ->
range.max = [parseFloat value or 100];
slider.noUiSlider({ range: range }, true)
)

scope.$watch('step', (value) ->
slider.noUiSlider({ step: parseFloat value or 1 }, true)
)

if scope.ngFrom? and scope.ngTo?
fromParsed = null
toParsed = null
Expand All @@ -27,10 +45,7 @@ angular.module('nouislider', [])
step: parseFloat(scope.step or 1)
connect: true
margin: parseFloat(scope.margin or 0)
range:
min: [parseFloat scope.start]
max: [parseFloat scope.end]

range: range

slider.on callback, ->
[from, to] = slider.val()
Expand Down Expand Up @@ -58,9 +73,7 @@ angular.module('nouislider', [])
slider.noUiSlider
start: [scope.ngModel or scope.start],
step: parseFloat(scope.step or 1)
range:
min: [parseFloat scope.start]
max: [parseFloat scope.end]
range: range

slider.on callback, ->
parsedValue = parseFloat slider.val()
Expand Down
32 changes: 22 additions & 10 deletions src/nouislider.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,24 @@ angular.module('nouislider', []).directive('slider', function () {
ngTo: '='
},
link: function (scope, element, attrs) {
var callback, fromParsed, parsedValue, slider, toParsed;
var callback, fromParsed, parsedValue, range, slider, toParsed;
slider = $(element);
callback = scope.callback ? scope.callback : 'slide';
range = {
min: [parseFloat(scope.start || 0)],
max: [parseFloat(scope.end || 100)]
};
scope.$watch('start', function (value) {
range.min = [parseFloat(value || 0)];
return slider.noUiSlider({ range: range }, true);
});
scope.$watch('end', function (value) {
range.max = [parseFloat(value || 100)];
return slider.noUiSlider({ range: range }, true);
});
scope.$watch('step', function (value) {
return slider.noUiSlider({ step: parseFloat(value || 1) }, true);
});
if (scope.ngFrom != null && scope.ngTo != null) {
fromParsed = null;
toParsed = null;
Expand All @@ -27,10 +42,7 @@ angular.module('nouislider', []).directive('slider', function () {
step: parseFloat(scope.step || 1),
connect: true,
margin: parseFloat(scope.margin || 0),
range: {
min: [parseFloat(scope.start)],
max: [parseFloat(scope.end)]
}
range: range
});
slider.on(callback, function () {
var from, to, _ref;
Expand Down Expand Up @@ -63,10 +75,7 @@ angular.module('nouislider', []).directive('slider', function () {
slider.noUiSlider({
start: [scope.ngModel || scope.start],
step: parseFloat(scope.step || 1),
range: {
min: [parseFloat(scope.start)],
max: [parseFloat(scope.end)]
}
range: range
});
slider.on(callback, function () {
parsedValue = parseFloat(slider.val());
Expand All @@ -76,10 +85,13 @@ angular.module('nouislider', []).directive('slider', function () {
});
return scope.$watch('ngModel', function (newVal, oldVal) {
if (newVal !== parsedValue) {
parsedValue = null;
return slider.val(newVal);
}
});
}
}
};
});
}); /*
//@ sourceMappingURL=app.js.map
*/
2 changes: 1 addition & 1 deletion src/nouislider.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.