dom-event

src/View.ts

@@ -1,7 +1,8 @@
 import * as moment from 'moment'
-import { parseFieldSpecs, isPrimaryMouseButton } from './util'
+import { parseFieldSpecs } from './util'
 import { assignTo } from './util/object'
 import { elementClosest } from './util/dom'
+import { isPrimaryMouseButton } from './util/dom-event'
 import RenderQueue from './common/RenderQueue'
 import Calendar from './Calendar'
 import DateProfileGenerator from './DateProfileGenerator'

src/common/DragListener.ts

@@ -1,14 +1,16 @@
 import {
   firstDefined,
   preventSelection,
+  allowSelection,
+  debounce
+} from '../util'
+import {
   getEvIsTouch,
   getEvX,
   getEvY,
   isPrimaryMouseButton,
-  allowSelection,
-  preventDefault,
-  debounce
-} from '../util'
+  preventDefault
+} from '../util/dom-event'
 import { getScrollParent } from '../util/dom-geom'
 import { default as ListenerMixin, ListenerInterface } from './ListenerMixin'
 import GlobalEmitter from './GlobalEmitter'

src/common/HitDragListener.ts

@@ -1,11 +1,13 @@
 import {
-  getEvX,
-  getEvY,
   constrainPoint,
   intersectRects,
   getRectCenter,
   diffPoints
 } from '../util'
+import {
+  getEvX,
+  getEvY,
+} from '../util/dom-event'
 import { default as DragListener, DragListenerOptions } from './DragListener'
 
 

src/common/MouseFollower.ts

@@ -3,7 +3,7 @@ import {
   getEvY,
   getEvX,
   getEvIsTouch
-} from '../util'
+} from '../util/dom-event'
 import { removeElement } from '../util/dom'
 import { default as ListenerMixin, ListenerInterface } from './ListenerMixin'
 

src/component/InteractiveDateComponent.ts

@@ -1,5 +1,6 @@
 import * as moment from 'moment'
-import { getEvIsTouch, diffByUnit, diffDayTime } from '../util'
+import { diffByUnit, diffDayTime } from '../util'
+import { getEvIsTouch } from '../util/dom-event'
 import { listenBySelector, listenToHoverBySelector, elementClosest } from '../util/dom'
 import DateComponent from './DateComponent'
 import GlobalEmitter from '../common/GlobalEmitter'

src/exports.ts

@@ -20,7 +20,6 @@ export {
   htmlEscape,
   cssToStr,
   capitaliseFirstLetter,
-  preventDefault,
   parseFieldSpecs,
   compareByFieldSpecs,
   compareByFieldSpec,
@@ -58,6 +57,10 @@ export {
   whenTransitionDone
 } from './util/dom'
 
+export {
+  preventDefault
+} from './util/dom-event'
+
 export {
   getInnerRect,
   getEdges

src/util.ts

@@ -1,5 +1,6 @@
 import * as moment from 'moment'
 import { applyStyle, computeHeightAndMargins } from './util/dom'
+import { preventDefault } from './util/dom-event'
 
 
 /* FullCalendar-specific DOM Utilities
@@ -159,47 +160,10 @@ export function subtractInnerElHeight(outerEl: HTMLElement, innerEl: HTMLElement
 }
 
 
-/* Mouse / Touch Utilities
+/* Selection
 ----------------------------------------------------------------------------------------------------------------------*/
 
 
-// Returns a boolean whether this was a left mouse click and no ctrl key (which means right click on Mac)
-export function isPrimaryMouseButton(ev: MouseEvent) {
-  return ev.button === 0 && !ev.ctrlKey
-}
-
-
-export function getEvX(ev: UIEvent) {
-  let touches = (ev as TouchEvent).touches
-
-  // on mobile FF, pageX for touch events is present, but incorrect,
-  // so, look at touch coordinates first.
-  if (touches && touches.length) {
-    return touches[0].pageX
-  }
-
-  return (ev as MouseEvent).pageX
-}
-
-
-export function getEvY(ev) {
-  let touches = (ev as TouchEvent).touches
-
-  // on mobile FF, pageX for touch events is present, but incorrect,
-  // so, look at touch coordinates first.
-  if (touches && touches.length) {
-    return touches[0].pageY
-  }
-
-  return (ev as MouseEvent).pageY
-}
-
-
-export function getEvIsTouch(ev) {
-  return /^touch/.test(ev.type)
-}
-
-
 export function preventSelection(el: HTMLElement) {
   el.classList.add('fc-unselectable')
   el.addEventListener('selectstart', preventDefault)
@@ -212,11 +176,6 @@ export function allowSelection(el: HTMLElement) {
 }
 
 
-// Stops a mouse/touch event from doing it's native browser action
-export function preventDefault(ev) {
-  ev.preventDefault()
-}
-
 
 /* General Geometry Utils
 ----------------------------------------------------------------------------------------------------------------------*/

src/util/dom-event.ts

@@ -0,0 +1,42 @@
+
+// Returns a boolean whether this was a left mouse click and no ctrl key (which means right click on Mac)
+export function isPrimaryMouseButton(ev: MouseEvent) {
+  return ev.button === 0 && !ev.ctrlKey
+}
+
+
+export function getEvX(ev: UIEvent) {
+  let touches = (ev as TouchEvent).touches
+
+  // on mobile FF, pageX for touch events is present, but incorrect,
+  // so, look at touch coordinates first.
+  if (touches && touches.length) {
+    return touches[0].pageX
+  }
+
+  return (ev as MouseEvent).pageX
+}
+
+
+export function getEvY(ev) {
+  let touches = (ev as TouchEvent).touches
+
+  // on mobile FF, pageX for touch events is present, but incorrect,
+  // so, look at touch coordinates first.
+  if (touches && touches.length) {
+    return touches[0].pageY
+  }
+
+  return (ev as MouseEvent).pageY
+}
+
+
+export function getEvIsTouch(ev) {
+  return /^touch/.test(ev.type)
+}
+
+
+// Stops a mouse/touch event from doing it's native browser action
+export function preventDefault(ev) {
+  ev.preventDefault()
+}