chore: change naming conventions

Tirth Patel · Tirth Patel · commit ed8e6d24a8fd · 2021-10-04T18:13:06.000+05:30
diff --git a/src/core/index.js b/src/core/index.js
@@ -92,8 +92,7 @@ let Core = function( opts ){
       queue: []
     },
     hasCompoundNodes: false,
-    doubleClickEnabled: defVal(false, options.doubleClickEnabled),
-    oneClickDebounceTime: options.doubleClickEnabled ? defVal(250, options.oneClickDebounceTime) : 0 // only works if doubleClickEnabled is set to true
+    multiClickDebounceTime: defVal(250, options.multiClickDebounceTime)
   };
 
   this.createEmitter();
@@ -425,7 +424,7 @@ util.extend( corefn, {
         'panningEnabled', 'userPanningEnabled',
         'boxSelectionEnabled',
         'autolock', 'autoungrabify', 'autounselectify',
-        'doubleClickEnabled', 'oneClickDebounceTime'
+        'multiClickDebounceTime'
       ];
 
       for( let i = 0; i < fields.length; i++ ){
@@ -481,8 +480,7 @@ util.extend( corefn, {
       json.textureOnViewport = options.textureOnViewport;
       json.wheelSensitivity = options.wheelSensitivity;
       json.motionBlur = options.motionBlur;
-      json.doubleClickEnabled = options.doubleClickEnabled;
-      json.oneClickDebounceTime = options.oneClickDebounceTime;
+      json.multiClickDebounceTime = options.multiClickDebounceTime;
 
       return json;
     }
diff --git a/src/core/viewport.js b/src/core/viewport.js
@@ -588,16 +588,9 @@ let corefn = ({
     };
   },
   
-  doubleClickEnabled: function( bool ){
-    if( bool !== undefined ){
-      this._private.doubleClickEnabled = !!bool;
-    } else return this._private.doubleClickEnabled;
-    return this; // chaining
-  },
-
-  oneClickDebounceTime: function ( int ){
-    if( int ) (this._private.oneClickDebounceTime = int);
-    else return this._private.oneClickDebounceTime;
+  multiClickDebounceTime: function ( int ){
+    if( int ) (this._private.multiClickDebounceTime = int);
+    else return this._private.multiClickDebounceTime;
     return this; // chaining
   }
 });
diff --git a/src/extensions/renderer/base/load-listeners.js b/src/extensions/renderer/base/load-listeners.js
@@ -905,20 +905,19 @@ BRp.load = function(){
         !r.hoverData.isOverThresholdDrag // didn't move too much
       ) {
         triggerEvents(down, ["click", "tap", "vclick"], e, { x: pos[0], y: pos[1] });
-        if (cy.doubleClickEnabled()) {
-          didDoubleClick = false;
-          if (e.timeStamp - prevClickTimeStamp <= cy.oneClickDebounceTime()) {
-            clickTimeout && clearTimeout(clickTimeout);
-            didDoubleClick = true;
-            prevClickTimeStamp = null;
-            triggerEvents(down, ["dblclick", "dbltap", "vdblclick"], e, { x: pos[0], y: pos[1] });
-          } else {
-            clickTimeout = setTimeout(() => {
-              if (didDoubleClick) return;
-              triggerEvents(down, ["oneclick", "onetap", "voneclick"], e, { x: pos[0], y: pos[1] });
-            }, cy.oneClickDebounceTime());
-            prevClickTimeStamp = e.timeStamp;
-          }
+
+        didDoubleClick = false;
+        if (e.timeStamp - prevClickTimeStamp <= cy.multiClickDebounceTime()) {
+          clickTimeout && clearTimeout(clickTimeout);
+          didDoubleClick = true;
+          prevClickTimeStamp = null;
+          triggerEvents(down, ["dblclick", "dbltap", "vdblclick"], e, { x: pos[0], y: pos[1] });
+        } else {
+          clickTimeout = setTimeout(() => {
+            if (didDoubleClick) return;
+            triggerEvents(down, ["oneclick", "onetap", "voneclick"], e, { x: pos[0], y: pos[1] });
+          }, cy.multiClickDebounceTime());
+          prevClickTimeStamp = e.timeStamp;
         }
       }
 
@@ -1983,20 +1982,19 @@ BRp.load = function(){
         }
 
         triggerEvents( start, [ 'tap', 'vclick' ], e, { x: now[0], y: now[1] } );
-        if (cy.doubleClickEnabled()) {
-          didDoubleTouch = false;
-          if (e.timeStamp - prevTouchTimeStamp <= cy.oneClickDebounceTime()) {
-            touchTimeout && clearTimeout(touchTimeout);
-            didDoubleTouch = true;
-            prevTouchTimeStamp = null;
-            triggerEvents( start, [ 'dbltap', 'vdblclick' ], e, { x: now[0], y: now[1] } );
-          } else {
-            touchTimeout = setTimeout(() => {
-              if (didDoubleTouch) return;
-              triggerEvents( start, [ 'onetap', 'voneclick' ], e, { x: now[0], y: now[1] } );
-            }, cy.oneClickDebounceTime());
-            prevTouchTimeStamp = e.timeStamp;
-          }
+
+        didDoubleTouch = false;
+        if (e.timeStamp - prevTouchTimeStamp <= cy.multiClickDebounceTime()) {
+          touchTimeout && clearTimeout(touchTimeout);
+          didDoubleTouch = true;
+          prevTouchTimeStamp = null;
+          triggerEvents( start, [ 'dbltap', 'vdblclick' ], e, { x: now[0], y: now[1] } );
+        } else {
+          touchTimeout = setTimeout(() => {
+            if (didDoubleTouch) return;
+            triggerEvents( start, [ 'onetap', 'voneclick' ], e, { x: now[0], y: now[1] } );
+          }, cy.multiClickDebounceTime());
+          prevTouchTimeStamp = e.timeStamp;
         }
       }
 
