').appendTo(base);
+
+ // Add all default and option-specific classes to the
+ // origins and handles.
+ handle.addClass(cls.origin[i].join(" "));
+ handle.children().addClass(cls.handle[i].join(" "));
+
+ // These events are only bound to the visual handle element,
+ // not the `real` origin element.
+ handle.children()
+ .on(actions.start, { base: base, handle: handle }, start)
+ .on(actions.end, { base: base, handle: handle }, selfEnd);
+
+ // Make sure every handle has access to all primary
+ // variables. Can't uses jQuery's .data( obj ) structure
+ // here, as `store` needs some values from the `nui` object.
+ handle.data('nui', {
+ target: target
+ ,decimals: decimals
+ ,options: options
+ ,base: base
+ ,style: style
+ ,number: i
+ }).data('store', store (
+ handle
+ ,options.S
+ ));
- if(handles.length == 1){
- handle = handles[0];
- } else {
- handle = (cur_location[orientation] < (handles[0].offset()[pos] + handles[1].offset()[pos]) / 2 ? handles[0] : handles[1]);
- }
+ // Attach a function to the native DOM element,
+ // since jQuery wont let me get the current value in percentages.
+ handle[0].getPercentage = getPercentage;
+
+ // Make handles loop-able
+ handles.push(handle);
- // move handle, fire events
- place(handle,pos,correct(cur_proposal, base, handle), base);
- call([options.slide,options.__DB], base.parent());
- base.parent().change();
+ // Set the handle to its initial position;
+ setHandle(handle, percentage.to(options.range, options.start[i]));
+ }
+
+ // The base could use the handles too;
+ base.data({
+ options: options
+ ,handles: handles
+ ,style: style
+ });
+
+ target.data({
+ base: base
+ ,handles: handles
});
+
+ // The tap event.
+ base.on(actions.end, { base: base, handles: handles }, tap);
});
-
+
}
- ,val: function(){
-
- // split between getting/setting
- if(arguments.length){
- // store calling arguments, standarize input
- var args = typeof arguments[0] == "number" ? [arguments[0]] : arguments[0];
-
- // set for each slider
+ function val ( args, ignore ) {
+
+ // Setter
+ if( args && args.length ){
+
+ // Setting is handled properly for each slider in the data set.
return this.each(function(){
-
- // get base
- var base = $(this).children();
-
- base.children('b').each(function(i,v){
-
- var handle = $(this);
-
- // if ignore, stop running
- if(args[i] == null)
+
+ $.each($(this).data(clsList[12]), function(i, handle){
+
+ // The set request might want to ignore this handle.
+ if( args[i] === null ) {
return;
+ }
+
+ // Calculate a new position for the handle.
+ var value, current
+ ,range = handle.data('nui').options.range
+ ,to = percentage.to(
+ range
+ ,parseFloat(args[i])
+ ),
+
+ // Set handle to new location, and make sure developer
+ // input is always accepted. The ignore flag indicates
+ // input from user facing elements.
+ result = setHandle(handle, to, (ignore === true ? false : true));
+
+ // If the value of the input doesn't match the slider,
+ // reset it.
+ if(!result){
+
+ value = handle.data('store').val();
+ current = percentage.is(range,
+ handle[0].getPercentage(handle.data('nui').style)
+ ).toFixed(handle.data('nui').decimals);
+
+ if(value !== current){
+ handle.data('store').val(current);
+ }
+ }
- // place handle, which sets value to input too.
- place(handle, base.data(store_pos), correct(percentage.to(base.data(store_options).range, args[i]), base, handle, true), base);
});
-
- });
-
- } else {
-
- // build array
- var re = [];
-
- // loop handles
- this.find('b').each(function(){
- // get value
- re.push($(this).data('input').val());
+
});
-
- // return single value or array
- return re.length == 1 ? re[0] : re;
-
+
}
+
+ // Or, if the function was called without arguments,
+ // act as a 'getter';
+ var re = [];
+
+ // Loop the handles, and get the value from the input
+ // for every handle on its' own.
+ $.each($(this).data(clsList[12]), function(i, handle){
+ re.push( handle.data('store').val() );
+ });
+
+ // If the slider has just one handle, return a single value.
+ // Otherwise, return an array.
+ return ( re.length === 1 ? re[0] : re) ;
+
}
- };
- // overwrite the native jQuery val() function.
- jQuery.fn.val = function(){
- return this.hasClass(classes[0])
- ? methods.val.apply(this, arguments)
- : $VAL.apply(this, arguments);
- }
+ // Overwrite the native jQuery val() function
+ // with a simple handler. noUiSlider will use the internal
+ // value method, anything else will use the standard method.
+ $.fn.val = function(){
+ return this.hasClass(clsList[6])
+ ? val.apply(this, arguments)
+ : $VAL.apply(this, arguments);
+ };
- return methods.create.apply(this);
+ return create.apply(this, arguments);
+
+ };
-}})(jQuery);
+}(jQuery));
diff --git a/jquery.nouislider.min.css b/jquery.nouislider.min.css
new file mode 100644
index 00000000..f6fde5bc
--- /dev/null
+++ b/jquery.nouislider.min.css
@@ -0,0 +1 @@
+.noUi-target *{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-touch-callout:none;-ms-touch-action:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;cursor:default}.noUi-base{height:40px;width:300px;position:relative;max-width:100%;border:1px solid #bfbfbf;z-index:1}.noUi-handle{background:#EEE;height:44px;width:44px;border:1px solid #BFBFBF;margin:-3px 0 0 -23px}.noUi-active{background:#E9E9E9}.noUi-active:after{content:"";display:block;height:100%;border:1px solid #DDD}.noUi-connect{background:Teal}.noUi-background{background:#DDD}.noUi-origin{position:absolute;right:0;top:0;bottom:0;z-index:0}.noUi-origin-upper{background:inherit!important}.noUi-z-index{z-index:10}.noUi-vertical{height:300px;width:40px;max-height:100%}.noUi-vertical .noUi-origin{bottom:0;left:0}.noUi-vertical .noUi-handle{margin:-23px 0 0 -3px}.noUi-target[disabled] .noUi-base{background:#999}.noUi-target[disabled] .noUi-connect{background:#BBB}.noUi-state-tap .noUi-origin{-webkit-transition:left .3s,top .3s;transition:left .3s,top .3s}
\ No newline at end of file
diff --git a/jquery.nouislider.min.js b/jquery.nouislider.min.js
index e69de29b..4c93ccd6 100644
--- a/jquery.nouislider.min.js
+++ b/jquery.nouislider.min.js
@@ -0,0 +1,16 @@
+/** noUiSlider 4.0.0 */
+(function(f,u){f.fn.noUiSlider=function(l){function z(a){a.stopPropagation()}function v(a,c,d){f.each(a,function(a,k){"function"===typeof k&&k.call(c,d)})}function q(a){return a.data.base.data("target").is('[class*="noUi-state-"], [disabled]')}function s(a,c){c&&a.preventDefault();var d=a,h=0===a.type.indexOf("touch"),k=0===a.type.indexOf("mouse"),b=0===a.type.indexOf("MSPointer"),r,e;a=a.originalEvent;h&&(r=a.changedTouches[0].pageX,e=a.changedTouches[0].pageY);k&&(window.pageXOffset===u&&(window.pageXOffset=
+document.documentElement.scrollLeft,window.pageYOffset=document.documentElement.scrollTop),r=a.clientX+window.pageXOffset,e=a.clientY+window.pageYOffset);b&&(r=a.pageX,e=a.pageY);return{pass:d.data,e:a,x:r,y:e,t:[h,k,b]}}function A(a){return parseFloat(this.style[a])}function B(a,c){function d(a){return a instanceof f||"string"===typeof a||!1===a}var h={handles:{r:!0,t:function(a,b){b=parseInt(b,10);return 1===b||2===b}},range:{r:!0,t:function(a,b,c){if(2!==b.length)return!1;b=[parseFloat(b[0]),parseFloat(b[1])];
+if(isNaN(b[0])||!isFinite(b[0])||isNaN(b[1])||!isFinite(b[1]))return!1;a[c]=b;return!0}},start:{r:!0,t:function(a,b,c){return 1===a.handles?(f.isArray(b)&&(b=b[0]),b=parseFloat(b),a.start=[b],!isNaN(b)&&isFinite(b)):this.parent.range.t(a,b,c)}},connect:{t:function(a,b){return!0===b||!1===b||"lower"===b&&1===a.handles||"upper"===b&&1===a.handles}},orientation:{t:function(a,b){return"horizontal"===b||"vertical"===b}},margin:{r:!0,t:function(a,b,c){b=parseFloat(b);a[c]=b;return!isNaN(b)&&isFinite(b)}},
+serialization:{r:!0,t:function(a,b){if(b.resolution)switch(b.resolution){case 1:case 0.1:case 0.01:case 0.001:case 1E-4:case 1E-5:break;default:return!1}else a.serialization.resolution=0.01;return b.to?1===a.handles?(f.isArray(b.to)||(b.to=[b.to]),a.serialization.to=b.to,d(b.to[0])):2===b.to.length&&d(b.to[0])&&d(b.to[1]):!1}},slide:{t:function(a,b){return"function"===typeof b}},step:{t:function(a,b,c){return this.parent.margin.t(a,b,c)}},init:function(){var a=this;f.each(a,function(b,c){c.parent=
+a});delete this.init;return this}}.init();f.each(h,function(d,b){if(b.r&&!a[d]&&0!==a[d]||(a[d]||0===a[d])&&!b.t(a,a[d],d))return console&&console.log&&console.log("Slider:\t\t\t",c,"\nOption:\t\t\t",d,"\nValue:\t\t\t",a[d]),f.error("Error on noUiSlider initialisation."),!1})}function t(a,c,d){var h=a.data("nui").options,k=a.data("nui").base.data(e[12]),b=a.data("nui").style,r=a.data("nui").decimals;if(c===a[0].getPercentage(b))return!1;c=0>c?0:100
d?d:c),c===a[0].getPercentage(b)))return!1;0===a.data("nui").number&&95').appendTo(a).change(z);if(!1===c.to[d])return{val:function(a){if(a===u)return this._handle.data("nui-val");this._handle.data("nui-val",a)},hasClass:function(){return!1},_handle:a}}function D(a){if(a=s(a,!0)){var c=a.pass.base,d=c.data("style"),e=a.x-a.pass.startEvent.x,c="left"===d?c.width():c.height();"top"===d&&(e=a.y-a.pass.startEvent.y);
+e=a.pass.position+100*e/c;t(a.pass.handle,e);v([a.pass.base.data("options").slide],a.pass.base.data("target"))}}function w(a){q(a)||(a.data.handle.children().removeClass(e[4]),p.off(m.move),p.off(m.end),f("body").off(g),a.data.base.data("target").change())}function E(a){if(!q(a)&&(a=s(a))){var c=a.pass.handle,d=c[0].getPercentage(c.data("nui").style);c.children().addClass("noUi-active");p.on(m.move,{startEvent:a,position:d,base:a.pass.base,handle:c},D);p.on(m.end,{base:a.pass.base,handle:c},w);f("body").on("selectstart"+
+g,function(){return!1})}}function F(a){w({data:{base:a.data.base,handle:a.data.handle}});a.stopPropagation()}function G(a){if(!q(a)&&!a.data.base.find("."+e[4]).length&&(a=s(a))){var c,d,h=a.pass.base;d=a.pass.handles;var k=h.data("style"),b=a["left"===k?"x":"y"],f="left"===k?h.width():h.height(),g=a.t[2]?window.pageXOffset:0,m=a.t[2]?window.pageYOffset:0,n=[];a={left:h.offset().left-g,top:h.offset().top-m};for(c=0;ca[0]?c+Math.abs(a[0]):c-a[0];return 100*c/this._length(a)},from:function(a,c){return 100*c/this._length(a)},is:function(a,c){return c*this._length(a)/100+a[0]},_length:function(a){return a[0]>a[1]?a[0]-a[1]:a[1]-a[0]}};window.navigator.msPointerEnabled&&(m={start:"MSPointerDown"+g,move:"MSPointerMove"+g,end:"MSPointerUp"+g});f.fn.val=function(){return this.hasClass(e[6])?H.apply(this,arguments):I.apply(this,arguments)};return function(){return this.each(function(a,
+c){c=f(c);c.addClass(e[6]);var d,h,k,b,g=f("").appendTo(c),p=[];d=J;var q=[x.concat([e[1]+e[7]]),x.concat([e[1]+e[8]])],s=[y.concat([e[2]+e[7]]),y.concat([e[2]+e[8]])];l=f.extend({handles:2,margin:0,orientation:"horizontal"},l)||{};l.serialization||(l.serialization={to:[!1,!1],resolution:0.01});B(l,c);l.S=l.serialization;l.connect&&(q[0].push(e[9]),"lower"===l.connect?(d.push(e[9],e[9]+e[7]),q[0].push(e[13])):d.push(e[9]+e[8]));h="vertical"===l.orientation?"top":"left";k=l.S.resolution.toString().split(".");
+k=1==k[0]?0:k[1].length;"vertical"===l.orientation?d.push(e[10]):d.push(e[11]);g.addClass(d.join(" ")).data("target",c);for(d=0;d").appendTo(g),b.addClass(q[d].join(" ")),b.children().addClass(s[d].join(" ")),b.children().on(m.start,{base:g,handle:b},E).on(m.end,{base:g,handle:b},F),b.data("nui",{target:c,decimals:k,options:l,base:g,style:h,number:d}).data("store",C(b,l.S)),b[0].getPercentage=A,p.push(b),t(b,n.to(l.range,l.start[d]));g.data({options:l,handles:p,
+style:h});c.data({base:g,handles:p});g.on(m.end,{base:g,handles:p},G)})}.apply(this,arguments)}})(jQuery);
diff --git a/nouislider.jquery.json b/nouislider.jquery.json
index 37b44644..159d84f1 100644
--- a/nouislider.jquery.json
+++ b/nouislider.jquery.json
@@ -16,7 +16,7 @@
"url": "http://refreshless.com/nouislider/license.txt"
}
],
- "version": "3.5.0",
+ "version": "4.0.0",
"author": {
"name": "Léon Gersen",
"url": "https://twitter.com/LeonGersen"