util/misc

src/Calendar.ts

@@ -1,5 +1,5 @@
 import * as moment from 'moment'
-import { capitaliseFirstLetter, debounce } from './util'
+import { capitaliseFirstLetter, debounce } from './util/misc'
 import { listenBySelector, createElement, removeElement, applyStyle, prependToElement, computeHeightAndMargins } from './util/dom'
 import { globalDefaults, englishDefaults, rtlDefaults } from './options'
 import Iterator from './common/Iterator'

src/OptionsManager.ts

@@ -1,5 +1,5 @@
-import { firstDefined } from './util'
 import { assignTo } from './util/object'
+import { firstDefined } from './util/misc'
 import { globalDefaults, rtlDefaults, mergeOptions } from './options'
 import { localeOptionHash, populateInstanceComputableOptions } from './locale'
 import Model from './common/Model'

src/View.ts

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

src/agenda/AgendaView.ts

@@ -1,13 +1,13 @@
 import * as moment from 'moment'
+import { htmlEscape } from '../util/html'
+import { copyOwnProps } from '../util/object'
+import { findElements, createElement } from '../util/dom'
 import {
   matchCellWidths,
   uncompensateScroll,
   compensateScroll,
   subtractInnerElHeight,
-} from '../util'
-import { htmlEscape } from '../util/html'
-import { copyOwnProps } from '../util/object'
-import { findElements, createElement } from '../util/dom'
+} from '../util/misc'
 import Scroller from '../common/Scroller'
 import View from '../View'
 import TimeGrid from './TimeGrid'

src/agenda/TimeGrid.ts

@@ -1,8 +1,8 @@
 import * as moment from 'moment'
-import { isInt } from '../util'
 import { htmlEscape } from '../util/html'
 import { divideDurationByDuration } from '../util/date'
 import { htmlToElement, findElements, createElement, removeElement, applyStyle } from '../util/dom'
+import { isInt } from '../util/misc'
 import InteractiveDateComponent from '../component/InteractiveDateComponent'
 import BusinessHourRenderer from '../component/renderers/BusinessHourRenderer'
 import StandardInteractionsMixin from '../component/interactions/StandardInteractionsMixin'

src/basic/BasicView.ts

@@ -1,3 +1,5 @@
+import { htmlEscape } from '../util/html'
+import { createElement, findElements } from '../util/dom'
 import {
   matchCellWidths,
   uncompensateScroll,
@@ -5,9 +7,7 @@ import {
   subtractInnerElHeight,
   distributeHeight,
   undistributeHeight
-} from '../util'
-import { htmlEscape } from '../util/html'
-import { createElement, findElements } from '../util/dom'
+} from '../util/misc'
 import Scroller from '../common/Scroller'
 import View from '../View'
 import BasicViewDateProfileGenerator from './BasicViewDateProfileGenerator'

src/basic/MonthView.ts

@@ -1,5 +1,5 @@
 import * as moment from 'moment'
-import { distributeHeight } from '../util'
+import { distributeHeight } from '../util/misc'
 import BasicView from './BasicView'
 import MonthViewDateProfileGenerator from './MonthViewDateProfileGenerator'
 

src/common/DragListener.ts

