Skip to content

Add ability to set input color & line cap style #63

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

Merged
merged 5 commits into from
Jan 24, 2013
Merged

Add ability to set input color & line cap style #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4900e49
add ability to independently set input (middle text) color
jaketrent Jan 23, 2013
df7f358
add inputColor option doc
jaketrent Jan 23, 2013
6effba1
add ability to set line cap style (eg, to rounded)
jaketrent Jan 23, 2013
8e441ff
add line cap doc
jaketrent Jan 23, 2013
4a120ee
add line cap option to doc
jaketrent Jan 23, 2013
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
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@ Behaviors :
UI :
* cursor : display mode "cursor" | default=gauge.
* thickness : gauge thickness.
* lineCap : gauge stroke endings. | default=butt, round=rounded line endings
* width : dial width.
* displayInput : default=true | false=hide input.
* displayPrevious : default=false | true=displays the previous value with transparency.
* fgColor : foreground color.
* inputColor : input value (number) color.
* bgColor : background color.

Hooks
Expand Down
7 changes: 6 additions & 1 deletion js/jquery.knob.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,13 @@
|| this.$.data('cursor')
|| 0,
thickness : this.$.data('thickness') || 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') || this.$.data('fgcolor') || '#87CEEB',
inline : false,

// Hooks
Expand Down Expand Up @@ -540,6 +542,7 @@
this.cursorExt = this.o.cursor / 100;
this.xy = this.w2;
this.lineWidth = this.xy * this.o.thickness;
this.lineCap = this.o.lineCap;
this.radius = this.xy - this.lineWidth / 2;

this.o.angleOffset
Expand Down Expand Up @@ -574,7 +577,7 @@
,'background' : 'none'
,'font' : 'bold ' + ((this.o.width / s) >> 0) + 'px Arial'
,'text-align' : 'center'
,'color' : this.o.fgColor
,'color' : this.o.inputColor || this.o.fgColor
,'padding' : '0px'
,'-webkit-appearance': 'none'
})
Expand Down Expand Up @@ -604,6 +607,8 @@

c.lineWidth = this.lineWidth;

c.lineCap = this.lineCap;

this.o.cursor
&& (sat = eat - this.cursorExt)
&& (eat = eat + this.cursorExt);
Expand Down