Commit 917d76db authored by haxxxton's avatar haxxxton Committed by Valentin Hervieu

ui.bootstrap upgrade (#439)

parent 158eebc9
var app = angular.module('rzSliderDemo', ['rzModule', 'ui.bootstrap']); var app = angular.module('rzSliderDemo', ['rzModule', 'ui.bootstrap']);
app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) { app.controller('MainCtrl', function($scope, $rootScope, $timeout, $uibModal) {
//Minimal slider config //Minimal slider config
$scope.minSlider = { $scope.minSlider = {
value: 10 value: 10
...@@ -517,9 +517,9 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) { ...@@ -517,9 +517,9 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
} }
}; };
$scope.openModal = function() { $scope.openModal = function() {
var modalInstance = $modal.open({ var modalInstance = $uibModal.open({
templateUrl: 'sliderModal.html', templateUrl: 'sliderModal.html',
controller: function($scope, $modalInstance, values) { controller: function($scope, $uibModalInstance, values) {
$scope.percentages = JSON.parse(JSON.stringify(values)); //Copy of the object in order to keep original values in $scope.percentages in parent controller. $scope.percentages = JSON.parse(JSON.stringify(values)); //Copy of the object in order to keep original values in $scope.percentages in parent controller.
...@@ -539,10 +539,10 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) { ...@@ -539,10 +539,10 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
translate: formatToPercentage translate: formatToPercentage
}; };
$scope.ok = function() { $scope.ok = function() {
$modalInstance.close($scope.percentages); $uibModalInstance.close($scope.percentages);
}; };
$scope.cancel = function() { $scope.cancel = function() {
$modalInstance.dismiss(); $uibModalInstance.dismiss();
}; };
}, },
resolve: { resolve: {
......
...@@ -351,14 +351,14 @@ ...@@ -351,14 +351,14 @@
<h2>Sliders inside tabs</h2> <h2>Sliders inside tabs</h2>
<p>Price 1: {{tabSliders.slider1.value}}</p> <p>Price 1: {{tabSliders.slider1.value}}</p>
<p>Price 2: {{tabSliders.slider2.value}}</p> <p>Price 2: {{tabSliders.slider2.value}}</p>
<tabset> <uib-tabset>
<tab heading="Slider 1" select="refreshSlider()"> <uib-tab heading="Slider 1" select="refreshSlider()">
<rzslider rz-slider-model="tabSliders.slider1.value"></rzslider> <rzslider rz-slider-model="tabSliders.slider1.value"></rzslider>
</tab> </uib-tab>
<tab heading="Slider 2" select="refreshSlider()"> <uib-tab heading="Slider 2" select="refreshSlider()">
<rzslider rz-slider-model="tabSliders.slider2.value"></rzslider> <rzslider rz-slider-model="tabSliders.slider2.value"></rzslider>
</tab> </uib-tab>
</tabset> </uib-tabset>
</article> </article>
<article> <article>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment