Skip to content

fixed displayInput width on external format, change event on keyboard and mouse wheel, classes #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

fixed displayInput width on external format, change event on keyboard and mouse wheel, classes #253

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
babc6fc
added option 'angleAperture' || default = 360
FabrizioC Jun 26, 2012
4bf72f7
Revert "added option 'angleAperture' || default = 360"
FabrizioC Jun 27, 2012
8f40afd
Revert "Revert "added option 'angleAperture' || default = 360""
FabrizioC Jun 27, 2012
5a4c1c4
Revert "Revert "Revert "added option 'angleAperture' || default = 360"""
FabrizioC Jun 27, 2012
665bbb5
added option 'angleArc' || default = 360
FabrizioC Jun 27, 2012
f5878f8
Added angleArc example
FabrizioC Jun 27, 2012
2734c27
added 'angleArc' description
FabrizioC Jun 27, 2012
3cc1125
added option 'angleBgCircle' || default = false
FabrizioC Jun 27, 2012
66eee6d
Update from original
FabrizioC Dec 11, 2014
c94028a
Merge pull request #1 from aterrien/master
FabrizioC Dec 11, 2014
9f332bd
added classes to canvas and container objects
FabrizioC Dec 12, 2014
e03fe0b
Triggering change hook on mousewheel and keyboard
FabrizioC Dec 12, 2014
d9db487
fixed displayInput size on external format
FabrizioC Dec 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions js/jquery.knob.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,13 @@
// adds needed DOM elements (canvas, div)
this.$c = $(document.createElement('canvas')).attr({
width: this.o.width,
height: this.o.height
height: this.o.height,
class: "knobCanvas"
});

// wraps all elements in a div
// add to DOM before Canvas init is triggered
this.$div = $('<div style="'
this.$div = $('<div class="knobContainer" style="'
+ (this.o.inline ? 'display:inline;' : '')
+ 'width:' + this.o.width + 'px;height:' + this.o.height + 'px;'
+ '"></div>');
Expand Down Expand Up @@ -580,6 +581,8 @@

v = max(min(v, s.o.max), s.o.min);

if (s.cH && s.cH(v) === false) return;

s.val(v, false);

if (s.rH) {
Expand Down Expand Up @@ -639,6 +642,8 @@
var v = s.o.parse(s.$.val()) + kv[kc] * m;
s.o.stopper && (v = max(min(v, s.o.max), s.o.min));

if (s.cH && s.cH(v) === false) return;

s.change(s._validate(v));
s._draw();

Expand All @@ -647,6 +652,11 @@
m *= 2;
}, 30);
}
else if (kc == 13) {
var v = s.o.parse(s.$.val());
s.o.stopper && (v = max(min(v, s.o.max), s.o.min));
if (s.cH && s.cH(v) === false) return;
}
}
}
)
Expand Down Expand Up @@ -699,10 +709,10 @@
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;
this.o.format(this.o.max).length || String(Math.abs(this.o.max)).length + 2,
this.o.format(this.o.min).length || String(Math.abs(this.o.min)).length + 2,
4
);

this.o.displayInput
&& this.i.css({
Expand Down