Revert fix regression since #140

Author: aterrien

js/jquery.knob.js

@@ -147,7 +147,7 @@
                     s.v[k] = $this.val();
 
                     $this.bind(
-                        'change input'
+                        'change'
                         , function () {
                             var val = {};
                             val[k] = $this.val();
@@ -165,7 +165,7 @@
                 (this.v == '') && (this.v = this.o.min);
 
                 this.$.bind(
-                    'change input'
+                    'change'
                     , function () {
                         s.val(s._validate(s.$.val()));
                     }
@@ -318,6 +318,13 @@
                             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();
             };
@@ -352,6 +359,13 @@
 
             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();
             };
@@ -514,13 +528,7 @@
 
         this.val = function (v) {
             if (null != v) {
-                var newValue = this.o.stopper ? max(min(v, this.o.max), this.o.min) : v;
-                if (newValue == this.cv) return;
-                this.cv = newValue;
-                if (
-                    this.cH
-                    && (this.cH(this.cv) === false)
-                ) return;
+                this.cv = this.o.stopper ? max(min(v, this.o.max), this.o.min) : v;
                 this.v = this.cv;
                 this.$.val(this.v);
                 this._draw();
@@ -562,6 +570,12 @@
                                 ,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};
@@ -735,12 +749,7 @@
         };
 
         this.change = function (v) {
-            if (v == this.cv) return;
             this.cv = v;
-            if (
-                this.cH
-                && (this.cH(v) === false)
-            ) return;
             this.$.val(v);
         };