feature #1664: Fix noUiSliders

This commit is contained in:
Daniel Molina committed 2013-03-15 18:30:41 +01:00
1 parent c94c164ab2
commit 3f16ee5047
3 files changed
+154 -102

No files matched your search

+52 -54
View File
@@ -553,18 +553,19 @@ function setup_capacity_tab_content(capacity_section) {
var cpu_input = $( "#CPU", capacity_section);
var cpu_slider = $( "#cpu_slider", capacity_section).noUiSlider('init', {
var cpu_slider = $( "#cpu_slider", capacity_section).noUiSlider({
handles: 1,
connect: "lower",
scale: [0,800],
range: [0,800],
// start: 100,
step: 50,
change: function(type) {
start: 1,
slide: function(type) {
if ( type != "move")
{
var values = $(this).noUiSlider( 'value' );
var values = $(this).val();
cpu_input.val(values[1] / 100);
cpu_input.val(values / 100);
}
},
});
@@ -572,15 +573,13 @@ function setup_capacity_tab_content(capacity_section) {
cpu_slider.addClass("noUiSlider");
cpu_input.change(function() {
cpu_slider.noUiSlider('move',{
to: this.value * 100
})
cpu_slider.val(this.value * 100)
});
cpu_input.val(1);
// init::start is ignored for some reason
$( "#cpu_slider", capacity_section).noUiSlider('move',{to: 100});
cpu_slider.val(100);
// Define the memory slider
@@ -603,36 +602,33 @@ function setup_capacity_tab_content(capacity_section) {
var memory_slider_change = function(type) {
if ( type != "move")
{
var values = $(this).noUiSlider( 'value' );
var values = $(this).val();
memory_input.val(values[1] / 100);
memory_input.val(values / 100);
update_final_memory_input();
}
};
var memory_slider = $( "#memory_slider", capacity_section).noUiSlider('init', {
var memory_slider = $( "#memory_slider", capacity_section).noUiSlider({
handles: 1,
connect: "lower",
scale: [0,409600],
range: [0,409600],
step: 12800,
change: memory_slider_change,
start: 1,
slide: memory_slider_change,
});
memory_slider.addClass("noUiSlider");
memory_input.change(function() {
memory_slider.noUiSlider('move',{
to: this.value * 100
})
memory_slider.val(this.value * 100)
update_final_memory_input();
});
// init::start is ignored for some reason
memory_slider.noUiSlider('move',{
to: 0
});
memory_slider.val(0);
memory_unit.change(function() {
var memory_unit_val = $('#memory_unit :selected', capacity_section).val();
@@ -643,33 +639,35 @@ function setup_capacity_tab_content(capacity_section) {
if (memory_unit_val == 'GB') {
memory_slider.empty().noUiSlider('init', {
memory_slider.empty().noUiSlider({
handles: 1,
connect: "lower",
scale: [0,1600],
range: [0,1600],
start: 1,
step: 50,
change: memory_slider_change,
slide: memory_slider_change,
});
var new_val = memory_input.val() / 1024;
memory_input.val( new_val );
memory_slider.noUiSlider('move',{to: new_val * 100});
memory_slider.val(new_val * 100);
}
else if (memory_unit_val == 'MB') {
memory_slider.empty().noUiSlider('init', {
memory_slider.empty().noUiSlider({
handles: 1,
connect: "lower",
scale: [0,409600],
range: [0,409600],
start: 1,
step: 12800,
change: memory_slider_change,
slide: memory_slider_change,
});
var new_val = Math.floor( memory_input.val() * 1024 );
memory_input.val( new_val );
memory_slider.noUiSlider('move',{to: new_val * 100});
memory_slider.val(new_val * 100);
}
update_final_memory_input();
@@ -681,17 +679,18 @@ function setup_capacity_tab_content(capacity_section) {
var vcpu_input = $( "#VCPU", capacity_section );
var vcpu_slider = $( "#vcpu_slider", capacity_section).noUiSlider('init', {
var vcpu_slider = $( "#vcpu_slider", capacity_section).noUiSlider({
handles: 1,
connect: "lower",
scale: [0,8],
range: [0,8],
start: 0,
step: 1,
change: function(type) {
slide: function(type) {
if ( type != "move")
{
var values = $(this).noUiSlider( 'value' );
var values = $(this).val();
vcpu_input.val(values[1]);
vcpu_input.val(values);
}
},
});
@@ -699,13 +698,11 @@ function setup_capacity_tab_content(capacity_section) {
vcpu_slider.addClass("noUiSlider");
vcpu_input.change(function() {
vcpu_slider.noUiSlider('move',{
to: this.value
})
vcpu_slider.val(this.value)
});
// init::start is ignored for some reason
vcpu_slider.noUiSlider('move',{to: 0});
vcpu_slider.val(0);
}
function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){
@@ -903,32 +900,31 @@ function setup_disk_tab_content(disk_section, str_disk_tab_id, str_datatable_id)
var size_slider_change = function(type) {
if ( type != "move")
{
var values = $(this).noUiSlider( 'value' );
var values = $(this).val();
size_input.val(values[1] / 100);
size_input.val(values / 100);
}
};
var size_slider = $( "#size_slider", disk_section).noUiSlider('init', {
var size_slider = $( "#size_slider", disk_section).noUiSlider({
handles: 1,
connect: "lower",
scale: [0,5000],
range: [0,5000],
start: 1,
step: 50,
change: size_slider_change,
slide: size_slider_change,
});
size_slider.addClass("noUiSlider");
size_input.change(function() {
size_slider.noUiSlider('move',{
to: this.value * 100
})
size_slider.val(this.value * 100)
});
size_input.val(10);
// init::start is ignored for some reason
size_slider.noUiSlider('move',{to: 1000});
size_slider.val(1000);
size_unit.change(function() {
var size_unit_val = $('#size_unit :selected').val();
@@ -939,33 +935,35 @@ function setup_disk_tab_content(disk_section, str_disk_tab_id, str_datatable_id)
if (size_unit_val == 'GB') {
size_slider.empty().noUiSlider('init', {
size_slider.empty().noUiSlider({
handles: 1,
connect: "lower",
scale: [0,5000],
range: [0,5000],
start: 1,
step: 50,
change: size_slider_change,
slide: size_slider_change,
});
var new_val = size_input.val() / 1024;
size_input.val( new_val );
size_slider.noUiSlider('move',{to: new_val * 100});
size_slider.val(new_val * 100);
}
else if (size_unit_val == 'MB') {
size_slider.empty().noUiSlider('init', {
size_slider.empty().noUiSlider({
handles: 1,
connect: "lower",
scale: [0,204800],
range: [0,204800],
start: 1,
step: 12800,
change: size_slider_change,
slide: size_slider_change,
});
var new_val = Math.round( size_input.val() * 1024 );
size_input.val( new_val );
size_slider.noUiSlider('move',{to: new_val * 100});
size_slider.val(new_val * 100);
}
}
});
@@ -1,6 +1,10 @@
/** noUislider 2.5.5
** No copyrights or licenses. Do what you like. Feel free to share this code, or build upon it.
** @author: @leongersen
** @repository: https://github.com/leongersen/noUiSlider
**/
(function(a){a.fn.noUiSlider=function(b,c){function d(a){return a<0}function e(a){return Math.abs(a)}function f(a,b){return Math.round(a/b)*b}function g(a){return jQuery.extend(true,{},a)}var h,i,j,c=c||[],k,l="ontouchstart"in document.documentElement;h={handles:2,connect:true,scale:[0,100],start:[25,75],to:0,handle:0,change:"",end:"",step:false,save:false,click:true};j={scale:function(a,b,c){var f=b[0],g=b[1];if(d(f)){a=a+e(f);g=g+e(f)}else{a=a-f;g=g-f}return a*c/g},deScale:function(a,b,c){var f=b[0],g=b[1];g=d(f)?g+e(f):g-f;return a*g/c+f},connect:function(a){if(a.connect){if(a.handles.length>1){a.connect.css({left:a.low.left(),right:a.slider.innerWidth()-a.up.left()})}else{a.low?a.connect.css({left:a.low.left(),right:0}):a.connect.css({left:0,right:a.slider.innerWidth()-a.up.left()})}}},left:function(){return parseFloat(a(this).css("left"))},call:function(a,b,c){if(typeof a=="function"){a.call(b,c)}},bounce:function(a,b,c,d){var e=false;if(d.is(a.up)){if(a.low&&b<a.low.left()){b=a.low.left();e=true}}else{if(a.up&&b>a.up.left()){b=a.up.left();e=true}}if(b>a.slider.innerWidth()){b=a.slider.innerWidth();e=true}else if(b<0){b=0;e=true}return[b,e]}};i={init:function(){return this.each(function(){var b,d,e;d=a(this).css("position","relative");e=new Object;e.options=a.extend(h,c);b=e.options;typeof b.start=="object"?1:b.start=[b.start];e.slider=d;e.low=a('<div class="noUi-handle noUi-lowerHandle"><div></div></div>');e.up=a('<div class="noUi-handle noUi-upperHandle"><div></div></div>');e.connect=a('<div class="noUi-midBar"></div>');b.connect?e.connect.appendTo(e.slider):e.connect=false;if(b.knobs){b.handles=b.knobs}if(b.handles===1){if(b.connect===true||b.connect==="lower"){e.low=false;e.up=e.up.appendTo(e.slider);e.handles=[e.up]}else if(b.connect==="upper"||!b.connect){e.low=e.low.prependTo(e.slider);e.up=false;e.handles=[e.low]}}else{e.low=e.low.prependTo(e.slider);e.up=e.up.appendTo(e.slider);e.handles=[e.low,e.up]}if(e.low){e.low.left=j.left}if(e.up){e.up.left=j.left}e.slider.children().css("position","absolute");a.each(e.handles,function(c){a(this).css({left:j.scale(b.start[c],e.options.scale,e.slider.innerWidth()),zIndex:c+1}).children().bind(l?"touchstart.noUi":"mousedown.noUi",k.start)});if(b.click){e.slider.click(k.click).find("*:not(.noUi-midBar)").click(k.flse)}j.connect(e);e.options=b;e.slider.data("api",e)})},move:function(){var b,d,e,f,h;b=g(a(this).data("api"));b.options=a.extend(b.options,c);if(b.options.knob){b.options.handle=b.options.knob}f=b.options.handle;f=b.handles[f=="lower"||f==0||typeof f=="undefined"?0:1];d=j.bounce(b,j.scale(b.options.to,b.options.scale,b.slider.innerWidth()),f.left(),f);f.css("left",d[0]);if(f.is(b.up)&&f.left()==0||f.is(b.low)&&f.left()==b.slider.innerWidth()){f.css("zIndex",parseInt(f.css("zIndex"))+2)}if(c.save===true){b.options.scale=c.scale;a(this).data("api",b)}j.connect(b);j.call(b.options.change,b.slider,"move");j.call(b.options.end,b.slider,"move")},value:function(){var b,d,e;e=g(a(this).data("api"));e.options=a.extend(e.options,c);b=e.low?Math.round(j.deScale(e.low.left(),e.options.scale,e.slider.innerWidth())):false;d=e.up?Math.round(j.deScale(e.up.left(),e.options.scale,e.slider.innerWidth())):false;if(c.save){e.options.scale=c.scale;a(this).data("api",e)}return[b,d]},api:function(){return a(this).data("api")},disable:function(){return this.each(function(){a(this).addClass("disabled")})},enable:function(){return this.each(function(){a(this).removeClass("disabled")})}},k={start:function(b){if(!a(this).parent().parent().hasClass("disabled")){b.preventDefault();a("body").bind("selectstart.noUi",k.flse);a(this).addClass("noUi-activeHandle");a(document).bind(l?"touchmove.noUi":"mousemove.noUi",k.move);l?a(this).bind("touchend.noUi",k.end):a(document).bind("mouseup.noUi",k.end)}},move:function(b){var c,f,g,h,i=false,k,l;g=a(".noUi-activeHandle");h=g.parent().parent().data("api");k=g.parent().is(h.low)?h.low:h.up;c=b.pageX-Math.round(h.slider.offset().left);if(isNaN(c)){c=b.originalEvent.touches[0].pageX-Math.round(h.slider.offset().left)}f=k.left();l=j.bounce(h,c,f,k);c=l[0];i=l[1];if(h.options.step&&!i){var m=h.options.scale[0],n=h.options.scale[1];if(d(n)){n=e(m-n);m=0}n=n+ -1*m;var o=j.scale(h.options.step,[0,n],h.slider.innerWidth());if(Math.abs(f-c)>=o){c=c<f?f-o:f+o;i=true}}else{i=true}if(c===f){i=false}if(i){k.css("left",c);if(k.is(h.up)&&k.left()==0||k.is(h.low)&&k.left()==h.slider.innerWidth()){k.css("zIndex",parseInt(k.css("zIndex"))+2)}j.connect(h);j.call(h.options.change,h.slider,"slide")}},end:function(){var b,c;b=a(".noUi-activeHandle");c=b.parent().parent().data("api");a(document).add("body").add(b.removeClass("noUi-activeHandle").parent()).unbind(".noUi");j.call(c.options.end,c.slider,"slide")},click:function(b){if(!a(this).hasClass("disabled")){var c=a(this).data("api");var d=c.options;var e=b.pageX-c.slider.offset().left;e=d.step?f(e,j.scale(d.step,d.scale,c.slider.innerWidth())):e;if(c.low&&c.up){e<(c.low.left()+c.up.left())/2?c.low.css("leLine truncated
(function(d){d.fn.noUiSlider=function(p,r){function s(a,e,c){var f=e.data("setup"),d=f.handles;e=f.settings;f=f.pos;a=0>a?0:100<a?100:a;2==e.handles&&(c.is(":first-child")?(c=parseFloat(d[1][0].style[f])-e.margin,a=a>c?c:a):(c=parseFloat(d[0][0].style[f])+e.margin,a=a<c?c:a));e.step&&(c=l.from(e.range,e.step),a=Math.round(a/c)*c);return a}function t(a){return[a.clientX||a.originalEvent.clientX||a.originalEvent.touches[0].clientX,a.clientY||a.originalEvent.clientY||a.originalEvent.touches[0].clientY]}
var u=jQuery.fn.val;jQuery.fn.val=function(){return this.data("_isnS_")?methods.val.call(this,arguments[0]):u.apply(this,arguments)};var j=window.navigator.msPointerEnabled?2:"ontouchstart"in document.documentElement?3:1,l={to:function(a,e){e=0>a[0]?e+Math.abs(a[0]):e-a[0];return 100*e/this._length(a)},from:function(a,e){return 100*e/this._length(a)},is:function(a,e){return e*this._length(a)/100+a[0]},_length:function(a){return a[0]>a[1]?a[0]-a[1]:a[1]-a[0]}},w={handles:2,serialization:{to:["",""],
resolution:0.01}};methods={create:function(){return this.each(function(){var a=d.extend(w,p),e=d(this).data("_isnS_",!0),c=[],f,k,b="",g=function(a){return!isNaN(parseFloat(a))&&isFinite(a)},h=(a.serialization.resolution=a.serialization.resolution||0.01).toString().split("."),q=1==h[0]?0:h[1].length;a.start=g(a.start)?[a.start,0]:a.start;d.each(a,function(b,c){g(c)&&(a[b]=parseFloat(c));var d=!1;switch(b){case "range":case "start":d=2!=c.length||!g(c[0])||!g(c[1]);break;case "handles":d=1>c||2<c||
!g(c);break;case "connect":d="lower"!=c&&"upper"!=c&&"boolean"!=typeof c;break;case "orientation":d="vertical"!=c&&"horizontal"!=c;break;case "margin":case "step":d="undefined"!=typeof c&&!g(c);break;case "serialization":d="object"!=typeof c||!g(c.resolution)||"object"==typeof c.to&&c.to.length<a.handles;break;case "slide":d="function"!=typeof c}d&&console&&console.error("Bad input for "+b+" on slider:",e)});a.margin=a.margin?l.from(a.range,a.margin):0;if(a.serialization.to instanceof jQuery||"string"==
typeof a.serialization.to||!1===a.serialization.to)a.serialization.to=[a.serialization.to];"vertical"==a.orientation?(b+="vertical",f="top",k=1):(b+="horizontal",f="left",k=0);b+=a.connect?"lower"==a.connect?" connect lower":" connect":"";e.addClass(b);for(b=0;b<a.handles;b++){c[b]=e.append("<a><div></div></a>").children(":last");c[b].css(f,l.to(a.range,a.start[b])+"%");var h=(1===j?"mousedown":2===j?"MSPointerDown":"touchstart")+".noUiSliderX",r=(1===j?"mousemove":2===j?"MSPointerMove":"touchmove")+
".noUiSlider",u=(1===j?"mouseup":2===j?"MSPointerUp":"touchend")+".noUiSlider";c[b].find("div").on(h,function(b){d("body").bind("selectstart.noUiSlider",function(){return!1});if(!e.hasClass("disabled")){var n=d(this).addClass("active").parent();d("body").addClass("TOUCH");var g=n.add(d(document)).add("body"),j=parseFloat(n[0].style[f]),h=t(b),v=h,p=!1;d(document).on(r,function(b){b.preventDefault();b=t(b);b[0]-=h[0];b[1]-=h[1];var d=[v[0]!=b[0],v[1]!=b[1]],m=j+100*b[k]/(k?e.height():e.width()),m=
s(m,e,n);if(d[k]&&m!=p){n.css(f,m+"%").data("input").val(l.is(a.range,m).toFixed(q));var d=a.slide,g=e.data("_n",!0);"function"==typeof d&&d.call(g,void 0);p=m;n.css("z-index",2==c.length&&100==m&&n.is(":first-child")?2:1)}v=b});d(document).on(u+" mouseLeave.noUiSlider",function(){g.off(".noUiSlider");d("body").removeClass("TOUCH");e.find(".active").removeClass("active");e.data("_n")&&e.data("_n",!1).change()})}}).on("click",function(a){a.stopPropagation()})}if(1==j)e.on("click",function(b){if(!e.hasClass("disabled")){var d=
t(b);b=100*(d[k]-e.offset()[f])/(k?e.height():e.width());d=1<c.length?d[k]<(c[0].offset()[f]+c[1].offset()[f])/2?c[0]:c[1]:c[0];b=s(b,e,d);d.css(f,b+"%").data("input").val(l.is(a.range,b).toFixed(q));b=a.slide;"function"==typeof b&&b.call(e,void 0);e.change()}});for(b=0;b<c.length;b++)h=l.is(a.range,parseFloat(c[b][0].style[f])).toFixed(q),"string"==typeof a.serialization.to[b]?c[b].data("input",e.append('<input type="hidden" name="'+a.serialization.to[b]+'">').find("input:last").val(h).change(function(a){a.stopPropagation()})):
!1==a.serialization.to[b]?c[b].data("input",{val:function(a){if("undefined"!=typeof a)this.handle.data("noUiVal",a);else return this.handle.data("noUiVal")},handle:c[b]}):c[b].data("input",a.serialization.to[b].data("handleNR",b).val(h).change(function(){var a=[null,null];a[d(this).data("handleNR")]=d(this).val();e.val(a)}));d(this).data("setup",{settings:a,handles:c,pos:f,res:q})})},val:function(a){if(a){var e="number"==typeof a?[a]:a;return this.each(function(){for(var a=d(this).data("setup"),b=
0;b<a.handles.length;b++)if(null!=e[b]){var c=s(l.to(a.settings.range,e[b]),d(this),a.handles[b]);a.handles[b].css(a.pos,c+"%").data("input").val(l.is(a.settings.range,c).toFixed(a.res))}})}a=d(this).data("setup").handles;for(var c=[],f=0;f<a.length;f++)c.push(parseFloat(a[f].data("input").val()));return 1==c.length?c[0]:c},disabled:function(){return r?d(this).addClass("disabled"):d(this).removeClass("disabled")}};return"disabled"==p?methods.disabled.apply(this):methods.create.apply(this)}})(jQuery);
+92 -42
View File
@@ -1,43 +1,93 @@
.noUiSlider {
width: 400px;
border: 1px solid #CCC;
height: 8px;
background: #EEE;
-webkit-touch-callout: none;
}
.noUi-midBar {
height: 100%;
z-index: 0;
background: #39C;
-webkit-touch-callout: none;
}
.noUi-handle > div {
position: absolute;
width: 16px;
height: 16px;
top: -5px;
left: -8px;
z-index: 5;
border: 1px solid #CCC;
background: #EEE;
}
.noUi-handle > div:hover,
.noUi-handle > div.noUi-activeHandle {
background: #ACE;
border-color: #369;
}
.disabled > .noUi-midBar {
background: #999;
}
.disabled .noUi-handle > div {
border-color: #CCC;
background: #CCC;
}
@media (-webkit-min-device-pixel-ratio:1.2),-moz-touch-enabled,(max-device-width:1024px){
.noUi-handle > div {
height: 32px;
width: 32px;
top: -13px;
left: -16px;
.noUiSlider,
.noUiSlider * {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
display: block;
cursor: default;
}
}
.noUiSlider {
position: relative;
}
.noUiSlider a {
position: absolute;
z-index: 1;
}
.noUiSlider a:nth-child(2) {
background: inherit !important;
}
.noUiSlider.vertical a {
width: 100%;
bottom: 0;
}
.noUiSlider.horizontal a {
height: 100%;
right: 0;
}
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
.noUiSlider:before,
body.TOUCH,
.noUiSlider div {
-ms-touch-action: none;
}
.noUiSlider:before {
display: block;
position: absolute;
width: 150%;
left: -25%;
height: 400%;
top: -150%;
content: "";
z-index: -1;
}
.noUiSlider.vertical:before {
width: 400%;
left: -150%;
height: 150%;
top: -25%;
}
}
.noUiSlider {
border: 1px solid #908d84;
border-radius: 3px;
}
.noUiSlider.connect a,
.noUiSlider.connect.lower {
background: #2ba6cb;
}
.noUiSlider,
.noUiSlider.connect.lower a {
background: #cdebf5;
}
.noUiSlider.disabled,
.noUiSlider.disabled.connect.lower a {
background: #ccc;
box-shadow: none;
}
.noUiSlider div {
height: 18px;
width: 18px;
border: 1px solid #99968f;
border-radius: 3px;
background: #e9e9e9;
}
.noUiSlider.disabled div {
background: transparent;
}
.noUiSlider.horizontal {
width: 300px;
height: 10px;
}
.noUiSlider.horizontal div {
margin: -5px 0 0 -9px;
}
.noUiSlider.vertical {
width: 10px;
height: 300px;
}
.noUiSlider.vertical div {
margin: -9px 0 0 -5px;
}