From 3f16ee504792fc80b2d28d302c9aa7dcec08aa77 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 15 Mar 2013 17:40:02 +0100 Subject: [PATCH] feature #1664: Fix noUiSliders --- .../public/js/plugins/templates-tab.js | 106 +++++++------- .../4.0/nouislider/jquery.nouislider.min.js | 16 ++- .../vendor/4.0/nouislider/nouislider.css | 134 ++++++++++++------ 3 files changed, 154 insertions(+), 102 deletions(-) diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 647b337f80..35f062c66f 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -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); } } }); diff --git a/src/sunstone/public/vendor/4.0/nouislider/jquery.nouislider.min.js b/src/sunstone/public/vendor/4.0/nouislider/jquery.nouislider.min.js index d19a1f010a..b7c4093256 100644 --- a/src/sunstone/public/vendor/4.0/nouislider/jquery.nouislider.min.js +++ b/src/sunstone/public/vendor/4.0/nouislider/jquery.nouislider.min.js @@ -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&&ba.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('
');e.up=a('
');e.connect=a('
');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=ca?0:100c?c:a):(c=parseFloat(d[0][0].style[f])+e.margin,a=aa[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
").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').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 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; } -} \ No newline at end of file + .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; + } \ No newline at end of file