OSDN Git Service
(root)
/
pettanr
/
clientJs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 0.6.141, fix X.UI.ScrollBox.
[pettanr/clientJs.git]
/
0.6.x
/
js
/
20_ui
/
05_XUI_Gesture.js
diff --git
a/0.6.x/js/20_ui/05_XUI_Gesture.js
b/0.6.x/js/20_ui/05_XUI_Gesture.js
index
1f7bd1f
..
3361dfa
100644
(file)
--- a/
0.6.x/js/20_ui/05_XUI_Gesture.js
+++ b/
0.6.x/js/20_ui/05_XUI_Gesture.js
@@
-4,15
+4,12
@@
* Jorik Tangelder <j.tangelder@gmail.com>, MIT license
\r
**/
\r
\r
* Jorik Tangelder <j.tangelder@gmail.com>, MIT license
\r
**/
\r
\r
-( function( Math, window, document, undefined ){
\r
\r
var ELEENT_LIST = [],
\r
HAMMER_LIST = [],
\r
POINTERS = [],
\r
ABS = new Function( 'v', 'return v<0?-v:v' );
\r
\r
\r
var ELEENT_LIST = [],
\r
HAMMER_LIST = [],
\r
POINTERS = [],
\r
ABS = new Function( 'v', 'return v<0?-v:v' );
\r
\r
- X.UI.Gesture = Hammer;
\r
-
\r
function Hammer( uinodeRoot, uinode, type ){
\r
this.uinode = uinode;
\r
this.enabled = true;
\r
function Hammer( uinodeRoot, uinode, type ){
\r
this.uinode = uinode;
\r
this.enabled = true;
\r
@@
-38,10
+35,10
@@
pointerType, i, l, touches, ret, active, gesture, startEv,
\r
hammer, deltaTime, deltaX, deltaY, velocity, center;
\r
\r
pointerType, i, l, touches, ret, active, gesture, startEv,
\r
hammer, deltaTime, deltaX, deltaY, velocity, center;
\r
\r
- //console.log( 'Hammer@handleEvent ' + X
.UI.
Event.IdToName[ e.type ] + ' ' + e.pointerType + ' ' + type );
\r
+ //console.log( 'Hammer@handleEvent ' + X
UI_
Event.IdToName[ e.type ] + ' ' + e.pointerType + ' ' + type );
\r
if( !type ) return;
\r
\r
if( !type ) return;
\r
\r
- //console.log( e.type + ' dw:' + X
.UI.Event._POINTER_DOWN + ' up:' + X.UI.Event._POINTER_UP + ' mv:' + X.UI.
Event._POINTER_MOVE );
\r
+ //console.log( e.type + ' dw:' + X
UI_Event._POINTER_DOWN + ' up:' + XUI_Event._POINTER_UP + ' mv:' + XUI_
Event._POINTER_MOVE );
\r
\r
if( e.pointerType ){
\r
type |= POINTER;
\r
\r
if( e.pointerType ){
\r
type |= POINTER;
\r
@@
-70,7
+67,7
@@
enable_detect = true;
\r
};
\r
\r
enable_detect = true;
\r
};
\r
\r
- //console.log( 'Hammer@handleEvent ' + IdToGestureID[ e.type ] + ' ' + e.type + ' ' + X
.UI.
Event._POINTER_DOWN + ' ' + enable_detect );
\r
+ //console.log( 'Hammer@handleEvent ' + IdToGestureID[ e.type ] + ' ' + e.type + ' ' + X
UI_
Event._POINTER_DOWN + ' ' + enable_detect );
\r
\r
// we are in a touch event, set the touch triggered bool to true,
\r
// this for the conflicts that may occur on ios and android
\r
\r
// we are in a touch event, set the touch triggered bool to true,
\r
// this for the conflicts that may occur on ios and android
\r
@@
-257,8
+254,8
@@
Detection.register( Gestures[ name ] );
\r
};
\r
\r
Detection.register( Gestures[ name ] );
\r
};
\r
\r
- Hammer.EVENT_TYPES_START = [ X
.UI.
Event._POINTER_DOWN ];
\r
- types = [ X
.UI.Event._POINTER_MOVE, X.UI.Event._POINTER_UP, X.UI.
Event._POINTER_CANCEL ];
\r
+ Hammer.EVENT_TYPES_START = [ X
UI_
Event._POINTER_DOWN ];
\r
+ types = [ X
UI_Event._POINTER_MOVE, XUI_Event._POINTER_UP, XUI_
Event._POINTER_CANCEL ];
\r
\r
// Add touch events on the document
\r
Utils.addEvents( uinodeRoot, types, Hammer.prototype.handleEvent );
\r
\r
// Add touch events on the document
\r
Utils.addEvents( uinodeRoot, types, Hammer.prototype.handleEvent );
\r
@@
-341,12
+338,12
@@
EVENT_TYPE_MASK = START | MOVE | END,
\r
POINTER_TYPE_MASK = POINTER | TOUCH | MOUSE | PEN,
\r
IdToGestureID = {};
\r
EVENT_TYPE_MASK = START | MOVE | END,
\r
POINTER_TYPE_MASK = POINTER | TOUCH | MOUSE | PEN,
\r
IdToGestureID = {};
\r
- IdToGestureID[ X
.UI.
Event._POINTER_DOWN ] = START;
\r
- IdToGestureID[ X
.UI.
Event._POINTER_MOVE ] = MOVE;
\r
- IdToGestureID[ X
.UI.
Event._POINTER_UP ] = END;
\r
- IdToGestureID[ X
.UI.
Event._POINTER_CANCEL ] = END;
\r
+ IdToGestureID[ X
UI_
Event._POINTER_DOWN ] = START;
\r
+ IdToGestureID[ X
UI_
Event._POINTER_MOVE ] = MOVE;
\r
+ IdToGestureID[ X
UI_
Event._POINTER_UP ] = END;
\r
+ IdToGestureID[ X
UI_
Event._POINTER_CANCEL ] = END;
\r
\r
\r
- Utils = {
\r
+
var
Utils = {
\r
\r
/**
\r
* touch events with mouse fallback
\r
\r
/**
\r
* touch events with mouse fallback
\r
@@
-535,7
+532,7
@@
*/
\r
var touch_triggered = false;
\r
\r
*/
\r
var touch_triggered = false;
\r
\r
- Detection = {
\r
+
var
Detection = {
\r
// contains all registred Gestures in the correct order
\r
gestures : [],
\r
\r
// contains all registred Gestures in the correct order
\r
gestures : [],
\r
\r
@@
-733,8
+730,8
@@
Gestures.Hold = {
\r
name : 'hold',
\r
index : 10,
\r
Gestures.Hold = {
\r
name : 'hold',
\r
index : 10,
\r
- startID : X
.UI.
Event.HOLD,
\r
- endID : X
.UI.
Event.HOLD_END,
\r
+ startID : X
UI_
Event.HOLD,
\r
+ endID : X
UI_
Event.HOLD_END,
\r
defaults : {
\r
hold_timeout : 500,
\r
hold_threshold : 1
\r
defaults : {
\r
hold_timeout : 500,
\r
hold_threshold : 1
\r
@@
-763,14
+760,14
@@
this.timerID && X_Timer_remove( this.timerID );
\r
if( Gestures.Hold.holding === true ){
\r
Gestures.Hold.holding = false;
\r
this.timerID && X_Timer_remove( this.timerID );
\r
if( Gestures.Hold.holding === true ){
\r
Gestures.Hold.holding = false;
\r
- return hammer.trigger( X
.UI.
Event.HOLD_END, e );
\r
+ return hammer.trigger( X
UI_
Event.HOLD_END, e );
\r
};
\r
break;
\r
};
\r
},
\r
_onTimer : function( e, hammer ){
\r
if( Detection.current.name === 'hold' ){
\r
};
\r
break;
\r
};
\r
},
\r
_onTimer : function( e, hammer ){
\r
if( Detection.current.name === 'hold' ){
\r
- hammer.trigger( X
.UI.
Event.HOLD, e );
\r
+ hammer.trigger( X
UI_
Event.HOLD, e );
\r
Gestures.Hold.holding = true;
\r
};
\r
}
\r
Gestures.Hold.holding = true;
\r
};
\r
}
\r
@@
-784,8
+781,8
@@
Gestures.Tap = {
\r
name : 'tap',
\r
index : 100,
\r
Gestures.Tap = {
\r
name : 'tap',
\r
index : 100,
\r
- startID : X
.UI.
Event.TAP,
\r
- endID : X
.UI.
Event.DOUBLE_TAP,
\r
+ startID : X
UI_
Event.TAP,
\r
+ endID : X
UI_
Event.DOUBLE_TAP,
\r
defaults : {
\r
tap_max_touchtime : 250,
\r
tap_max_distance : 10,
\r
defaults : {
\r
tap_max_touchtime : 250,
\r
tap_max_distance : 10,
\r
@@
-803,12
+800,12
@@
\r
// check if double tap
\r
if( prev && prev.name === 'tap' && ( e.timeStamp - prev.lastEvent.timeStamp ) < hammer.options.doubletap_interval && e.distance < hammer.options.doubletap_distance ){
\r
\r
// check if double tap
\r
if( prev && prev.name === 'tap' && ( e.timeStamp - prev.lastEvent.timeStamp ) < hammer.options.doubletap_interval && e.distance < hammer.options.doubletap_distance ){
\r
- return hammer.trigger( X
.UI.
Event.DOUBLE_TAP, e );
\r
+ return hammer.trigger( X
UI_
Event.DOUBLE_TAP, e );
\r
} else
\r
// do a single tap
\r
if( hammer.options.tap_always && Detection.current.name !== 'tap' ){ // EventFire中にalert すると mouseleave で再び呼ばれるのを防ぐ
\r
Detection.current.name = 'tap';
\r
} else
\r
// do a single tap
\r
if( hammer.options.tap_always && Detection.current.name !== 'tap' ){ // EventFire中にalert すると mouseleave で再び呼ばれるのを防ぐ
\r
Detection.current.name = 'tap';
\r
- return hammer.trigger( X
.UI.
Event.TAP, e );
\r
+ return hammer.trigger( X
UI_
Event.TAP, e );
\r
};
\r
};
\r
}
\r
};
\r
};
\r
}
\r
@@
-822,8
+819,8
@@
Gestures.Swipe = {
\r
name : 'swipe',
\r
index : 40,
\r
Gestures.Swipe = {
\r
name : 'swipe',
\r
index : 40,
\r
- startID : X
.UI.
Event.SWIP,
\r
- endID : X
.UI.
Event.SWIP_DOWN,
\r
+ startID : X
UI_
Event.SWIP,
\r
+ endID : X
UI_
Event.SWIP_DOWN,
\r
defaults : {
\r
// set 0 for unlimited, but this can conflict with transform
\r
swipe_max_touches : 1,
\r
defaults : {
\r
// set 0 for unlimited, but this can conflict with transform
\r
swipe_max_touches : 1,
\r
@@
-838,15
+835,15
@@
// or we can be already in dragging
\r
if( hammer.options.swipe_velocity < e.velocityX || hammer.options.swipe_velocity < e.velocityY ){
\r
// trigger swipe events
\r
// or we can be already in dragging
\r
if( hammer.options.swipe_velocity < e.velocityX || hammer.options.swipe_velocity < e.velocityY ){
\r
// trigger swipe events
\r
- hammer.trigger( X
.UI.
Event.SWIP, e );
\r
+ hammer.trigger( X
UI_
Event.SWIP, e );
\r
hammer.trigger(
\r
e.direction === Hammer.DIRECTION_UP ?
\r
hammer.trigger(
\r
e.direction === Hammer.DIRECTION_UP ?
\r
- X
.UI.
Event.SWIP_UP :
\r
+ X
UI_
Event.SWIP_UP :
\r
e.direction === Hammer.DIRECTION_DOWN ?
\r
e.direction === Hammer.DIRECTION_DOWN ?
\r
- X
.UI.
Event.SWIP_DOWN :
\r
+ X
UI_
Event.SWIP_DOWN :
\r
e.direction === Hammer.DIRECTION_LEFT ?
\r
e.direction === Hammer.DIRECTION_LEFT ?
\r
- X
.UI.
Event.SWIP_LEFT :
\r
- X
.UI.
Event.SWIP_RIGHT,
\r
+ X
UI_
Event.SWIP_LEFT :
\r
+ X
UI_
Event.SWIP_RIGHT,
\r
e
\r
);
\r
};
\r
e
\r
);
\r
};
\r
@@
-864,8
+861,8
@@
Gestures.Drag = {
\r
name : 'drag',
\r
index : 50,
\r
Gestures.Drag = {
\r
name : 'drag',
\r
index : 50,
\r
- startID : X
.UI.
Event.DRAG,
\r
- endID : X
.UI.
Event.DRAG_DOWN,
\r
+ startID : X
UI_
Event.DRAG,
\r
+ endID : X
UI_
Event.DRAG_DOWN,
\r
defaults : {
\r
drag_min_distance : 10,
\r
// set 0 for unlimited, but this can conflict with transform
\r
defaults : {
\r
drag_min_distance : 10,
\r
// set 0 for unlimited, but this can conflict with transform
\r
@@
-888,7
+885,7
@@
// current gesture isnt drag, but dragged is true
\r
// this means an other gesture is busy. now call dragend
\r
if( Detection.current.name !== this.name && this.triggered ){
\r
// current gesture isnt drag, but dragged is true
\r
// this means an other gesture is busy. now call dragend
\r
if( Detection.current.name !== this.name && this.triggered ){
\r
- hammer.trigger( X
.UI.
Event.DRAG_END, e );
\r
+ hammer.trigger( X
UI_
Event.DRAG_END, e );
\r
this.triggered = false;
\r
return;
\r
};
\r
this.triggered = false;
\r
return;
\r
};
\r
@@
-923,22
+920,22
@@
\r
// first time, trigger dragstart event
\r
if( !this.triggered ){
\r
\r
// first time, trigger dragstart event
\r
if( !this.triggered ){
\r
- hammer.trigger( X
.UI.
Event.DRAG_START, e );
\r
+ hammer.trigger( X
UI_
Event.DRAG_START, e );
\r
this.triggered = true;
\r
};
\r
\r
// trigger normal event
\r
this.triggered = true;
\r
};
\r
\r
// trigger normal event
\r
- hammer.trigger( X
.UI.
Event.DRAG, e );
\r
+ hammer.trigger( X
UI_
Event.DRAG, e );
\r
\r
// direction event, like dragdown
\r
hammer.trigger(
\r
e.direction === Hammer.DIRECTION_UP ?
\r
\r
// direction event, like dragdown
\r
hammer.trigger(
\r
e.direction === Hammer.DIRECTION_UP ?
\r
- X
.UI.
Event.DRAG_UP :
\r
+ X
UI_
Event.DRAG_UP :
\r
e.direction === Hammer.DIRECTION_DOWN ?
\r
e.direction === Hammer.DIRECTION_DOWN ?
\r
- X
.UI.
Event.DRAG_DOWN :
\r
+ X
UI_
Event.DRAG_DOWN :
\r
e.direction === Hammer.DIRECTION_LEFT ?
\r
e.direction === Hammer.DIRECTION_LEFT ?
\r
- X
.UI.
Event.DRAG_LEFT :
\r
- X
.UI.
Event.DRAG_RIGHT,
\r
+ X
UI_
Event.DRAG_LEFT :
\r
+ X
UI_
Event.DRAG_RIGHT,
\r
e
\r
);
\r
\r
e
\r
);
\r
\r
@@
-951,7
+948,7
@@
\r
case END:
\r
// trigger dragend
\r
\r
case END:
\r
// trigger dragend
\r
- this.triggered && hammer.trigger( X
.UI.
Event.DRAG_END, e );
\r
+ this.triggered && hammer.trigger( X
UI_
Event.DRAG_END, e );
\r
this.triggered = false;
\r
break;
\r
}
\r
this.triggered = false;
\r
break;
\r
}
\r
@@
-966,8
+963,8
@@
Gestures.Transform = {
\r
name : 'transform',
\r
index : 45,
\r
Gestures.Transform = {
\r
name : 'transform',
\r
index : 45,
\r
- startID : X
.UI.
Event.TRANSFORM,
\r
- endID : X
.UI.
Event.ROTATE,
\r
+ startID : X
UI_
Event.TRANSFORM,
\r
+ endID : X
UI_
Event.ROTATE,
\r
defaults : {
\r
// factor, no scale is 1, zoomin is to 0 and zoomout until higher then 1
\r
transform_min_scale : 0.01,
\r
defaults : {
\r
// factor, no scale is 1, zoomin is to 0 and zoomout until higher then 1
\r
transform_min_scale : 0.01,
\r
@@
-983,7
+980,7
@@
// current gesture isnt drag, but dragged is true
\r
// this means an other gesture is busy. now call dragend
\r
if( Detection.current.name !== this.name && this.triggered ){
\r
// current gesture isnt drag, but dragged is true
\r
// this means an other gesture is busy. now call dragend
\r
if( Detection.current.name !== this.name && this.triggered ){
\r
- hammer.trigger( X
.UI.
Event.TRANSFORM_END, e );
\r
+ hammer.trigger( X
UI_
Event.TRANSFORM_END, e );
\r
this.triggered = false;
\r
return;
\r
};
\r
this.triggered = false;
\r
return;
\r
};
\r
@@
-1012,26
+1009,26
@@
\r
// first time, trigger dragstart event
\r
if( !this.triggered ){
\r
\r
// first time, trigger dragstart event
\r
if( !this.triggered ){
\r
- hammer.trigger( X
.UI.
Event.TRANSFORM_START, e );
\r
+ hammer.trigger( X
UI_
Event.TRANSFORM_START, e );
\r
this.triggered = true;
\r
};
\r
\r
this.triggered = true;
\r
};
\r
\r
- hammer.trigger( X
.UI.
Event.TRANSFORM, e );
\r
+ hammer.trigger( X
UI_
Event.TRANSFORM, e );
\r
// basic transform event
\r
\r
// trigger rotate event
\r
// basic transform event
\r
\r
// trigger rotate event
\r
- hammer.options.transform_min_rotation < rotation_threshold && hammer.trigger( X
.UI.
Event.ROTATE, e );
\r
+ hammer.options.transform_min_rotation < rotation_threshold && hammer.trigger( X
UI_
Event.ROTATE, e );
\r
\r
// trigger pinch event
\r
if( scale_threshold > hammer.options.transform_min_scale ){
\r
\r
// trigger pinch event
\r
if( scale_threshold > hammer.options.transform_min_scale ){
\r
- hammer.trigger( X
.UI.
Event.PINCH, e );
\r
- hammer.trigger( e.scale < 1 ? X
.UI.Event.PINCH_IN : X.UI.
Event.PINCH_OUT, e );
\r
+ hammer.trigger( X
UI_
Event.PINCH, e );
\r
+ hammer.trigger( e.scale < 1 ? X
UI_Event.PINCH_IN : XUI_
Event.PINCH_OUT, e );
\r
};
\r
break;
\r
\r
case END:
\r
// trigger dragend
\r
};
\r
break;
\r
\r
case END:
\r
// trigger dragend
\r
- this.triggered && hammer.trigger( X
.UI.
Event.TRANSFORM_END, e );
\r
+ this.triggered && hammer.trigger( X
UI_
Event.TRANSFORM_END, e );
\r
this.triggered = false;
\r
break;
\r
};
\r
this.triggered = false;
\r
break;
\r
};
\r
@@
-1081,5
+1078,3
@@
e.eventType === END && hammer.trigger( this.name, e );
\r
}
\r
};
\r
e.eventType === END && hammer.trigger( this.name, e );
\r
}
\r
};
\r
-
\r
-})( Math, window, document );
\ No newline at end of file