Skip to content

Commit 917d76d

Browse files
haxxxtonValentinH
authored andcommitted
ui.bootstrap upgrade (#439)
1 parent 158eebc commit 917d76d

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

demo/demo.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var app = angular.module('rzSliderDemo', ['rzModule', 'ui.bootstrap']);
22

3-
app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
3+
app.controller('MainCtrl', function($scope, $rootScope, $timeout, $uibModal) {
44
//Minimal slider config
55
$scope.minSlider = {
66
value: 10
@@ -517,9 +517,9 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
517517
}
518518
};
519519
$scope.openModal = function() {
520-
var modalInstance = $modal.open({
520+
var modalInstance = $uibModal.open({
521521
templateUrl: 'sliderModal.html',
522-
controller: function($scope, $modalInstance, values) {
522+
controller: function($scope, $uibModalInstance, values) {
523523
$scope.percentages = JSON.parse(JSON.stringify(values)); //Copy of the object in order to keep original values in $scope.percentages in parent controller.
524524

525525

@@ -539,10 +539,10 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
539539
translate: formatToPercentage
540540
};
541541
$scope.ok = function() {
542-
$modalInstance.close($scope.percentages);
542+
$uibModalInstance.close($scope.percentages);
543543
};
544544
$scope.cancel = function() {
545-
$modalInstance.dismiss();
545+
$uibModalInstance.dismiss();
546546
};
547547
},
548548
resolve: {

demo/index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -351,14 +351,14 @@ <h2>Sliders inside a modal</h2>
351351
<h2>Sliders inside tabs</h2>
352352
<p>Price 1: {{tabSliders.slider1.value}}</p>
353353
<p>Price 2: {{tabSliders.slider2.value}}</p>
354-
<tabset>
355-
<tab heading="Slider 1" select="refreshSlider()">
354+
<uib-tabset>
355+
<uib-tab heading="Slider 1" select="refreshSlider()">
356356
<rzslider rz-slider-model="tabSliders.slider1.value"></rzslider>
357-
</tab>
358-
<tab heading="Slider 2" select="refreshSlider()">
357+
</uib-tab>
358+
<uib-tab heading="Slider 2" select="refreshSlider()">
359359
<rzslider rz-slider-model="tabSliders.slider2.value"></rzslider>
360-
</tab>
361-
</tabset>
360+
</uib-tab>
361+
</uib-tabset>
362362
</article>
363363

364364
<article>

0 commit comments

Comments
 (0)