Merge branch 'master' of bitbucket.org:jamkazam/jam-web
This commit is contained in:
commit
0d68db0d0c
|
|
@ -29,7 +29,9 @@
|
|||
|
||||
// Notify subscribers of value change
|
||||
g._.each(subscribers, function(changeFunc, index, list) {
|
||||
changeFunc(faderId, faderPct, false);
|
||||
if (faderId === index) {
|
||||
changeFunc(faderId, faderPct, false);
|
||||
}
|
||||
});
|
||||
|
||||
setHandlePosition($fader, faderPct);
|
||||
|
|
@ -59,7 +61,9 @@
|
|||
var faderPct = faderValue($fader, evt);
|
||||
// Notify subscribers of value change
|
||||
g._.each(subscribers, function(changeFunc, index, list) {
|
||||
changeFunc(faderId, faderPct, false);
|
||||
if (faderId === index) {
|
||||
changeFunc(faderId, faderPct, false);
|
||||
}
|
||||
});
|
||||
$draggingFaderHandle = null;
|
||||
$draggingFader = null;
|
||||
|
|
@ -95,7 +99,9 @@
|
|||
|
||||
// Notify subscribers of value change
|
||||
g._.each(subscribers, function(changeFunc, index, list) {
|
||||
changeFunc(faderId, faderPct, true);
|
||||
if (faderId === index) {
|
||||
changeFunc(faderId, faderPct, true);
|
||||
}
|
||||
});
|
||||
|
||||
if (faderPct > MAX_VISUAL_FADER) { faderPct = MAX_VISUAL_FADER; } // Visual limit
|
||||
|
|
@ -186,11 +192,11 @@
|
|||
var d = 3.1788545454166156E-03;
|
||||
var f = -3.5148685730880861E-05;
|
||||
var g = 1.4221429222004657E-07;
|
||||
temp += a +
|
||||
b * input +
|
||||
c * Math.pow(input, 2.0) +
|
||||
d * Math.pow(input, 3.0) +
|
||||
f * Math.pow(input, 4.0) +
|
||||
temp += a +
|
||||
b * input +
|
||||
c * Math.pow(input, 2.0) +
|
||||
d * Math.pow(input, 3.0) +
|
||||
f * Math.pow(input, 4.0) +
|
||||
g * Math.pow(input, 5.0);
|
||||
|
||||
return temp;
|
||||
|
|
|
|||
Loading…
Reference in New Issue