Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
I
i20rzslider
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jedife
i20rzslider
Commits
917d76db
Commit
917d76db
authored
Oct 26, 2016
by
haxxxton
Committed by
Valentin Hervieu
Oct 26, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ui.bootstrap upgrade (#439)
parent
158eebc9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
demo.js
demo/demo.js
+5
-5
index.html
demo/index.html
+6
-6
No files found.
demo/demo.js
View file @
917d76db
var
app
=
angular
.
module
(
'rzSliderDemo'
,
[
'rzModule'
,
'ui.bootstrap'
]);
app
.
controller
(
'MainCtrl'
,
function
(
$scope
,
$rootScope
,
$timeout
,
$
m
odal
)
{
app
.
controller
(
'MainCtrl'
,
function
(
$scope
,
$rootScope
,
$timeout
,
$
uibM
odal
)
{
//Minimal slider config
$scope
.
minSlider
=
{
value
:
10
...
...
@@ -517,9 +517,9 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
}
};
$scope
.
openModal
=
function
()
{
var
modalInstance
=
$
m
odal
.
open
({
var
modalInstance
=
$
uibM
odal
.
open
({
templateUrl
:
'sliderModal.html'
,
controller
:
function
(
$scope
,
$
m
odalInstance
,
values
)
{
controller
:
function
(
$scope
,
$
uibM
odalInstance
,
values
)
{
$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) {
translate
:
formatToPercentage
};
$scope
.
ok
=
function
()
{
$
m
odalInstance
.
close
(
$scope
.
percentages
);
$
uibM
odalInstance
.
close
(
$scope
.
percentages
);
};
$scope
.
cancel
=
function
()
{
$
m
odalInstance
.
dismiss
();
$
uibM
odalInstance
.
dismiss
();
};
},
resolve
:
{
...
...
demo/index.html
View file @
917d76db
...
...
@@ -351,14 +351,14 @@
<h2>
Sliders inside tabs
</h2>
<p>
Price 1: {{tabSliders.slider1.value}}
</p>
<p>
Price 2: {{tabSliders.slider2.value}}
</p>
<tabset>
<tab
heading=
"Slider 1"
select=
"refreshSlider()"
>
<
uib-
tabset>
<
uib-
tab
heading=
"Slider 1"
select=
"refreshSlider()"
>
<rzslider
rz-slider-model=
"tabSliders.slider1.value"
></rzslider>
</tab>
<tab
heading=
"Slider 2"
select=
"refreshSlider()"
>
</
uib-
tab>
<
uib-
tab
heading=
"Slider 2"
select=
"refreshSlider()"
>
<rzslider
rz-slider-model=
"tabSliders.slider2.value"
></rzslider>
</tab>
</tabset>
</
uib-
tab>
</
uib-
tabset>
</article>
<article>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment