Skip to content

Commit

Permalink
Fix issue 04109: Slider description has incorrectly position, when mo…
Browse files Browse the repository at this point in the history 
…ving slider from right to left

Dev Fixed slider callout position lag and modified styles for slider left/right text and slider show min/max

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8432 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
Tony Partner committed Feb 24, 2010
1 parent d7351d4 commit 5d05b1d
Show file tree
Hide file tree
Showing 31 changed files with 274 additions and 222 deletions.
127 changes: 66 additions & 61 deletions scripts/jquery/lime-slider.js
View file
Original file line number Diff line number Diff line change
@@ -1,61 +1,66 @@
// This file will auto convert slider divs to sliders
$(document).ready(function(){
// call the init slider routine for each element of the .multinum-slider class
$(".multinum-slider").each(function(i,e) {
var basename = e.id.substr(10);

$(this).prev('label').addClass('slider-label'); //3796 TP - add a class to the labels in slider questions to facilitate styling

//$("#slider-"+basename).addClass('ui-slider-2');
//$("#slider-handle-"+basename).addClass('ui-slider-handle2');
var slider_divisor = $('#slider-param-divisor-' + basename).attr('value');
var slider_min = $('#slider-param-min-' + basename).attr('value');
var slider_max = $('#slider-param-max-' + basename).attr('value');
var slider_stepping = $('#slider-param-stepping-' + basename).attr('value');
var slider_startvalue = $('#slider-param-startvalue-' + basename).attr('value');
var slider_onchange = $('#slider-onchange-js-' + basename).attr('value');
var slider_prefix = $('#slider-prefix-' + basename).attr('value');
var slider_suffix = $('#slider-suffix-' + basename).attr('value');
var sliderparams = Array();

sliderparams['min'] = slider_min*1; // to force numerical we multiply with 1
sliderparams['max'] = slider_max*1; // to force numerical we multiply with 1
// not using the stepping param because it is not smooth
// using Math.round workaround instead
//sliderparams['stepping'] = slider_stepping;
//sliderparams['animate'] = true;
if (slider_startvalue != 'NULL')
{
sliderparams['value']= slider_startvalue*1;
}
sliderparams['slide'] = function(e, ui) {
//var thevalue = ui.value / slider_divisor;
if ($('#slider-modifiedstate-'+basename).val() ==0) $('#slider-modifiedstate-'+basename).val('1');
var thevalue = slider_stepping * Math.round(ui.value / slider_stepping) / slider_divisor;
$('#slider-callout-'+basename).css('left', $(ui.handle).css('left')).text(slider_prefix + thevalue + slider_suffix);
};
sliderparams['stop'] = function(e, ui) {
//var thevalue = ui.value / slider_divisor;
var thevalue = slider_stepping * Math.round(ui.value / slider_stepping) / slider_divisor;
$('#slider-callout-'+basename).css('left', $(ui.handle).css('left')).text(slider_prefix + thevalue + slider_suffix);
};

sliderparams['change'] = function(e, ui) {
//var thevalue = ui.value / slider_divisor;
var thevalue = slider_stepping * Math.round(ui.value / slider_stepping) / slider_divisor;
$('#answer'+basename).val(thevalue);
checkconditions( thevalue,'#answer'+basename,'text');
eval(slider_onchange);
};


$('#slider-'+basename).slider(sliderparams);


if (slider_startvalue != 'NULL' && $('#slider-modifiedstate-'+basename).val() !=0)
{
var thevalue = slider_startvalue / slider_divisor;
$('#slider-callout-'+basename).css('left', $('#slider-handle-'+basename).css('left')).text(slider_prefix + thevalue + slider_suffix);
}
})
});
// This file will auto convert slider divs to sliders
$(document).ready(function(){
// call the init slider routine for each element of the .multinum-slider class
$(".multinum-slider").each(function(i,e) {
var basename = e.id.substr(10);

$(this).prev('label').addClass('slider-label'); //3796 TP - add a class to the labels in slider questions to facilitate styling

//$("#slider-"+basename).addClass('ui-slider-2');
//$("#slider-handle-"+basename).addClass('ui-slider-handle2');
var slider_divisor = $('#slider-param-divisor-' + basename).attr('value');
var slider_min = $('#slider-param-min-' + basename).attr('value');
var slider_max = $('#slider-param-max-' + basename).attr('value');
var slider_stepping = $('#slider-param-stepping-' + basename).attr('value');
var slider_startvalue = $('#slider-param-startvalue-' + basename).attr('value');
var slider_onchange = $('#slider-onchange-js-' + basename).attr('value');
var slider_prefix = $('#slider-prefix-' + basename).attr('value');
var slider_suffix = $('#slider-suffix-' + basename).attr('value');
var sliderparams = Array();

sliderparams['min'] = slider_min*1; // to force numerical we multiply with 1
sliderparams['max'] = slider_max*1; // to force numerical we multiply with 1
// not using the stepping param because it is not smooth
// using Math.round workaround instead
//sliderparams['stepping'] = slider_stepping;
//sliderparams['animate'] = true;
if (slider_startvalue != 'NULL')
{
sliderparams['value']= slider_startvalue*1;
}
sliderparams['slide'] = function(e, ui) {
//var thevalue = ui.value / slider_divisor;
if ($('#slider-modifiedstate-'+basename).val() ==0) $('#slider-modifiedstate-'+basename).val('1');

function updateCallout() {
var thevalue = slider_stepping * Math.round(ui.value / slider_stepping) / slider_divisor;
$('#slider-callout-'+basename).css('left', $(ui.handle).css('left')).text(slider_prefix + thevalue + slider_suffix);
}
// Delay updating the callout because it was picking up the last postion of the slider
setTimeout(updateCallout, 10);
};
sliderparams['stop'] = function(e, ui) {
//var thevalue = ui.value / slider_divisor;
var thevalue = slider_stepping * Math.round(ui.value / slider_stepping) / slider_divisor;
$('#slider-callout-'+basename).css('left', $(ui.handle).css('left')).text(slider_prefix + thevalue + slider_suffix);
};

sliderparams['change'] = function(e, ui) {
//var thevalue = ui.value / slider_divisor;
var thevalue = slider_stepping * Math.round(ui.value / slider_stepping) / slider_divisor;
$('#answer'+basename).val(thevalue);
checkconditions( thevalue,'#answer'+basename,'text');
eval(slider_onchange);
};


$('#slider-'+basename).slider(sliderparams);


if (slider_startvalue != 'NULL' && $('#slider-modifiedstate-'+basename).val() !=0)
{
var thevalue = slider_startvalue / slider_divisor;
$('#slider-callout-'+basename).css('left', $('#slider-handle-'+basename).css('left')).text(slider_prefix + thevalue + slider_suffix);
}
})
});
8 changes: 4 additions & 4 deletions templates/basic/ie_fix_6.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,16 +126,17 @@ input.submit

.numeric-multi label.slider-label {
margin-top: 1.3em;
width: 40%;
}

.slider_lefttext {
float: left;
margin-top: 1.4em;
padding-top: 1.4em;
}

.slider_righttext {
float: left;
margin-top: 1.4em;
padding-top: 1.4em;
}

.ui-slider-1 {
Expand All @@ -147,15 +148,14 @@ input.submit
float: none;
position: absolute;
top: 17px;
left: -22px;
}

.slider_showmax {
margin: 0;
float: none;
position: absolute;
top: 17px;
left: 178px;
left: 150px;
}


Expand Down
6 changes: 4 additions & 2 deletions templates/basic/ie_fix_7.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,17 @@ input.submit

.numeric-multi label.slider-label {
margin-top: 1.3em;
display: inline;
width: 40%;
}

.slider_lefttext {
float: left;
margin-top: 1.5em;
padding-top: 1.4em;
}

.slider_righttext {
float: left;
margin-top: 1.5em;
padding-top: 1.4em;
}

51 changes: 36 additions & 15 deletions templates/basic/template.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,13 +460,6 @@ ul.cols-8 li , ul.cols-8-ul , table.cols-8 td { width: 11.5%; }
padding: 0.3em 1em 0% 0%;
}

.numeric-multi div.multinum-slider {
width: auto;
float: left;
margin-top: 1.5em;
margin-bottom: 0.2em;
}

.numeric-multi ul.multiplenumerichelp
,.numeric-multi ul.multiplenumerichelp.slider
{
Expand Down Expand Up @@ -559,50 +552,78 @@ ul.cols-8 li , ul.cols-8-ul , table.cols-8 td { width: 11.5%; }
vertical-align: middle;
}

.numeric-multi div.multinum-slider {
width: auto;
float: left;
margin-top: 1.5em;
margin-bottom: 0.2em;
}

.ui-slider-handle { position: absolute; height: 23px; width: 12px; top: 0px; left: 0px; background-image: url(../../images/slider-handle.gif); }
.ui-slider-disabled .ui-slider-handle { opacity: 0.5; filter: alpha(opacity=50); }
.ui-slider-1 {
width: 200px;
height: 9px;
margin-bottom: 20px;
}
.ui-slider-2 { width: 200px; height: 23px; position: relative; background-image: url(../../images/slider-bg-2.png); background-repeat: no-repeat; background-position: center center; }
.slider_callout { no-repeat; height: 20px; width: 100px; overflow: hidden; position: absolute; top: -17px; margin-left:+15px; font-family: 'Myriad Pro'; color: #284a6e; font-weight: bold; text-align: left;}
.ui-slider-2 {
width: 200px;
height: 23px;
position: relative;
background-image: url(../../images/slider-bg-2.png);
background-repeat: no-repeat;
background-position: center center;
}

.slider_callout {
no-repeat; height: 20px;
width: 100px;
overflow: hidden;
position: absolute;
top: -21px;
margin-left:-3px;
font-family: 'Myriad Pro';
color: #284a6e;
font-weight: bold;
text-align: left;
}

.slider_showmin {
float: left;
width: 50px;
margin: 15px 0 0 -25px;
margin: 15px 0 0 0;
font-family: Arial, Helvetica, sans-serif;
font-size: 0.7em;
font-weight: normal;
text-align: center;
text-align: left;
}

.slider_showmax {
float: right;
width: 50px;
margin: 15px -28px 0 0;
margin: 15px 0 0 0;
font-family: Arial, Helvetica, sans-serif;
font-size: 0.7em;
font-weight: normal;
text-align: center;
text-align: right;
}

.slider_lefttext {
display: table-cell;
padding-top: 1.5em;
padding-right: 11px;
padding-bottom: 3px;
vertical-align: middle;
vertical-align: top;
text-align: right;
font-size: 0.9em;
}

.slider_righttext {
display: table-cell;
padding-top: 1.5em;
padding-left: 11px;
padding-bottom: 3px;
vertical-align: middle;
vertical-align: top;
font-size: 0.9em;
}

Expand Down
6 changes: 2 additions & 4 deletions templates/bluengrey/ie_fix_6.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,16 +129,15 @@ input.submit

.numeric-multi label.slider-label {
margin-top: 1.3em;
width: 40%;
}

.slider_lefttext {
float: left;
margin-top: 1.4em;
}

.slider_righttext {
float: left;
margin-top: 1.4em;
}

.ui-slider-1 {
Expand All @@ -150,13 +149,12 @@ input.submit
float: none;
position: absolute;
top: 17px;
left: -22px;
}

.slider_showmax {
margin: 0;
float: none;
position: absolute;
top: 17px;
left: 178px;
left: 150px;
}
4 changes: 2 additions & 2 deletions templates/bluengrey/ie_fix_7.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,16 @@ input.submit

.numeric-multi label.slider-label {
margin-top: 1.3em;
display: inline;
width: 40%;
}

.slider_lefttext {
float: left;
margin-top: 1.5em;
}

.slider_righttext {
float: left;
margin-top: 1.5em;
}


16 changes: 9 additions & 7 deletions templates/bluengrey/template.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ ul.cols-8-ul label {
overflow: hidden;
position: absolute;
top: -20px;
margin-left:+15px;
margin-left:-3px;
color: #284a6e;
font-size: 0.75em;
font-weight: bold;
Expand All @@ -870,35 +870,37 @@ ul.cols-8-ul label {
.slider_showmin {
float: left;
width: 50px;
margin: 15px 0 0 -25px;
margin: 15px 0 0 0;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 0.7em;
font-weight: normal;
text-align: center;
text-align: left;
}

.slider_showmax {
float: right;
width: 50px;
margin: 15px -28px 0 0;
margin: 15px 0 0 0;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 0.7em;
font-weight: normal;
text-align: center;
text-align: right;
}

.slider_lefttext {
display: table-cell;
padding-top: 1.5em;
padding-right: 11px;
vertical-align: middle;
vertical-align: top;
text-align: right;
font-size: 0.9em;
}

.slider_righttext {
display: table-cell;
padding-top: 1.5em;
padding-left: 11px;
vertical-align: middle;
vertical-align: top;
font-size: 0.9em;
}

Expand Down

0 comments on commit 5d05b1d

Please sign in to comment.