Skip to content

Commit

Permalink
all code lintered properly along with the dot config files
Browse files Browse the repository at this point in the history
arjunkathuria authored and arschmitz committed Sep 30, 2016
1 parent e22a057 commit 103a02f
Showing 25 changed files with 76 additions and 95 deletions.
4 changes: 2 additions & 2 deletions .jscsrc
Original file line number Diff line number Diff line change
@@ -86,10 +86,10 @@
"disallowSpacesInsideObjectBrackets": "all",
"disallowSpacesInsideArrayBrackets": "all",
"disallowSpacesInsideParentheses": true,
"validateJSDoc": {
"jsDoc": {
"checkParamNames": true,
"requireParamTypes": true
},
"disallowMultipleLineBreaks": true,
"disallowNewlineBeforeBlockStatements": true
}
}
3 changes: 2 additions & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
@@ -5,10 +5,11 @@
"expr": true,
"maxerr": 100,
"freeze": true,
"esversion":6,
"newcap": true,
"node": true,
"quotmark": "single",
"strict": true,
"strict": false,
"sub": true,
"trailing": true,
"undef": true,
4 changes: 2 additions & 2 deletions src/hammer.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {ifUndefined} from './utilsjs/ifUndefined';
import {TOUCH_ACTION_COMPUTE} from './touchactionjs/touchactionConsts';
import {DIRECTION_HORIZONTAL} from './inputjs/inputConsts'
import {DIRECTION_HORIZONTAL} from './inputjs/inputConsts';
import {RotateRecognizer} from './recognizers/rotate';
import {PinchRecognizer} from './recognizers/pinch';
import {SwipeRecognizer} from './recognizers/swipe';
@@ -138,4 +138,4 @@ Hammer.defaults = {
}
};

export {Hammer};
export {Hammer};
3 changes: 2 additions & 1 deletion src/input/mouse.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {INPUT_START,INPUT_MOVE,INPUT_END,INPUT_TYPE_MOUSE} from '../inputjs/inputConsts'
import {INPUT_START,INPUT_MOVE,INPUT_END,INPUT_TYPE_MOUSE} from '../inputjs/inputConsts';
import {Input} from '../inputjs/inputConstructor';
import {inherit} from '../utilsjs/inherit';