@@ -1,9 +1,4 @@
-import {
-  firstDefined,
-  preventSelection,
-  allowSelection,
-  debounce
-} from '../util'
+import { getScrollParent } from '../util/dom-geom'
 import {
   getEvIsTouch,
   getEvX,
@@ -11,7 +6,12 @@ import {
   isPrimaryMouseButton,
   preventDefault
 } from '../util/dom-event'
-import { getScrollParent } from '../util/dom-geom'
+import {
+  firstDefined,
+  preventSelection,
+  allowSelection,
+  debounce
+} from '../util/misc'
 import { default as ListenerMixin, ListenerInterface } from './ListenerMixin'
 import GlobalEmitter from './GlobalEmitter'
 

src/common/EmitterMixin.ts

@@ -12,7 +12,7 @@ after class:
   EmitterMixin.mixInto(TheClass)
 */
 
-import { applyAll } from '../util'
+import { applyAll } from '../util/misc'
 import Mixin from './Mixin'
 
 export interface EmitterInterface {

src/component/interactions/DateSelecting.ts

@@ -1,4 +1,4 @@
-import { enableCursor, disableCursor, preventSelection, compareNumbers } from '../../util'
+import { enableCursor, disableCursor, preventSelection, compareNumbers } from '../../util/misc'
 import HitDragListener from '../../common/HitDragListener'
 import ComponentFootprint from '../../models/ComponentFootprint'
 import UnzonedRange from '../../models/UnzonedRange'

src/component/interactions/EventDragging.ts

@@ -1,4 +1,4 @@
-import { enableCursor, disableCursor } from '../../util'
+import { enableCursor, disableCursor } from '../../util/misc'
 import EventDefMutation from '../../models/event/EventDefMutation'
 import EventDefDateMutation from '../../models/event/EventDefDateMutation'
 import DragListener from '../../common/DragListener'

src/component/interactions/EventResizing.ts

@@ -1,4 +1,4 @@
-import { disableCursor, enableCursor } from '../../util'
+import { disableCursor, enableCursor } from '../../util/misc'
 import EventDefMutation from '../../models/event/EventDefMutation'
 import EventDefDateMutation from '../../models/event/EventDefDateMutation'
 import HitDragListener from '../../common/HitDragListener'

src/component/interactions/ExternalDropping.ts

@@ -1,8 +1,8 @@
 import * as moment from 'moment'
 import * as exportHooks from '../../exports'
-import { disableCursor, enableCursor } from '../../util'
 import { assignTo } from '../../util/object'
 import { elementMatches } from '../../util/dom'
+import { disableCursor, enableCursor } from '../../util/misc'
 import momentExt from '../../moment-ext'
 import { default as ListenerMixin, ListenerInterface } from '../../common/ListenerMixin'
 import HitDragListener from '../../common/HitDragListener'

src/component/renderers/EventRenderer.ts

@@ -1,5 +1,5 @@
-import { compareByFieldSpecs } from '../../util'
 import { htmlToElements } from '../../util/dom'
+import { compareByFieldSpecs } from '../../util/misc'
 
 export default class EventRenderer {
 

src/exports.ts

@@ -24,7 +24,7 @@ export {
   flexibleCompare,
   log,
   warn
-} from './util'
+} from './util/misc'
 
 export {
   htmlEscape,

src/list/ListView.ts

@@ -1,6 +1,6 @@
-import { subtractInnerElHeight } from '../util'
-import { htmlEscape } from '../util/html'
 import { htmlToElement, createElement } from '../util/dom'
+import { htmlEscape } from '../util/html'
+import { subtractInnerElHeight } from '../util/misc'
 import UnzonedRange from '../models/UnzonedRange'
 import View from '../View'
 import Scroller from '../common/Scroller'

src/main.ts

@@ -1,6 +1,6 @@
 import * as $ from 'jquery'
 import * as exportHooks from './exports'
-import { warn } from './util'
+import { warn } from './util/misc'
 import Calendar from './Calendar'
 
 // for intentional side-effects

src/models/event-source/JsonFeedEventSource.ts

@@ -1,6 +1,6 @@
 import * as $ from 'jquery'
-import { applyAll } from '../../util'
 import { assignTo } from '../../util/object'
+import { applyAll } from '../../util/misc'
 import EventSource from './EventSource'
 
 

src/util/date.ts

@@ -1,5 +1,5 @@
 import * as moment from 'moment'
-import { isInt } from '../util'
+import { isInt } from '../util/misc'
 
 export const dayIDs = [ 'sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat' ]
 export const unitsDesc = [ 'year', 'month', 'week', 'day', 'hour', 'minute', 'second', 'millisecond' ] // descending

src/util.ts → src/util/misc.ts

@@ -1,5 +1,5 @@
-import { applyStyle, computeHeightAndMargins } from './util/dom'
-import { preventDefault } from './util/dom-event'
+import { applyStyle, computeHeightAndMargins } from './dom'
+import { preventDefault } from './dom-event'
 
 
 /* FullCalendar-specific DOM Utilities