Skip to content

Adds a scale to TKAdjustableNumber to adjust the rate at which drag events change the value #14

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

Open
gravitypersists wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adds a scale to TKAdjustableNumber to adjust the rate at which drag events change the value #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cb4508
add scale to TKAdjustableNumber
gravitypersists Jun 12, 2013
40f56ce
Add toFixed to get rid of js rounding errors on decimal step-size
gravitypersists Jun 24, 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
9 changes: 6 additions & 3 deletions TangleKit/TangleKit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ Tangle.classes.TKNumberField = {
// Attributes: data-min (optional): minimum value
// data-max (optional): maximum value
// data-step (optional): granularity of adjustment (can be fractional)
// data-scale (optional): rate of drag movements

var isAnyAdjustableNumberDragging = false; // hack for dragging one value over another one

Expand All @@ -144,6 +145,8 @@ Tangle.classes.TKAdjustableNumber = {
this.min = (options.min !== undefined) ? parseFloat(options.min) : 0;
this.max = (options.max !== undefined) ? parseFloat(options.max) : 1e100;
this.step = (options.step !== undefined) ? parseFloat(options.step) : 1;
this.scale = (options.scale !== undefined) ? parseFloat(options.scale) : 1/5;
this.digits = (""+this.step).split('.')[1].length;

this.initializeHover();
this.initializeHelp();
Expand Down Expand Up @@ -217,9 +220,9 @@ Tangle.classes.TKAdjustableNumber = {
},

touchDidMove: function (touches) {
var value = this.valueAtMouseDown + touches.translation.x / 5 * this.step;
value = ((value / this.step).round() * this.step).limit(this.min, this.max);
this.tangle.setValue(this.variable, value);
var value = this.valueAtMouseDown + touches.translation.x * this.scale * this.step;
value = ((value / this.step).round() * this.step).limit(this.min, this.max).toFixed(this.digits);
this.tangle.setValue(this.variable, parseFloat(value, 10));
this.updateHelp();
},

Expand Down