From 504fbbe76ee4ce7e3b407e4afab705de6031ae2d Mon Sep 17 00:00:00 2001 From: Johannes Raggam Date: Tue, 30 Dec 2014 16:31:43 +0100 Subject: [PATCH 1/3] bootstrap-slider 4.x.x compatibility --- bower.json | 2 +- slider.js | 4 ++-- test.html | 4 ++-- test.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bower.json b/bower.json index 0cd5f65..4d53df7 100644 --- a/bower.json +++ b/bower.json @@ -22,7 +22,7 @@ "tests" ], "dependencies": { - "seiyria-bootstrap-slider": "~3.1.0", + "seiyria-bootstrap-slider": "4.x.x", "angular": "~1.2.16" } } diff --git a/slider.js b/slider.js index d0b50ed..4d24d97 100644 --- a/slider.js +++ b/slider.js @@ -13,7 +13,7 @@ angular.module('ui.bootstrap-slider', []) ngModel: '=', range:'=', sliderid:'=', - formater:'&', + formatter:'&', onStartSlide: '&', onStopSlide: '&', onSlide: '&' @@ -77,7 +77,7 @@ angular.module('ui.bootstrap-slider', []) if (attrs.reversed) options.reversed = attrs.reversed === 'true'; if (attrs.enabled) options.enabled = attrs.enabled === 'true'; if (attrs.naturalarrowkeys) options.natural_arrow_keys = attrs.naturalarrowkeys === 'true'; - if (attrs.formater) options.formater = $scope.$eval($scope.formater); + if (attrs.formatter) options.formatter = $scope.$eval($scope.formatter); if (options.range && !options.value) { options.value = [0, 0]; // This is needed, because of value defined at $.fn.slider.defaults - default value 5 prevents creating range slider diff --git a/test.html b/test.html index 5913ec3..044aadb 100644 --- a/test.html +++ b/test.html @@ -37,7 +37,7 @@



- + {{sliders.thirdSliderValue}}



@@ -63,4 +63,4 @@ - \ No newline at end of file + diff --git a/test.js b/test.js index 1fea90c..f8f2e9b 100644 --- a/test.js +++ b/test.js @@ -30,11 +30,11 @@ angular.module('angular-bootstrap-slider-test', ['ui.bootstrap-slider']) $scope.sliders.thirdSliderValue = 0; - $scope.myFormater = function(value) { + $scope.myFormatter = function(value) { return value + "%"; }; $scope.slideDelegate = function(value){ $log.log('slide value: ' + value); }; - }]); \ No newline at end of file + }]); From a59718b8a8c8f6920b0cffe6e50d01b547834991 Mon Sep 17 00:00:00 2001 From: Johannes Raggam Date: Tue, 30 Dec 2014 16:32:51 +0100 Subject: [PATCH 2/3] depend on newest angular.js, remove deprecated version specifier (version is only declared by git tags) --- bower.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 4d53df7..5d8a452 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,5 @@ { "name": "angular-bootstrap-slider", - "version": "0.0.6", "authors": [ "Kyle Kemp " ], @@ -23,6 +22,6 @@ ], "dependencies": { "seiyria-bootstrap-slider": "4.x.x", - "angular": "~1.2.16" + "angular": "1.3.x" } } From 43f993f341ac17296502043488a31a1ba3a432a8 Mon Sep 17 00:00:00 2001 From: Johannes Raggam Date: Tue, 30 Dec 2014 16:37:24 +0100 Subject: [PATCH 3/3] #33: revert the div wrapping --- slider.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/slider.js b/slider.js index 4d24d97..42c4462 100644 --- a/slider.js +++ b/slider.js @@ -3,7 +3,7 @@ angular.module('ui.bootstrap-slider', []) return { restrict: 'AE', replace: true, - template: '
', + template: '', require: 'ngModel', scope: { max: "=", @@ -83,9 +83,9 @@ angular.module('ui.bootstrap-slider', []) options.value = [0, 0]; // This is needed, because of value defined at $.fn.slider.defaults - default value 5 prevents creating range slider } - var slider = $(element.find(".slider-input")[0]).slider(options); - slider.slider('destroy'); - var slider = $(element.find(".slider-input")[0]).slider(options); + var slider = $(element[0]).slider(options); + element.slider('destroy'); + var slider = $(element[0]).slider(options); var updateEvent = attrs.updateevent || 'slide';