Skip to content

Make change event always fire as the user interacts with the knob #143

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 1 commit into from
Nov 20, 2013
Merged

Make change event always fire as the user interacts with the knob #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@

return false;
}
}
},
change: function (val) { console.log("Change: " + val) }
});

// Example of infinite knob, iPod click wheel
Expand Down Expand Up @@ -309,4 +310,4 @@ <h1>jQuery Knob</h1>
<p style="font-size:20px;">jQuery Knob is &copy; 2012 Anthony Terrien and dual licensed under the MIT or GPL licenses.</p>
</div>
</body>
</html>
</html>
43 changes: 15 additions & 28 deletions js/jquery.knob.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
s.v[k] = $this.val();

$this.bind(
'change'
'change keyup'
, function () {
var val = {};
val[k] = $this.val();
Expand All @@ -159,7 +159,7 @@
(this.v == '') && (this.v = this.o.min);

this.$.bind(
'change'
'change keyup'
, function () {
s.val(s._validate(s.$.val()));
}
Expand Down Expand Up @@ -302,15 +302,6 @@
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;


s.change(s._validate(v));
s._draw();
};
Expand Down Expand Up @@ -345,13 +336,6 @@

var mouseMove = function (e) {
var v = s.xy2val(e.pageX, e.pageY);
if (v == s.cv) return;

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

s.change(s._validate(v));
s._draw();
};
Expand Down Expand Up @@ -516,8 +500,13 @@

this.val = function (v) {
if (null != v) {
this.cv = this.o.stopper ? max(min(v, this.o.max), this.o.min) : v;
this.v = this.cv;
var newValue = this.o.stopper ? max(min(v, this.o.max), this.o.min) : v;
if (
newValue != this.cv // avoid double callback for same value
&& this.cH
&& (this.cH(this.cv) === false)
) return;
this.v = this.cv = newValue;
this.$.val(this.v);
this._draw();
} else {
Expand Down Expand Up @@ -558,12 +547,6 @@
,deltaX = ori.detail || ori.wheelDeltaX
,deltaY = ori.detail || ori.wheelDeltaY
,v = parseInt(s.$.val()) + (deltaX>0 || deltaY>0 ? s.o.step : deltaX<0 || deltaY<0 ? -s.o.step : 0);

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

s.val(v);
}
, kval, to, m = 1, kv = {37:-s.o.step, 38:s.o.step, 39:s.o.step, 40:-s.o.step};
Expand Down Expand Up @@ -691,8 +674,12 @@
};

this.change = function (v) {
if (v == this.cv) return;
this.cv = v;
this.$.val(v);
if (
this.cH
&& (this.cH(v) === false)
) return;
};

this.angle = function (v) {
Expand Down Expand Up @@ -757,4 +744,4 @@
).parent();
};

})(jQuery);
})(jQuery);