var MOUSE_INPUT_MAP = {
mousedown: INPUT_START,
mousemove: INPUT_MOVE,
7 changes: 4 additions & 3 deletions src/input/pointerevent.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import {INPUT_START,INPUT_END,INPUT_CANCEL,INPUT_MOVE,INPUT_TYPE_TOUCH,INPUT_TYPE_MOUSE,INPUT_TYPE_PEN,INPUT_TYPE_KINECT} from '../inputjs/inputConsts'
import {INPUT_START,INPUT_END,INPUT_CANCEL,INPUT_MOVE,INPUT_TYPE_TOUCH,
INPUT_TYPE_MOUSE,INPUT_TYPE_PEN,INPUT_TYPE_KINECT} from '../inputjs/inputConsts';
import {Input} from '../inputjs/inputConstructor';
import {inherit} from '../utilsjs/inherit';
import {inArray} from '../utilsjs/inArray'
import {inArray} from '../utilsjs/inArray';

var POINTER_INPUT_MAP = {
pointerdown: INPUT_START,
@@ -92,4 +93,4 @@ inherit(PointerEventInput, Input, {
}
});

export {PointerEventInput}
export {PointerEventInput};
13 changes: 7 additions & 6 deletions src/input/singletouch.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import {INPUT_START,INPUT_MOVE,INPUT_END,INPUT_CANCEL,INPUT_TYPE_TOUCH} from '../inputjs/inputConsts'
import {Input} from '../inputjs/inputConstructor'
import {inherit} from '../utilsjs/inherit'
import {toArray} from '../utilsjs/toArray'
import {uniqueArray} from '../utilsjs/uniqueArray'
import {INPUT_START,INPUT_MOVE,INPUT_END,INPUT_CANCEL,INPUT_TYPE_TOUCH} from '../inputjs/inputConsts';
import {Input} from '../inputjs/inputConstructor';
import {inherit} from '../utilsjs/inherit';
import {toArray} from '../utilsjs/toArray';
import {uniqueArray} from '../utilsjs/uniqueArray';

var SINGLE_TOUCH_INPUT_MAP = {
touchstart: INPUT_START,
touchmove: INPUT_MOVE,
@@ -72,4 +73,4 @@ function normalizeSingleTouches(ev, type) {
return [all, changed];
}

export {SingleTouchInput}
export {SingleTouchInput};
6 changes: 3 additions & 3 deletions src/input/touch.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {INPUT_START,INPUT_MOVE,INPUT_END,INPUT_CANCEL,INPUT_TYPE_TOUCH} from '../inputjs/inputConsts'
import {Input} from '../inputjs/inputConstructor'
import {INPUT_START,INPUT_MOVE,INPUT_END,INPUT_CANCEL,INPUT_TYPE_TOUCH} from '../inputjs/inputConsts';
import {Input} from '../inputjs/inputConstructor';
import {inherit} from '../utilsjs/inherit';
import {toArray} from '../utilsjs/toArray';
import {hasParent} from '../utilsjs/hasParent';
@@ -104,4 +104,4 @@ function getTouches(ev, type) {
];
}

export {TouchInput};
export {TouchInput};
6 changes: 3 additions & 3 deletions src/input/touchmouse.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {Input} from '../inputjs/inputConstructor'
import {Input} from '../inputjs/inputConstructor';
import {inherit} from '../utilsjs/inherit';
import {bindFn} from '../utilsjs/bindFn';
import {TouchInput} from './touch';
import {MouseInput} from './mouse';
import {INPUT_START,INPUT_END,INPUT_CANCEL,INPUT_TYPE_TOUCH,INPUT_TYPE_MOUSE} from '../inputjs/inputConsts'
import {INPUT_START,INPUT_END,INPUT_CANCEL,INPUT_TYPE_TOUCH,INPUT_TYPE_MOUSE} from '../inputjs/inputConsts';

/**
* Combined touch and mouse input
@@ -101,4 +101,4 @@ function isSyntheticEvent(eventData) {
return false;
}

export {TouchMouseInput}
export {TouchMouseInput};
11 changes: 7 additions & 4 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import {Hammer} from './hammer';
import {assign} from './utilsjs/assign';
import {INPUT_START,INPUT_MOVE,INPUT_END,INPUT_CANCEL} from './inputjs/inputConsts';
import {STATE_POSSIBLE,STATE_BEGAN,STATE_CHANGED,STATE_ENDED,STATE_RECOGNIZED,STATE_CANCELLED,STATE_FAILED} from './recognizerjs/recognizerConsts';
import {DIRECTION_NONE,DIRECTION_LEFT,DIRECTION_RIGHT,DIRECTION_UP,DIRECTION_DOWN,DIRECTION_HORIZONTAL,DIRECTION_VERTICAL,DIRECTION_ALL} from './inputjs/inputConsts';
import {STATE_POSSIBLE,STATE_BEGAN,STATE_CHANGED,STATE_ENDED,STATE_RECOGNIZED,
STATE_CANCELLED,STATE_FAILED} from './recognizerjs/recognizerConsts';
import {DIRECTION_NONE,DIRECTION_LEFT,DIRECTION_RIGHT,DIRECTION_UP,DIRECTION_DOWN,
DIRECTION_HORIZONTAL,DIRECTION_VERTICAL,DIRECTION_ALL} from './inputjs/inputConsts';

import {Manager} from './manager';
import {Input} from './inputjs/inputConstructor';
import {TouchAction} from './touchactionjs/touchActionConstructor';
@@ -30,7 +33,6 @@ import {inherit} from './utilsjs/inherit';
import {bindFn} from './utilsjs/bindFn';
import {prefixed} from './utilsjs/prefixed';


// this prevents errors when Hammer is loaded in the presence of an AMD
// style loader but by script tag, not by the loader.

@@ -86,6 +88,7 @@ assign(Hammer, {
bindFn: bindFn,
prefixed: prefixed
});

var freeGlobal = (typeof window !== 'undefined' ? window : (typeof self !== 'undefined' ? self : {})); // jshint ignore:line
freeGlobal.Hammer = Hammer;

@@ -97,4 +100,4 @@ if (typeof define === 'function' && define.amd) {
module.exports = Hammer;
} else {
window[exportName] = Hammer;
}
}
5 changes: 2 additions & 3 deletions src/manager.js
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@ import {prefixed} from './utilsjs/prefixed';
import {Recognizer} from './recognizerjs/recognizerConstructor';
import {STATE_BEGAN,STATE_ENDED,STATE_CHANGED,STATE_RECOGNIZED} from './recognizerjs/recognizerConsts';


var STOP = 1;
var FORCED_STOP = 2;

@@ -114,7 +113,7 @@ Manager.prototype = {
// that is being recognized.
// 3. allow if the recognizer is allowed to run simultaneous with the current recognized recognizer.
// this can be setup with the `recognizeWith()` method on the recognizer.
if (session.stopped !== FORCED_STOP && ( // 1
if (session.stopped !== FORCED_STOP && (// 1
!curRecognizer || recognizer == curRecognizer || // 2
recognizer.canRecognizeWith(curRecognizer))) { // 3
recognizer.recognize(inputData);
@@ -324,4 +323,4 @@ function triggerDomEvent(event, data) {
data.target.dispatchEvent(gestureEvent);
}

export {Manager}
export {Manager};
8 changes: 3 additions & 5 deletions src/recognizerjs/directionStr.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/**
* Created by arjun on 25/05/16.
*/
import {DIRECTION_LEFT,DIRECTION_RIGHT,DIRECTION_UP,DIRECTION_DOWN} from '../inputjs/inputConsts'
import {DIRECTION_LEFT,DIRECTION_RIGHT,DIRECTION_UP,DIRECTION_DOWN} from '../inputjs/inputConsts';

/**
* direction cons to string
* @param {constant} direction
@@ -20,4 +18,4 @@ function directionStr(direction) {
return '';
}

export {directionStr}
export {directionStr};
7 changes: 1 addition & 6 deletions src/recognizerjs/getRecognizerByNameIfManager.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
/**
* Created by arjun on 25/05/16.
*/


/**
* get a recognizer by name if it is bound to a manager
* @param {Recognizer|String} otherRecognizer
@@ -17,4 +12,4 @@ function getRecognizerByNameIfManager(otherRecognizer, recognizer) {
return otherRecognizer;
}

export {getRecognizerByNameIfManager};
export {getRecognizerByNameIfManager};
12 changes: 5 additions & 7 deletions src/recognizerjs/recognizerConstructor.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
/**
* Created by arjun on 25/05/16.
*/
import {STATE_POSSIBLE,STATE_ENDED,STATE_FAILED,STATE_RECOGNIZED,STATE_CANCELLED,STATE_BEGAN,STATE_CHANGED} from './recognizerConsts'
import {STATE_POSSIBLE,STATE_ENDED,STATE_FAILED,STATE_RECOGNIZED,STATE_CANCELLED,
STATE_BEGAN,STATE_CHANGED} from './recognizerConsts';
import {assign} from '../utilsjs/assign';
import {uniqueId} from '../utilsjs/uniqueId';
import {ifUndefined} from '../utilsjs/ifUndefined';
import {invokeArrayArg} from '../utilsjs/invokeArrayArg';
import {inArray} from '../utilsjs/inArray';
import {boolOrFn} from '../utilsjs/boolOrFn';
import {getRecognizerByNameIfManager} from './getRecognizerByNameIfManager'
import {stateStr} from './stateStr'
import {getRecognizerByNameIfManager} from './getRecognizerByNameIfManager';
import {stateStr} from './stateStr';
/**
* Recognizer flow explained; *
* All recognizers have the initial state of POSSIBLE when a input session starts.
@@ -281,4 +279,4 @@ Recognizer.prototype = {
reset: function() { }
};

export {Recognizer} ;
export {Recognizer};
7 changes: 1 addition & 6 deletions src/recognizerjs/recognizerConsts.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
/**
* Created by arjun on 25/05/16.
*/


var STATE_POSSIBLE = 1;
var STATE_BEGAN = 2;
var STATE_CHANGED = 4;
@@ -11,4 +6,4 @@ var STATE_RECOGNIZED = STATE_ENDED;
var STATE_CANCELLED = 16;
var STATE_FAILED = 32;

export {STATE_POSSIBLE,STATE_BEGAN,STATE_CHANGED,STATE_ENDED,STATE_RECOGNIZED,STATE_CANCELLED,STATE_FAILED};
export {STATE_POSSIBLE,STATE_BEGAN,STATE_CHANGED,STATE_ENDED,STATE_RECOGNIZED,STATE_CANCELLED,STATE_FAILED};
8 changes: 3 additions & 5 deletions src/recognizerjs/stateStr.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/**
* Created by arjun on 25/05/16.
*/
import {STATE_CANCELLED,STATE_ENDED,STATE_CHANGED,STATE_BEGAN} from './recognizerConsts'
import {STATE_CANCELLED,STATE_ENDED,STATE_CHANGED,STATE_BEGAN} from './recognizerConsts';

/**
* get a usable string, used as event postfix
* @param {constant} state
@@ -20,4 +18,4 @@ function stateStr(state) {
return '';
}

export {stateStr}
export {stateStr};
4 changes: 2 additions & 2 deletions src/recognizers/attribute.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {inherit} from '../utilsjs/inherit';
import {Recognizer} from '../recognizerjs/recognizerConstructor'
import {Recognizer} from '../recognizerjs/recognizerConstructor';
import {STATE_BEGAN,STATE_CHANGED,STATE_CANCELLED,STATE_ENDED,STATE_FAILED} from '../recognizerjs/recognizerConsts';
import {INPUT_CANCEL,INPUT_END} from '../inputjs/inputConsts';

@@ -64,4 +64,4 @@ inherit(AttrRecognizer, Recognizer, {
}
});

export {AttrRecognizer}
export {AttrRecognizer};
14 changes: 7 additions & 7 deletions src/recognizers/pan.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {AttrRecognizer} from './attribute'
import {inherit} from '../utilsjs/inherit'
import {AttrRecognizer} from './attribute';
import {inherit} from '../utilsjs/inherit';
import {DIRECTION_ALL,DIRECTION_HORIZONTAL,DIRECTION_VERTICAL,DIRECTION_NONE,DIRECTION_UP,DIRECTION_DOWN,
DIRECTION_LEFT,DIRECTION_RIGHT} from '../inputjs/inputConsts'
import {STATE_BEGAN} from '../recognizerjs/recognizerConsts'
import {TOUCH_ACTION_PAN_X,TOUCH_ACTION_PAN_Y} from '../touchactionjs/touchactionConsts'
import {directionStr} from '../recognizerjs/directionStr'
DIRECTION_LEFT,DIRECTION_RIGHT} from '../inputjs/inputConsts';
import {STATE_BEGAN} from '../recognizerjs/recognizerConsts';
import {TOUCH_ACTION_PAN_X,TOUCH_ACTION_PAN_Y} from '../touchactionjs/touchactionConsts';
import {directionStr} from '../recognizerjs/directionStr';

/**
* Pan
@@ -86,4 +86,4 @@ inherit(PanRecognizer, AttrRecognizer, {
}
});

export {PanRecognizer};
export {PanRecognizer};
5 changes: 3 additions & 2 deletions src/recognizers/pinch.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import {AttrRecognizer} from './attribute';
import {inherit} from '../utilsjs/inherit';
import {TOUCH_ACTION_NONE} from '../touchactionjs/touchactionConsts';
import {STATE_BEGAN} from '../recognizerjs/recognizerConsts'
import {STATE_BEGAN} from '../recognizerjs/recognizerConsts';

/**
* Pinch
* Recognized when two or more pointers are moving toward (zoom-in) or away from each other (zoom-out).
@@ -41,4 +42,4 @@ inherit(PinchRecognizer, AttrRecognizer, {
}
});

export {PinchRecognizer};
export {PinchRecognizer};
4 changes: 2 additions & 2 deletions src/recognizers/press.js
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import {inherit} from '../utilsjs/inherit';
import {now} from '../utilsjs/utilsConsts';
import {setTimeoutContext} from '../utilsjs/setTimeoutContext';
import {TOUCH_ACTION_AUTO} from '../touchactionjs/touchactionConsts';
import {INPUT_START,INPUT_END,INPUT_CANCEL} from '../inputjs/inputConsts'
import {INPUT_START,INPUT_END,INPUT_CANCEL} from '../inputjs/inputConsts';

/**
* Press
@@ -77,4 +77,4 @@ inherit(PressRecognizer, Recognizer, {
}
});

export {PressRecognizer};
export {PressRecognizer};
5 changes: 3 additions & 2 deletions src/recognizers/rotate.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import {AttrRecognizer} from './attribute';
import {inherit} from '../utilsjs/inherit';
import {TOUCH_ACTION_NONE} from '../touchactionjs/touchactionConsts';
import {STATE_BEGAN} from '../recognizerjs/recognizerConsts'
import {STATE_BEGAN} from '../recognizerjs/recognizerConsts';

/**
* Rotate
* Recognized when two or more pointer are moving in a circular motion.
@@ -33,4 +34,4 @@ inherit(RotateRecognizer, AttrRecognizer, {
}
});

export {RotateRecognizer};
export {RotateRecognizer};
5 changes: 3 additions & 2 deletions src/recognizers/tap.js
Original file line number Diff line number Diff line change
@@ -3,8 +3,9 @@ import {setTimeoutContext} from '../utilsjs/setTimeoutContext';
import {Recognizer} from '../recognizerjs/recognizerConstructor';
import {TOUCH_ACTION_MANIPULATION} from '../touchactionjs/touchactionConsts';
import {INPUT_START,INPUT_END} from '../inputjs/inputConsts';
import {STATE_RECOGNIZED,STATE_BEGAN,STATE_FAILED} from '../recognizerjs/recognizerConsts'
import {STATE_RECOGNIZED,STATE_BEGAN,STATE_FAILED} from '../recognizerjs/recognizerConsts';
import {getDistance} from '../inputjs/getDistance';

/**
* A tap is ecognized when the pointer is doing a small tap/click. Multiple taps are recognized if they occur
* between the given interval and position. The delay option can be used to recognize multi-taps without firing
@@ -120,4 +121,4 @@ inherit(TapRecognizer, Recognizer, {
}
});

export {TapRecognizer};
export {TapRecognizer};
Loading

0 comments on commit 103a02f

Please sign in to comment.