jinql
/
blur-admin
mirror of https://github.com/akveo/blur-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor(sliders): add timeout on init

pull/3/head
alex 2016-02-18 12:50:42 +03:00
parent 0b4be2cc5a
commit f85f0d62f7
4 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/pages/ui/slider/slider.html
View File

@ -8,7 +8,8 @@
min="0" min="0"
max="100" max="100"
from="45" from="45"
disable="false"> disable="false"
timeout="300">
</ion-slider> </ion-slider>
</div> </div>
<div> <div>
@ -19,7 +20,8 @@
max="1200" max="1200"
prefix="$" prefix="$"
from="420" from="420"
disable="false"> disable="false"
timeout="300">
</ion-slider> </ion-slider>
</div> </div>
<div> <div>
@ -30,7 +32,8 @@
max="90" max="90"
postfix="°" postfix="°"
from="36" from="36"
disable="false"> disable="false"
timeout="300">
</ion-slider> </ion-slider>
</div> </div>
<div> <div>
@ -41,7 +44,8 @@
max="1200" max="1200"
from="420" from="420"
to="900" to="900"
disable="false"> disable="false"
timeout="300">
</ion-slider> </ion-slider>
</div> </div>
<div> <div>
@ -52,7 +56,8 @@
max="1000" max="1000"
from="300" from="300"
step="50" step="50"
disable="false"> disable="false"
timeout="300">
</ion-slider> </ion-slider>
</div> </div>
<div> <div>
@ -65,7 +70,8 @@
step="1000" step="1000"
prettify-separator="." prettify-separator="."
prettify="true" prettify="true"
disable="false"> disable="false"
timeout="300">
</ion-slider> </ion-slider>
</div> </div>
<div> <div>
@ -78,7 +84,8 @@
'April', 'May', 'June', 'April', 'May', 'June',
'July', 'August', 'September', 'July', 'August', 'September',
'October', 'November', 'December']" 'October', 'November', 'December']"
disable="false"> disable="false"
timeout="300">
</ion-slider> </ion-slider>
</div> </div>
<div> <div>
@ -88,7 +95,8 @@
min="0" min="0"
max="100" max="100"
from="45" from="45"
disable="true"> disable="true"
timeout="300">
</ion-slider> </ion-slider>
</div> </div>
</div> </div>

6
src/app/theme/directives/ionSlider.js
View File

@ -33,10 +33,13 @@
disable: '=', disable: '=',
onChange: '=', onChange: '=',
onFinish: '=', onFinish: '=',
values: '=' values: '=',
timeout: '@'
}, },
link: function ($scope, $element) { link: function ($scope, $element) {
(function init() { (function init() {
var timeout = $scope.timeout || 0;
$timeout(function(){
$element.ionRangeSlider({ $element.ionRangeSlider({
min: $scope.min, min: $scope.min,
max: $scope.max, max: $scope.max,
@ -58,6 +61,7 @@
onFinish: $scope.onFinish, onFinish: $scope.onFinish,
values: $scope.values values: $scope.values
}); });
}, timeout);
})(); })();
$scope.$watch('min', function (value) { $scope.$watch('min', function (value) {
$timeout(function () { $timeout(function () {

1
src/sass/theme/dashboard/_todo.scss
View File

@ -128,6 +128,7 @@ body.badmin-transparent {
width: calc(100% - 25px); width: calc(100% - 25px);
opacity: 0.9; opacity: 0.9;
border: none; border: none;
background: transparent;
&:focus { &:focus {
outline: none; outline: none;
background-color: transparent; background-color: transparent;

3
src/sass/theme/skins/_02_transparent.scss
View File

@ -25,4 +25,7 @@ body.badmin-transparent {
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
@include placeholderStyle($default, 0.6); @include placeholderStyle($default, 0.6);
} }
.irs-grid-text {
color: $default;
}
} }