Skip to content

Migrated Slider from Mouse to Pointer #2373

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Migrated Slider from Mouse to Pointer #2373

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
62 changes: 31 additions & 31 deletions ui/widgets/slider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
"./mouse",
"./pointer",
"../keycode",
"../version",
"../widget"
Expand All @@ -37,7 +37,7 @@
} )( function( $ ) {
"use strict";

return $.widget( "ui.slider", $.ui.mouse, {
return $.widget( "ui.slider", $.ui.pointer, {
version: "@VERSION",
widgetEventPrefix: "slide",

Expand Down Expand Up @@ -73,11 +73,11 @@ return $.widget( "ui.slider", $.ui.mouse, {

_create: function() {
this._keySliding = false;
this._mouseSliding = false;
this._pointerSliding = false;
this._animateOff = true;
this._handleIndex = null;
this._detectOrientation();
this._mouseInit();
this._pointerInit();
this._calculateNewMax();

this._addClass( "ui-slider ui-slider-" + this.orientation,
Expand Down Expand Up @@ -178,11 +178,11 @@ return $.widget( "ui.slider", $.ui.mouse, {
this.range.remove();
}

this._mouseDestroy();
this._pointerDestroy();
},

_mouseCapture: function( event ) {
var position, normValue, distance, closestHandle, index, allowed, offset, mouseOverHandle,
_pointerCapture: function( event ) {
var position, normValue, distance, closestHandle, index, allowed, offset, pointerOverHandle,
that = this,
o = this.options;

Expand All @@ -197,7 +197,7 @@ return $.widget( "ui.slider", $.ui.mouse, {
this.elementOffset = this.element.offset();

position = { x: event.pageX, y: event.pageY };
normValue = this._normValueFromMouse( position );
normValue = this._normValueFromPointer( position );
distance = this._valueMax() - this._valueMin() + 1;
this.handles.each( function( i ) {
var thisDistance = Math.abs( normValue - that.values( i ) );
Expand All @@ -214,16 +214,16 @@ return $.widget( "ui.slider", $.ui.mouse, {
if ( allowed === false ) {
return false;
}
this._mouseSliding = true;
this._pointerSliding = true;

this._handleIndex = index;

this._addClass( closestHandle, null, "ui-state-active" );
closestHandle.trigger( "focus" );

offset = closestHandle.offset();
mouseOverHandle = !$( event.target ).parents().addBack().is( ".ui-slider-handle" );
this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
pointerOverHandle = !$( event.target ).parents().addBack().is( ".ui-slider-handle" );
this._clickOffset = pointerOverHandle ? { left: 0, top: 0 } : {
left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
top: event.pageY - offset.top -
( closestHandle.height() / 2 ) -
Expand All @@ -239,22 +239,22 @@ return $.widget( "ui.slider", $.ui.mouse, {
return true;
},

_mouseStart: function() {
_pointerStart: function() {
return true;
},

_mouseDrag: function( event ) {
_pointerDrag: function( event ) {
var position = { x: event.pageX, y: event.pageY },
normValue = this._normValueFromMouse( position );
normValue = this._normValueFromPointer( position );

this._slide( event, this._handleIndex, normValue );

return false;
},

_mouseStop: function( event ) {
_pointerStop: function( event ) {
this._removeClass( this.handles, null, "ui-state-active" );
this._mouseSliding = false;
this._pointerSliding = false;

this._stop( event, this._handleIndex );
this._change( event, this._handleIndex );
Expand All @@ -270,38 +270,38 @@ return $.widget( "ui.slider", $.ui.mouse, {
this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
},

_normValueFromMouse: function( position ) {
_normValueFromPointer: function( position ) {
var pixelTotal,
pixelMouse,
percentMouse,
pixelPointer,
percentPointer,
valueTotal,
valueMouse;
valuePointer;

if ( this.orientation === "horizontal" ) {
pixelTotal = this.elementSize.width;
pixelMouse = position.x - this.elementOffset.left -
pixelPointer = position.x - this.elementOffset.left -
( this._clickOffset ? this._clickOffset.left : 0 );
} else {
pixelTotal = this.elementSize.height;
pixelMouse = position.y - this.elementOffset.top -
pixelPointer = position.y - this.elementOffset.top -
( this._clickOffset ? this._clickOffset.top : 0 );
}

percentMouse = ( pixelMouse / pixelTotal );
if ( percentMouse > 1 ) {
percentMouse = 1;
percentPointer = ( pixelPointer / pixelTotal );
if ( percentPointer > 1 ) {
percentPointer = 1;
}
if ( percentMouse < 0 ) {
percentMouse = 0;
if ( percentPointer < 0 ) {
percentPointer = 0;
}
if ( this.orientation === "vertical" ) {
percentMouse = 1 - percentMouse;
percentPointer = 1 - percentPointer;
}

valueTotal = this._valueMax() - this._valueMin();
valueMouse = this._valueMin() + percentMouse * valueTotal;
valuePointer = this._valueMin() + percentPointer * valueTotal;

return this._trimAlignValue( valueMouse );
return this._trimAlignValue( valuePointer );
},

_uiHash: function( index, value, values ) {
Expand Down Expand Up @@ -366,7 +366,7 @@ return $.widget( "ui.slider", $.ui.mouse, {
},

_change: function( event, index ) {
if ( !this._keySliding && !this._mouseSliding ) {
if ( !this._keySliding && !this._pointerSliding ) {

//store the last changed value index for reference when handles overlap
this._lastChangedValue = index;
Expand Down
Loading