ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prefer single line assignment to 80 character limit

Browse Source
This commit is contained in:
Tim Schaub
2016-01-09 12:16:11 -07:00
parent 59a66c7aaa
commit 3cf8618fc7
105 changed files with 445 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ol/pointer/mousesource.js
View File

@@ -111,8 +111,7 @@ ol.pointer.MouseSource.DEDUP_DIST = 25;
* @param {goog.events.BrowserEvent} inEvent The in event.
* @return {boolean} True, if the event was generated by a touch.
*/
ol.pointer.MouseSource.prototype.isEventSimulatedFromTouch_ =
function(inEvent) {
ol.pointer.MouseSource.prototype.isEventSimulatedFromTouch_ = function(inEvent) {
var lts = this.lastTouches;
var x = inEvent.clientX, y = inEvent.clientY;
for (var i = 0, l = lts.length, t; i < l && (t = lts[i]); i++) {

51
src/ol/pointer/pointereventhandler.js
View File

@@ -112,8 +112,7 @@ ol.pointer.PointerEventHandler.prototype.registerSources = function() {
* @param {string} name A name for the event source
* @param {ol.pointer.EventSource} source The source event.
*/
ol.pointer.PointerEventHandler.prototype.registerSource =
function(name, source) {
ol.pointer.PointerEventHandler.prototype.registerSource = function(name, source) {
var s = source;
var newEvents = s.getEvents();
@@ -207,8 +206,7 @@ ol.pointer.PointerEventHandler.prototype.removeEvents_ = function(events) {
* @return {Object} An object containing shallow copies of
* `inEvent`'s properties.
*/
ol.pointer.PointerEventHandler.prototype.cloneEvent =
function(browserEvent, inEvent) {
ol.pointer.PointerEventHandler.prototype.cloneEvent = function(browserEvent, inEvent) {
var eventCopy = {}, p;
for (var i = 0, ii = ol.pointer.CLONE_PROPS.length; i < ii; i++) {
p = ol.pointer.CLONE_PROPS[i][0];
@@ -230,8 +228,7 @@ ol.pointer.PointerEventHandler.prototype.cloneEvent =
* @param {Object} pointerEventData Pointer event data.
* @param {goog.events.BrowserEvent} browserEvent The event.
*/
ol.pointer.PointerEventHandler.prototype.down =
function(pointerEventData, browserEvent) {
ol.pointer.PointerEventHandler.prototype.down = function(pointerEventData, browserEvent) {
this.fireEvent(ol.pointer.EventType.POINTERDOWN,
pointerEventData, browserEvent);
};
@@ -242,8 +239,7 @@ ol.pointer.PointerEventHandler.prototype.down =
* @param {Object} pointerEventData Pointer event data.
* @param {goog.events.BrowserEvent} browserEvent The event.
*/
ol.pointer.PointerEventHandler.prototype.move =
function(pointerEventData, browserEvent) {
ol.pointer.PointerEventHandler.prototype.move = function(pointerEventData, browserEvent) {
this.fireEvent(ol.pointer.EventType.POINTERMOVE,
pointerEventData, browserEvent);
};
@@ -254,8 +250,7 @@ ol.pointer.PointerEventHandler.prototype.move =
* @param {Object} pointerEventData Pointer event data.
* @param {goog.events.BrowserEvent} browserEvent The event.
*/
ol.pointer.PointerEventHandler.prototype.up =
function(pointerEventData, browserEvent) {
ol.pointer.PointerEventHandler.prototype.up = function(pointerEventData, browserEvent) {
this.fireEvent(ol.pointer.EventType.POINTERUP,
pointerEventData, browserEvent);
};
@@ -266,8 +261,7 @@ ol.pointer.PointerEventHandler.prototype.up =
* @param {Object} pointerEventData Pointer event data.
* @param {goog.events.BrowserEvent} browserEvent The event.
*/
ol.pointer.PointerEventHandler.prototype.enter =
function(pointerEventData, browserEvent) {
ol.pointer.PointerEventHandler.prototype.enter = function(pointerEventData, browserEvent) {
pointerEventData.bubbles = false;
this.fireEvent(ol.pointer.EventType.POINTERENTER,
pointerEventData, browserEvent);
@@ -279,8 +273,7 @@ ol.pointer.PointerEventHandler.prototype.enter =
* @param {Object} pointerEventData Pointer event data.
* @param {goog.events.BrowserEvent} browserEvent The event.
*/
ol.pointer.PointerEventHandler.prototype.leave =
function(pointerEventData, browserEvent) {
ol.pointer.PointerEventHandler.prototype.leave = function(pointerEventData, browserEvent) {
pointerEventData.bubbles = false;
this.fireEvent(ol.pointer.EventType.POINTERLEAVE,
pointerEventData, browserEvent);
@@ -292,8 +285,7 @@ ol.pointer.PointerEventHandler.prototype.leave =
* @param {Object} pointerEventData Pointer event data.
* @param {goog.events.BrowserEvent} browserEvent The event.
*/
ol.pointer.PointerEventHandler.prototype.over =
function(pointerEventData, browserEvent) {
ol.pointer.PointerEventHandler.prototype.over = function(pointerEventData, browserEvent) {
pointerEventData.bubbles = true;
this.fireEvent(ol.pointer.EventType.POINTEROVER,
pointerEventData, browserEvent);
@@ -305,8 +297,7 @@ ol.pointer.PointerEventHandler.prototype.over =
* @param {Object} pointerEventData Pointer event data.
* @param {goog.events.BrowserEvent} browserEvent The event.
*/
ol.pointer.PointerEventHandler.prototype.out =
function(pointerEventData, browserEvent) {
ol.pointer.PointerEventHandler.prototype.out = function(pointerEventData, browserEvent) {
pointerEventData.bubbles = true;
this.fireEvent(ol.pointer.EventType.POINTEROUT,
pointerEventData, browserEvent);
@@ -318,8 +309,7 @@ ol.pointer.PointerEventHandler.prototype.out =
* @param {Object} pointerEventData Pointer event data.
* @param {goog.events.BrowserEvent} browserEvent The event.
*/
ol.pointer.PointerEventHandler.prototype.cancel =
function(pointerEventData, browserEvent) {
ol.pointer.PointerEventHandler.prototype.cancel = function(pointerEventData, browserEvent) {
this.fireEvent(ol.pointer.EventType.POINTERCANCEL,
pointerEventData, browserEvent);
};
@@ -330,8 +320,7 @@ ol.pointer.PointerEventHandler.prototype.cancel =
* @param {Object} pointerEventData Pointer event data.
* @param {goog.events.BrowserEvent} browserEvent The event.
*/
ol.pointer.PointerEventHandler.prototype.leaveOut =
function(pointerEventData, browserEvent) {
ol.pointer.PointerEventHandler.prototype.leaveOut = function(pointerEventData, browserEvent) {
this.out(pointerEventData, browserEvent);
if (!this.contains_(
pointerEventData.target,
@@ -346,8 +335,7 @@ ol.pointer.PointerEventHandler.prototype.leaveOut =
* @param {Object} pointerEventData Pointer event data.
* @param {goog.events.BrowserEvent} browserEvent The event.
*/
ol.pointer.PointerEventHandler.prototype.enterOver =
function(pointerEventData, browserEvent) {
ol.pointer.PointerEventHandler.prototype.enterOver = function(pointerEventData, browserEvent) {
this.over(pointerEventData, browserEvent);
if (!this.contains_(
pointerEventData.target,
@@ -364,8 +352,7 @@ ol.pointer.PointerEventHandler.prototype.enterOver =
* @return {boolean} Returns true if the container element
* contains the other element.
*/
ol.pointer.PointerEventHandler.prototype.contains_ =
function(container, contained) {
ol.pointer.PointerEventHandler.prototype.contains_ = function(container, contained) {
if (!contained) {
return false;
}
@@ -383,8 +370,7 @@ ol.pointer.PointerEventHandler.prototype.contains_ =
* @param {goog.events.BrowserEvent} browserEvent The event.
* @return {ol.pointer.PointerEvent} A PointerEvent of type `inType`.
*/
ol.pointer.PointerEventHandler.prototype.makeEvent =
function(inType, pointerEventData, browserEvent) {
ol.pointer.PointerEventHandler.prototype.makeEvent = function(inType, pointerEventData, browserEvent) {
return new ol.pointer.PointerEvent(inType, browserEvent, pointerEventData);
};
@@ -395,8 +381,7 @@ ol.pointer.PointerEventHandler.prototype.makeEvent =
* @param {Object} pointerEventData Pointer event data.
* @param {goog.events.BrowserEvent} browserEvent The event.
*/
ol.pointer.PointerEventHandler.prototype.fireEvent =
function(inType, pointerEventData, browserEvent) {
ol.pointer.PointerEventHandler.prototype.fireEvent = function(inType, pointerEventData, browserEvent) {
var e = this.makeEvent(inType, pointerEventData, browserEvent);
this.dispatchEvent(e);
};
@@ -407,8 +392,7 @@ ol.pointer.PointerEventHandler.prototype.fireEvent =
* and dispatches this event.
* @param {goog.events.BrowserEvent} nativeEvent A platform event with a target.
*/
ol.pointer.PointerEventHandler.prototype.fireNativeEvent =
function(nativeEvent) {
ol.pointer.PointerEventHandler.prototype.fireNativeEvent = function(nativeEvent) {
var e = this.makeEvent(nativeEvent.type, nativeEvent.getBrowserEvent(),
nativeEvent);
this.dispatchEvent(e);
@@ -422,8 +406,7 @@ ol.pointer.PointerEventHandler.prototype.fireNativeEvent =
* @param {goog.events.BrowserEvent} browserEvent The event.
* @return {ol.pointer.PointerEvent} The wrapped event.
*/
ol.pointer.PointerEventHandler.prototype.wrapMouseEvent =
function(eventType, browserEvent) {
ol.pointer.PointerEventHandler.prototype.wrapMouseEvent = function(eventType, browserEvent) {
var pointerEvent = this.makeEvent(
eventType,
ol.pointer.MouseSource.prepareEvent(browserEvent, this),

12
src/ol/pointer/touchsource.js
View File

@@ -181,8 +181,7 @@ ol.pointer.TouchSource.prototype.cancelResetClickCount_ = function() {
* @param {Touch} inTouch Touch event
* @return {Object} A pointer object.
*/
ol.pointer.TouchSource.prototype.touchToPointer_ =
function(browserEvent, inTouch) {
ol.pointer.TouchSource.prototype.touchToPointer_ = function(browserEvent, inTouch) {
var e = this.dispatcher.cloneEvent(browserEvent, inTouch);
// Spec specifies that pointerId 1 is reserved for Mouse.
// Touch identifiers can start at 0.
@@ -217,8 +216,7 @@ ol.pointer.TouchSource.prototype.touchToPointer_ =
* @param {goog.events.BrowserEvent} inEvent Touch event
* @param {function(goog.events.BrowserEvent, Object)} inFunction In function.
*/
ol.pointer.TouchSource.prototype.processTouches_ =
function(inEvent, inFunction) {
ol.pointer.TouchSource.prototype.processTouches_ = function(inEvent, inFunction) {
var touches = Array.prototype.slice.call(
inEvent.getBrowserEvent().changedTouches);
var count = touches.length;
@@ -340,8 +338,7 @@ ol.pointer.TouchSource.prototype.touchmove = function(inEvent) {
* @param {goog.events.BrowserEvent} browserEvent The event.
* @param {Object} inPointer The in pointer.
*/
ol.pointer.TouchSource.prototype.moveOverOut_ =
function(browserEvent, inPointer) {
ol.pointer.TouchSource.prototype.moveOverOut_ = function(browserEvent, inPointer) {
var event = inPointer;
var pointer = this.pointerMap[event.pointerId];
// a finger drifted off the screen, ignore it
@@ -412,8 +409,7 @@ ol.pointer.TouchSource.prototype.touchcancel = function(inEvent) {
* @param {goog.events.BrowserEvent} browserEvent The event.
* @param {Object} inPointer The in pointer.
*/
ol.pointer.TouchSource.prototype.cancelOut_ =
function(browserEvent, inPointer) {
ol.pointer.TouchSource.prototype.cancelOut_ = function(browserEvent, inPointer) {
this.dispatcher.cancel(inPointer, browserEvent);
this.dispatcher.out(inPointer, browserEvent);
this.dispatcher.leave(inPointer, browserEvent);