0
diff --git a/js/jquery.knob.js b/js/jquery.knob.js
old mode 100755
new mode 100644
index a2fb82a..792313c
--- a/js/jquery.knob.js
+++ b/js/jquery.knob.js
@@ -2,7 +2,7 @@
/**
* Downward compatible, touchable dial
*
- * Version: 1.2.5 (23/01/2014)
+ * Version: 1.2.12
* Requires: jQuery v1.7+
*
* Copyright (c) 2012 Anthony Terrien
@@ -10,7 +10,18 @@
*
* Thanks to vor, eskimoblood, spiffistan, FabrizioC
*/
-(function($) {
+(function (factory) {
+ if (typeof exports === 'object') {
+ // CommonJS
+ module.exports = factory(require('jquery'));
+ } else if (typeof define === 'function' && define.amd) {
+ // AMD. Register as an anonymous module.
+ define(['jquery'], factory);
+ } else {
+ // Browser globals
+ factory(jQuery);
+ }
+}(function ($) {
/**
* Kontrol library
@@ -80,52 +91,60 @@
._draw();
};
- if(this.$.data('kontroled')) return;
+ if (this.$.data('kontroled')) return;
this.$.data('kontroled', true);
this.extend();
- this.o = $.extend(
- {
+ this.o = $.extend({
// Config
- min : this.$.data('min') !== undefined ? this.$.data('min') : 0,
- max : this.$.data('max') !== undefined ? this.$.data('max') : 100,
- stopper : true,
- readOnly : this.$.data('readonly') || (this.$.attr('readonly') === 'readonly'),
+ min: this.$.data('min') !== undefined ? this.$.data('min') : 0,
+ max: this.$.data('max') !== undefined ? this.$.data('max') : 100,
+ stopper: true,
+ readOnly: this.$.data('readonly') || (this.$.attr('readonly') === 'readonly'),
// UI
- cursor : (this.$.data('cursor') === true && 30) ||
- this.$.data('cursor') || 0,
- thickness : (
- this.$.data('thickness') &&
- Math.max(Math.min(this.$.data('thickness'), 1), 0.01)
- ) || 0.35,
- lineCap : this.$.data('linecap') || 'butt',
- width : this.$.data('width') || 200,
- height : this.$.data('height') || 200,
- displayInput : this.$.data('displayinput') == null || this.$.data('displayinput'),
- displayPrevious : this.$.data('displayprevious'),
- fgColor : this.$.data('fgcolor') || '#87CEEB',
+ cursor: this.$.data('cursor') === true && 30
+ || this.$.data('cursor') || 0,
+ thickness: this.$.data('thickness')
+ && Math.max(Math.min(this.$.data('thickness'), 1), 0.01)
+ || 0.35,
+ lineCap: this.$.data('linecap') || 'butt',
+ width: this.$.data('width') || 200,
+ height: this.$.data('height') || 200,
+ displayInput: this.$.data('displayinput') == null || this.$.data('displayinput'),
+ displayPrevious: this.$.data('displayprevious'),
+ fgColor: this.$.data('fgcolor') || '#87CEEB',
inputColor: this.$.data('inputcolor'),
font: this.$.data('font') || 'Arial',
fontWeight: this.$.data('font-weight') || 'bold',
- inline : false,
- step : this.$.data('step') || 1,
+ inline: false,
+ step: this.$.data('step') || 1,
+ rotation: this.$.data('rotation'),
// Hooks
- draw : null, // function () {}
- change : null, // function (value) {}
- cancel : null, // function () {}
- release : null // function (value) {}
+ draw: null, // function () {}
+ change: null, // function (value) {}
+ cancel: null, // function () {}
+ release: null, // function (value) {}
+
+ // Output formatting, allows to add unit: %, ms ...
+ format: function(v) {
+ return v;
+ },
+ parse: function (v) {
+ return parseFloat(v);
+ }
}, this.o
);
// finalize options
- if(!this.o.inputColor) {
+ this.o.flip = this.o.rotation === 'anticlockwise' || this.o.rotation === 'acw';
+ if (!this.o.inputColor) {
this.o.inputColor = this.o.fgColor;
}
// routing value
- if(this.$.is('fieldset')) {
+ if (this.$.is('fieldset')) {
// fieldset = array of integer
this.v = {};
@@ -133,36 +152,34 @@
this.i.each(function(k) {
var $this = $(this);
s.i[k] = $this;
- s.v[k] = $this.val();
+ s.v[k] = s.o.parse($this.val());
$this.bind(
- 'change blur'
- , function () {
+ 'change blur',
+ function () {
var val = {};
val[k] = $this.val();
- s.val(val);
+ s.val(s._validate(val));
}
);
});
this.$.find('legend').remove();
-
} else {
// input = integer
this.i = this.$;
- this.v = this.$.val();
- (this.v === '') && (this.v = this.o.min);
-
+ this.v = this.o.parse(this.$.val());
+ this.v === '' && (this.v = this.o.min);
this.$.bind(
- 'change blur'
- , function () {
- s.val(s._validate(s.$.val()));
+ 'change blur',
+ function () {
+ s.val(s._validate(s.o.parse(s.$.val())));
}
);
}
- (!this.o.displayInput) && this.$.hide();
+ !this.o.displayInput && this.$.hide();
// adds needed DOM elements (canvas, div)
this.$c = $(document.createElement('canvas')).attr({
@@ -181,7 +198,7 @@
this.$div = this.$.parent();
if (typeof G_vmlCanvasManager !== 'undefined') {
- G_vmlCanvasManager.initElement(this.$c[0]);
+ G_vmlCanvasManager.initElement(this.$c[0]);
}
this.c = this.$c[0].getContext ? this.$c[0].getContext('2d') : null;
@@ -195,21 +212,20 @@
}
// hdpi support
- this.scale = (window.devicePixelRatio || 1) /
- (
+ this.scale = (window.devicePixelRatio || 1) / (
this.c.webkitBackingStorePixelRatio ||
this.c.mozBackingStorePixelRatio ||
this.c.msBackingStorePixelRatio ||
this.c.oBackingStorePixelRatio ||
this.c.backingStorePixelRatio || 1
- );
+ );
// detects relative width / height
- this.relativeWidth = ((this.o.width % 1 !== 0) &&
- this.o.width.indexOf('%'));
- this.relativeHeight = ((this.o.height % 1 !== 0) &&
- this.o.height.indexOf('%'));
- this.relative = (this.relativeWidth || this.relativeHeight);
+ this.relativeWidth = this.o.width % 1 !== 0
+ && this.o.width.indexOf('%');
+ this.relativeHeight = this.o.height % 1 !== 0
+ && this.o.height.indexOf('%');
+ this.relative = this.relativeWidth || this.relativeHeight;
// computes size and carves the component
this._carve();
@@ -236,22 +252,22 @@
this.isInit = true;
- // the most important !
+ this.$.val(this.o.format(this.v));
this._draw();
return this;
};
this._carve = function() {
- if(this.relative) {
+ if (this.relative) {
var w = this.relativeWidth ?
- this.$div.parent().width() *
- parseInt(this.o.width) / 100 :
- this.$div.parent().width(),
+ this.$div.parent().width() *
+ parseInt(this.o.width) / 100
+ : this.$div.parent().width(),
h = this.relativeHeight ?
- this.$div.parent().height() *
- parseInt(this.o.height) / 100 :
- this.$div.parent().height();
+ this.$div.parent().height() *
+ parseInt(this.o.height) / 100
+ : this.$div.parent().height();
// apply relative
this.w = this.h = Math.min(w, h);
@@ -281,7 +297,7 @@
}
return this;
- }
+ };
this._draw = function () {
@@ -292,25 +308,21 @@
s.clear();
- s.dH
- && (d = s.dH());
-
- (d !== false) && s.draw();
+ s.dH && (d = s.dH());
+ d !== false && s.draw();
};
this._touch = function (e) {
-
var touchMove = function (e) {
-
var v = s.xy2val(
e.originalEvent.touches[s.t].pageX,
e.originalEvent.touches[s.t].pageY
- );
+ );
if (v == s.cv) return;
- if (s.cH && (s.cH(v) === false)) return;
+ if (s.cH && s.cH(v) === false) return;
s.change(s._validate(v));
s._draw();
@@ -326,8 +338,8 @@
k.c.d
.bind("touchmove.k", touchMove)
.bind(
- "touchend.k"
- , function () {
+ "touchend.k",
+ function () {
k.c.d.unbind('touchmove.k touchend.k');
s.val(s.cv);
}
@@ -337,7 +349,6 @@
};
this._mouse = function (e) {
-
var mouseMove = function (e) {
var v = s.xy2val(e.pageX, e.pageY);
@@ -357,23 +368,21 @@
.bind("mousemove.k", mouseMove)
.bind(
// Escape key cancel current change
- "keyup.k"
- , function (e) {
+ "keyup.k",
+ function (e) {
if (e.keyCode === 27) {
k.c.d.unbind("mouseup.k mousemove.k keyup.k");
- if (
- s.eH
- && (s.eH() === false)
- ) return;
+ if (s.eH && s.eH() === false)
+ return;
s.cancel();
}
}
)
.bind(
- "mouseup.k"
- , function (e) {
+ "mouseup.k",
+ function (e) {
k.c.d.unbind('mousemove.k mouseup.k keyup.k');
s.val(s.cv);
}
@@ -386,26 +395,26 @@
var o = this.$c.offset();
this.x = o.left;
this.y = o.top;
+
return this;
};
this._listen = function () {
-
if (!this.o.readOnly) {
this.$c
.bind(
- "mousedown"
- , function (e) {
+ "mousedown",
+ function (e) {
e.preventDefault();
s._xy()._mouse(e);
- }
+ }
)
.bind(
- "touchstart"
- , function (e) {
+ "touchstart",
+ function (e) {
e.preventDefault();
s._xy()._touch(e);
- }
+ }
);
this.listen();
@@ -413,10 +422,9 @@
this.$.attr('readonly', 'readonly');
}
- if(this.relative) {
+ if (this.relative) {
$(window).resize(function() {
- s._carve()
- .init();
+ s._carve().init();
s._draw();
});
}
@@ -446,8 +454,9 @@
this.$c[0].width = this.$c[0].width;
};
- this._validate = function(v) {
- return (~~ (((v < 0) ? -0.5 : 0.5) + (v/this.o.step))) * this.o.step;
+ this._validate = function (v) {
+ var val = (~~ (((v < 0) ? -0.5 : 0.5) + (v/this.o.step))) * this.o.step;
+ return Math.round(val * 100) / 100;
};
// Abstract methods
@@ -463,15 +472,20 @@
// Utils
this.h2rgba = function (h, a) {
var rgb;
- h = h.substring(1,7)
- rgb = [parseInt(h.substring(0,2),16)
- ,parseInt(h.substring(2,4),16)
- ,parseInt(h.substring(4,6),16)];
+ h = h.substring(1,7);
+ rgb = [
+ parseInt(h.substring(0,2), 16),
+ parseInt(h.substring(2,4), 16),
+ parseInt(h.substring(4,6), 16)
+ ];
+
return "rgba(" + rgb[0] + "," + rgb[1] + "," + rgb[2] + "," + a + ")";
};
this.copy = function (f, t) {
- for (var i in f) { t[i] = f[i]; }
+ for (var i in f) {
+ t[i] = f[i];
+ }
};
};
@@ -491,27 +505,28 @@
this.PI2 = 2*Math.PI;
this.extend = function () {
- this.o = $.extend(
- {
- bgColor : this.$.data('bgcolor') || '#EEEEEE',
- angleOffset : this.$.data('angleoffset') || 0,
- angleArc : this.$.data('anglearc') || 360,
- inline : true
- }, this.o
- );
+ this.o = $.extend({
+ bgColor: this.$.data('bgcolor') || '#EEEEEE',
+ angleOffset: this.$.data('angleoffset') || 0,
+ angleArc: this.$.data('anglearc') || 360,
+ inline: true
+ }, this.o);
};
this.val = function (v, triggerRelease) {
if (null != v) {
- if (
- triggerRelease !== false && (v != this.v) && this.rH &&
- (this.rH(v) === false)
- ) return;
+ // reverse format
+ v = this.o.parse(v);
+
+ if (triggerRelease !== false
+ && v != this.v
+ && this.rH
+ && this.rH(v) === false) { return; }
this.cv = this.o.stopper ? max(min(v, this.o.max), this.o.min) : v;
this.v = this.cv;
- this.$.val(this.v);
+ this.$.val(this.o.format(this.v));
this._draw();
} else {
return this.v;
@@ -522,19 +537,23 @@
var a, ret;
a = Math.atan2(
- x - (this.x + this.w2)
- , - (y - this.y - this.w2)
+ x - (this.x + this.w2),
+ - (y - this.y - this.w2)
) - this.angleOffset;
- if(this.angleArc != this.PI2 && (a < 0) && (a > -0.5)) {
+ if (this.o.flip) {
+ a = this.angleArc - a - this.PI2;
+ }
+
+ if (this.angleArc != this.PI2 && (a < 0) && (a > -0.5)) {
+
// if isset angleArc option, set to min if .5 under min
a = 0;
} else if (a < 0) {
a += this.PI2;
}
- ret = ~~ (0.5 + (a * (this.o.max - this.o.min) / this.angleArc))
- + this.o.min;
+ ret = (a * (this.o.max - this.o.min) / this.angleArc) + this.o.min;
this.o.stopper && (ret = max(min(ret, this.o.max), this.o.min));
@@ -542,83 +561,98 @@
};
this.listen = function () {
+
// bind MouseWheel
- var s = this, mwTimerStop, mwTimerRelease,
+ var s = this, mwTimerStop,
+ mwTimerRelease,
mw = function (e) {
e.preventDefault();
- var ori = e.originalEvent
- ,deltaX = ori.detail || ori.wheelDeltaX
- ,deltaY = ori.detail || ori.wheelDeltaY
- ,v = s._validate(s.$.val())
- + (deltaX>0 || deltaY>0 ? s.o.step : deltaX<0 || deltaY<0 ? -s.o.step : 0);
+ var ori = e.originalEvent,
+ deltaX = ori.detail || ori.wheelDeltaX,
+ deltaY = ori.detail || ori.wheelDeltaY,
+ v = s._validate(s.o.parse(s.$.val()))
+ + (
+ deltaX > 0 || deltaY > 0
+ ? s.o.step
+ : deltaX < 0 || deltaY < 0 ? -s.o.step : 0
+ );
v = max(min(v, s.o.max), s.o.min);
s.val(v, false);
- if(s.rH) {
+ if (s.rH) {
// Handle mousewheel stop
clearTimeout(mwTimerStop);
- mwTimerStop = setTimeout(function() {
+ mwTimerStop = setTimeout(function () {
s.rH(v);
mwTimerStop = null;
}, 100);
// Handle mousewheel releases
- if(!mwTimerRelease) {
- mwTimerRelease = setTimeout(function() {
- if(mwTimerStop) s.rH(v);
+ if (!mwTimerRelease) {
+ mwTimerRelease = setTimeout(function () {
+ if (mwTimerStop)
+ s.rH(v);
mwTimerRelease = null;
}, 200);
}
}
- }
- , kval, to, m = 1, kv = {37:-s.o.step, 38:s.o.step, 39:s.o.step, 40:-s.o.step};
+ },
+ kval,
+ to,
+ m = 1,
+ kv = {
+ 37: -s.o.step,
+ 38: s.o.step,
+ 39: s.o.step,
+ 40: -s.o.step
+ };
this.$
.bind(
- "keydown"
- ,function (e) {
+ "keydown",
+ function (e) {
var kc = e.keyCode;
// numpad support
- if(kc >= 96 && kc <= 105) {
+ if (kc >= 96 && kc <= 105) {
kc = e.keyCode = kc - 48;
}
kval = parseInt(String.fromCharCode(kc));
if (isNaN(kval)) {
-
- (kc !== 13) // enter
- && (kc !== 8) // bs
- && (kc !== 9) // tab
- && (kc !== 189) // -
- && (kc !== 190 || s.$.val().match(/\./)) // . only allowed once
+ (kc !== 13) // enter
+ && kc !== 8 // bs
+ && kc !== 9 // tab
+ && kc !== 189 // -
+ && (kc !== 190
+ || s.$.val().match(/\./)) // . allowed once
&& e.preventDefault();
// arrows
if ($.inArray(kc,[37,38,39,40]) > -1) {
e.preventDefault();
- var v = parseFloat(s.$.val()) + kv[kc] * m;
+ var v = s.o.parse(s.$.val()) + kv[kc] * m;
s.o.stopper && (v = max(min(v, s.o.max), s.o.min));
- s.change(v);
+ s.change(s._validate(v));
s._draw();
// long time keydown speed-up
- to = window.setTimeout(
- function () { m *= 2; }, 30
- );
+ to = window.setTimeout(function () {
+ m *= 2;
+ }, 30);
}
}
}
)
.bind(
- "keyup"
- ,function (e) {
+ "keyup",
+ function (e) {
if (isNaN(kval)) {
if (to) {
window.clearTimeout(to);
@@ -631,20 +665,16 @@
(s.$.val() > s.o.max && s.$.val(s.o.max))
|| (s.$.val() < s.o.min && s.$.val(s.o.min));
}
-
}
);
this.$c.bind("mousewheel DOMMouseScroll", mw);
- this.$.bind("mousewheel DOMMouseScroll", mw)
+ this.$.bind("mousewheel DOMMouseScroll", mw);
};
this.init = function () {
-
- if (
- this.v < this.o.min
- || this.v > this.o.max
- ) this.v = this.o.min;
+ if (this.v < this.o.min
+ || this.v > this.o.max) { this.v = this.o.min; }
this.$.val(this.v);
this.w2 = this.w / 2;
@@ -669,81 +699,90 @@
this.endAngle = 1.5 * Math.PI + this.angleOffset + this.angleArc;
var s = max(
- String(Math.abs(this.o.max)).length
- , String(Math.abs(this.o.min)).length
- , 2
- ) + 2;
+ String(Math.abs(this.o.max)).length,
+ String(Math.abs(this.o.min)).length,
+ 2
+ ) + 2;
this.o.displayInput
&& this.i.css({
- 'width' : ((this.w / 2 + 4) >> 0) + 'px'
- ,'height' : ((this.w / 3) >> 0) + 'px'
- ,'position' : 'absolute'
- ,'vertical-align' : 'middle'
- ,'margin-top' : ((this.w / 3) >> 0) + 'px'
- ,'margin-left' : '-' + ((this.w * 3 / 4 + 2) >> 0) + 'px'
- ,'border' : 0
- ,'background' : 'none'
- ,'font' : this.o.fontWeight + ' ' + ((this.w / s) >> 0) + 'px ' + this.o.font
- ,'text-align' : 'center'
- ,'color' : this.o.inputColor || this.o.fgColor
- ,'padding' : '0px'
- ,'-webkit-appearance': 'none'
- })
- || this.i.css({
- 'width' : '0px'
- ,'visibility' : 'hidden'
+ 'width' : ((this.w / 2 + 4) >> 0) + 'px',
+ 'height' : ((this.w / 3) >> 0) + 'px',
+ 'position' : 'absolute',
+ 'vertical-align' : 'middle',
+ 'margin-top' : ((this.w / 3) >> 0) + 'px',
+ 'margin-left' : '-' + ((this.w * 3 / 4 + 2) >> 0) + 'px',
+ 'border' : 0,
+ 'background' : 'none',
+ 'font' : this.o.fontWeight + ' ' + ((this.w / s) >> 0) + 'px ' + this.o.font,
+ 'text-align' : 'center',
+ 'color' : this.o.inputColor || this.o.fgColor,
+ 'padding' : '0px',
+ '-webkit-appearance': 'none'
+ }) || this.i.css({
+ 'width': '0px',
+ 'visibility': 'hidden'
});
};
this.change = function (v) {
this.cv = v;
- this.$.val(v);
+ this.$.val(this.o.format(v));
};
this.angle = function (v) {
return (v - this.o.min) * this.angleArc / (this.o.max - this.o.min);
};
- this.draw = function () {
+ this.arc = function (v) {
+ var sa, ea;
+ v = this.angle(v);
+ if (this.o.flip) {
+ sa = this.endAngle + 0.00001;
+ ea = sa - v - 0.00001;
+ } else {
+ sa = this.startAngle - 0.00001;
+ ea = sa + v + 0.00001;
+ }
+ this.o.cursor
+ && (sa = ea - this.cursorExt)
+ && (ea = ea + this.cursorExt);
+
+ return {
+ s: sa,
+ e: ea,
+ d: this.o.flip && !this.o.cursor
+ };
+ };
+ this.draw = function () {
var c = this.g, // context
- a = this.angle(this.cv) // Angle
- , sat = this.startAngle // Start angle
- , eat = sat + a // End angle
- , sa, ea // Previous angles
- , r = 1;
+ a = this.arc(this.cv), // Arc
+ pa, // Previous arc
+ r = 1;
c.lineWidth = this.lineWidth;
-
c.lineCap = this.lineCap;
- this.o.cursor
- && (sat = eat - this.cursorExt)
- && (eat = eat + this.cursorExt);
-
- c.beginPath();
- c.strokeStyle = this.o.bgColor;
- c.arc(this.xy, this.xy, this.radius, this.endAngle - 0.00001, this.startAngle + 0.00001, true);
- c.stroke();
+ if (this.o.bgColor !== "none") {
+ c.beginPath();
+ c.strokeStyle = this.o.bgColor;
+ c.arc(this.xy, this.xy, this.radius, this.endAngle - 0.00001, this.startAngle + 0.00001, true);
+ c.stroke();
+ }
if (this.o.displayPrevious) {
- ea = this.startAngle + this.angle(this.v);
- sa = this.startAngle;
- this.o.cursor
- && (sa = ea - this.cursorExt)
- && (ea = ea + this.cursorExt);
-
+ pa = this.arc(this.v);
c.beginPath();
- c.strokeStyle = this.pColor;
- c.arc(this.xy, this.xy, this.radius, sa - 0.00001, ea + 0.00001, false);
+ c.strokeStyle = this.pColor;
+ c.arc(this.xy, this.xy, this.radius, pa.s, pa.e, pa.d);
c.stroke();
- r = (this.cv == this.v);
+ r = this.cv == this.v;
}
c.beginPath();
- c.strokeStyle = r ? this.o.fgColor : this.fgColor ;
- c.arc(this.xy, this.xy, this.radius, sat - 0.00001, eat + 0.00001, false);
+ c.strokeStyle = r ? this.o.fgColor : this.fgColor ;
+ c.arc(this.xy, this.xy, this.radius, a.s, a.e, a.d);
c.stroke();
};
@@ -763,4 +802,4 @@
).parent();
};
-})(jQuery);
\ No newline at end of file
+}));
diff --git a/knob.jquery.json b/knob.jquery.json
index 7bc01a8..01a9063 100755
--- a/knob.jquery.json
+++ b/knob.jquery.json
@@ -9,7 +9,7 @@
"ui",
"input"
],
- "version": "1.2.5",
+ "version": "1.2.13",
"author": {
"name": "Anthony Terrien",
"url": "https://github.com/aterrien"
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..fbb4245
--- /dev/null
+++ b/package.json
@@ -0,0 +1,24 @@
+{
+ "name": "jquery-knob",
+ "version": "1.2.13",
+ "description": "Nice, downward compatible, touchable, jQuery dial",
+ "main": "dist/jquery.knob.min.js",
+ "scripts": {
+ "test": "echo \"Error: no test specified\" && exit 1"
+ },
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/aterrien/jQuery-Knob.git"
+ },
+ "keywords": [
+ "jquery",
+ "knob",
+ "dial"
+ ],
+ "author": "Anthony Terrien",
+ "license": "MIT",
+ "bugs": {
+ "url": "https://github.com/aterrien/jQuery-Knob/issues"
+ },
+ "homepage": "https://github.com/aterrien/jQuery-Knob#readme"
+}