Bläddra i källkod

rename all things timeZone

Adam Shaw 7 år sedan
förälder
incheckning
f118a77a62
34 ändrade filer med 115 tillägg och 115 borttagningar
  1. 9 9
      demos/php/get-events.php
  2. 12 12
      demos/php/utils.php
  3. 11 11
      demos/timezones.html
  4. 4 4
      src/Calendar.ts
  5. 7 7
      src/event-sources/json-feed-event-source.ts
  6. 2 2
      src/options.ts
  7. 1 1
      src/structs/event-source.ts
  8. 1 1
      src/types/input-types.ts
  9. 1 1
      tasks/lint.js
  10. 1 1
      tests/automated/event-data/lazyFetching.js
  11. 1 1
      tests/automated/event-data/recurring.js
  12. 1 1
      tests/automated/event-data/updateEvent.js
  13. 1 1
      tests/automated/event-render/timeText.js
  14. 8 8
      tests/automated/globals.js
  15. 1 1
      tests/automated/legacy/businessHours.js
  16. 2 2
      tests/automated/legacy/constraint.js
  17. 1 1
      tests/automated/legacy/current-date.js
  18. 1 1
      tests/automated/legacy/dayClick.js
  19. 1 1
      tests/automated/legacy/defaultAllDayEventDuration.js
  20. 1 1
      tests/automated/legacy/defaultTimedEventDuration.js
  21. 1 1
      tests/automated/legacy/displayEventEnd.js
  22. 1 1
      tests/automated/legacy/event-dnd.js
  23. 7 7
      tests/automated/legacy/event-feed-param.js
  24. 2 2
      tests/automated/legacy/event-resize.js
  25. 6 6
      tests/automated/legacy/events-function.js
  26. 3 3
      tests/automated/legacy/events-gcal.js
  27. 9 9
      tests/automated/legacy/events-json-feed.js
  28. 2 2
      tests/automated/legacy/external-dnd.js
  29. 6 6
      tests/automated/legacy/overlap.js
  30. 6 6
      tests/automated/legacy/timeZone.js
  31. 1 1
      tests/automated/view-dates/validRange.js
  32. 2 2
      tests/automated/view-dates/visibleRange.js
  33. 1 1
      tests/manual/issue_2154.html
  34. 1 1
      tests/manual/issue_2396_Sydney.html

+ 9 - 9
demos/php/get-events.php

@@ -4,7 +4,7 @@
 // This script reads event data from a JSON file and outputs those events which are within the range
 // supplied by the "start" and "end" GET parameters.
 //
-// An optional "timezone" GET parameter will force all ISO8601 date stings to a given timezone.
+// An optional "timeZone" GET parameter will force all ISO8601 date stings to a given timeZone.
 //
 // Requires PHP 5.2.0 or higher.
 //--------------------------------------------------------------------------------------------------
@@ -18,15 +18,15 @@ if (!isset($_GET['start']) || !isset($_GET['end'])) {
 }
 
 // Parse the start/end parameters.
-// These are assumed to be ISO8601 strings with no time nor timezone, like "2013-12-29".
-// Since no timezone will be present, they will parsed as UTC.
+// These are assumed to be ISO8601 strings with no time nor timeZone, like "2013-12-29".
+// Since no timeZone will be present, they will parsed as UTC.
 $range_start = parseDateTime($_GET['start']);
 $range_end = parseDateTime($_GET['end']);
 
-// Parse the timezone parameter if it is present.
-$timezone = null;
-if (isset($_GET['timezone'])) {
-  $timezone = new DateTimeZone($_GET['timezone']);
+// Parse the timeZone parameter if it is present.
+$timeZone = null;
+if (isset($_GET['timeZone'])) {
+  $timeZone = new DateTimeZone($_GET['timeZone']);
 }
 
 // Read and parse our events JSON file into an array of event data arrays.
@@ -38,7 +38,7 @@ $output_arrays = array();
 foreach ($input_arrays as $array) {
 
   // Convert the input array into a useful Event object
-  $event = new Event($array, $timezone);
+  $event = new Event($array, $timeZone);
 
   // If the event is in-bounds, add it to the output
   if ($event->isWithinDayRange($range_start, $range_end)) {
@@ -47,4 +47,4 @@ foreach ($input_arrays as $array) {
 }
 
 // Send JSON to the client.
-echo json_encode($output_arrays);
+echo json_encode($output_arrays);

+ 12 - 12
demos/php/utils.php

@@ -23,8 +23,8 @@ class Event {
 
 
   // Constructs an Event object from the given array of key=>values.
-  // You can optionally force the timezone of the parsed dates.
-  public function __construct($array, $timezone=null) {
+  // You can optionally force the timeZone of the parsed dates.
+  public function __construct($array, $timeZone=null) {
 
     $this->title = $array['title'];
 
@@ -40,12 +40,12 @@ class Event {
 
     if ($this->allDay) {
       // If dates are allDay, we want to parse them in UTC to avoid DST issues.
-      $timezone = null;
+      $timeZone = null;
     }
 
     // Parse dates
-    $this->start = parseDateTime($array['start'], $timezone);
-    $this->end = isset($array['end']) ? parseDateTime($array['end'], $timezone) : null;
+    $this->start = parseDateTime($array['start'], $timeZone);
+    $this->end = isset($array['end']) ? parseDateTime($array['end'], $timeZone) : null;
 
     // Record misc properties
     foreach ($array as $name => $value) {
@@ -107,17 +107,17 @@ class Event {
 //----------------------------------------------------------------------------------------------
 
 
-// Parses a string into a DateTime object, optionally forced into the given timezone.
-function parseDateTime($string, $timezone=null) {
+// Parses a string into a DateTime object, optionally forced into the given timeZone.
+function parseDateTime($string, $timeZone=null) {
   $date = new DateTime(
     $string,
-    $timezone ? $timezone : new DateTimeZone('UTC')
+    $timeZone ? $timeZone : new DateTimeZone('UTC')
       // Used only when the string is ambiguous.
-      // Ignored if string has a timezone offset in it.
+      // Ignored if string has a timeZone offset in it.
   );
-  if ($timezone) {
-    // If our timezone was ignored above, force it.
-    $date->setTimezone($timezone);
+  if ($timeZone) {
+    // If our timeZone was ignored above, force it.
+    $date->setTimezone($timeZone);
   }
   return $date;
 }

+ 11 - 11
demos/timezones.html

@@ -9,12 +9,12 @@
 <script>
 
   document.addEventListener('DOMContentLoaded', function() {
-    var initialTimezone = 'local';
-    var timezoneSelectorEl = document.getElementById('timezone-selector');
+    var initialTimeZone = 'local';
+    var timeZoneSelectorEl = document.getElementById('timezone-selector');
     var calendarEl = document.getElementById('calendar');
 
     var calendar = new FullCalendar.Calendar(calendarEl, {
-      timezone: initialTimezone,
+      timeZone: initialTimeZone,
       header: {
         left: 'prev,next today',
         center: 'title',
@@ -56,23 +56,23 @@
 
     // load the list of available timezones, build the <select> options
     superagent.get('php/get-timezones.php').end(function(err, res) {
-      var timezones = res.body || JSON.parse(res.text);
+      var timeZones = res.body || JSON.parse(res.text);
 
-      timezones.forEach(function(timezone) {
+      timeZones.forEach(function(timeZone) {
         var optionEl;
 
-        if (timezone != 'UTC') { // UTC is already in the list
+        if (timeZone != 'UTC') { // UTC is already in the list
           optionEl = document.createElement('option');
-          optionEl.value = timezone;
-          optionEl.innerText = timezone;
-          timezoneSelectorEl.appendChild(optionEl);
+          optionEl.value = timeZone;
+          optionEl.innerText = timeZone;
+          timeZoneSelectorEl.appendChild(optionEl);
         }
       });
     });
 
     // when the timezone selector changes, dynamically change the calendar option
-    timezoneSelectorEl.addEventListener('change', function() {
-      calendar.setOption('timezone', this.value || false);
+    timeZoneSelectorEl.addEventListener('change', function() {
+      calendar.setOption('timeZone', this.value || false);
     });
   });
 

+ 4 - 4
src/Calendar.ts

@@ -468,7 +468,7 @@ export default class Calendar {
 
     if (name === 'height' || name === 'contentHeight' || name === 'aspectRatio') {
       this.updateViewSize(true) // isResize=true
-    } else if (name === 'timezone') {
+    } else if (name === 'timeZone') {
       this.dispatch({
         type: 'CHANGE_TIMEZONE',
         oldDateEnv
@@ -500,7 +500,7 @@ export default class Calendar {
     this.theme = this.buildTheme(options)
     this.dateEnv = this.buildDateEnv(
       options.locale,
-      options.timezone,
+      options.timeZone,
       options.firstDay,
       options.weekNumberCalculation,
       options.weekLabel
@@ -1236,10 +1236,10 @@ EmitterMixin.mixInto(Calendar)
 // -----------------------------------------------------------------------------------------------------------------
 
 
-function buildDateEnv(locale, timezone, firstDay, weekNumberCalculation, weekLabel) {
+function buildDateEnv(locale, timeZone, firstDay, weekNumberCalculation, weekLabel) {
   return new DateEnv({
     calendarSystem: 'gregory',
-    timeZone: timezone,
+    timeZone,
     locale: getLocale(locale),
     weekNumberCalculation: weekNumberCalculation,
     firstDay: firstDay,

+ 7 - 7
src/event-sources/json-feed-event-source.ts

@@ -10,7 +10,7 @@ interface JsonFeedMeta {
   extraData?: any
   startParam?: string
   endParam?: string
-  timezoneParam?: string
+  timeZoneParam?: string
 }
 
 registerEventSourceDef({
@@ -28,7 +28,7 @@ registerEventSourceDef({
       extraData: raw.data,
       startParam: raw.startParam,
       endParam: raw.endParam,
-      timezoneParam: raw.timezoneParam
+      timeZoneParam: raw.timeZoneParam
     }
   },
 
@@ -72,7 +72,7 @@ function buildRequestParams(meta: JsonFeedMeta, range: DateRange, calendar: Cale
   const dateEnv = calendar.dateEnv
   let startParam
   let endParam
-  let timezoneParam
+  let timeZoneParam
   let customRequestParams
   let params = {}
 
@@ -86,9 +86,9 @@ function buildRequestParams(meta: JsonFeedMeta, range: DateRange, calendar: Cale
     endParam = calendar.opt('endParam')
   }
 
-  timezoneParam = meta.timezoneParam
-  if (timezoneParam == null) {
-    timezoneParam = calendar.opt('timezoneParam')
+  timeZoneParam = meta.timeZoneParam
+  if (timeZoneParam == null) {
+    timeZoneParam = calendar.opt('timeZoneParam')
   }
 
   // retrieve any outbound GET/POST data from the options
@@ -106,7 +106,7 @@ function buildRequestParams(meta: JsonFeedMeta, range: DateRange, calendar: Cale
   params[endParam] = dateEnv.formatIso(range.end)
 
   if (dateEnv.timeZone !== 'local') {
-    params[timezoneParam] = dateEnv.timeZone
+    params[timeZoneParam] = dateEnv.timeZone
   }
 
   return params

+ 2 - 2
src/options.ts

@@ -36,9 +36,9 @@ export const globalDefaults = {
   lazyFetching: true,
   startParam: 'start',
   endParam: 'end',
-  timezoneParam: 'timezone',
+  timeZoneParam: 'timeZone',
 
-  timezone: 'UTC', // TODO: throw error if given falsy value?
+  timeZone: 'UTC', // TODO: throw error if given falsy value?
 
   // allDayDefault: undefined,
 

+ 1 - 1
src/structs/event-source.ts

@@ -47,7 +47,7 @@ export interface ExtendedEventSourceInput {
   data?: object | (() => object)
   startParam?: string
   endParam?: string
-  timezoneParam?: string
+  timeZoneParam?: string
 
   // for any network-related sources
   success?: EventSourceSuccessResponseHandler

+ 1 - 1
src/types/input-types.ts

@@ -96,7 +96,7 @@ export interface OptionsInputBase {
   windowResizeDelay?: number
   eventLimit?: boolean | number
   eventLimitClick?: 'popover' | 'week' | 'day' | string | ((cellinfo: CellInfo, jsevent: Event) => void)
-  timezone?: string | boolean
+  timeZone?: string | boolean
   now?: DateInput | (() => DateInput)
   defaultView?: string
   allDaySlot?: boolean

+ 1 - 1
tasks/lint.js

@@ -74,7 +74,7 @@ gulp.task('lint:js:tests', function() {
           'karmaConfig',
           'pushOptions',
           'describeOptions',
-          'describeTimezones',
+          'describeTimeZones',
           'describeValues',
           'pit',
           'getCurrentOptions',

+ 1 - 1
tests/automated/event-data/lazyFetching.js

@@ -1,7 +1,7 @@
 
 describe('lazyFetching', function() {
   pushOptions({
-    timezone: 'UTC',
+    timeZone: 'UTC',
     defaultView: 'month',
     defaultDate: '2017-10-04'
   })

+ 1 - 1
tests/automated/event-data/recurring.js

@@ -5,7 +5,7 @@ describe('recurring events', function() {
     pushOptions({
       defaultView: 'agendaWeek',
       defaultDate: '2017-07-03',
-      timezone: 'local',
+      timeZone: 'local',
       events: [
         { startTime: '09:00', endTime: '11:00', daysOfWeek: [ 2, 4 ] }
       ]

+ 1 - 1
tests/automated/event-data/updateEvent.js

@@ -1,7 +1,7 @@
 
 xdescribe('updateEvent', function() {
   pushOptions({
-    timezone: 'UTC'
+    timeZone: 'UTC'
   })
 
   describe('when changing an event\'s ID', function() {

+ 1 - 1
tests/automated/event-render/timeText.js

@@ -13,7 +13,7 @@ describe('the time text on events', function() {
       var FORMAT = { hour: 'numeric', minute: '2-digit', timeZoneName: 'short' }
 
       initCalendar({
-        timezone: 'local',
+        timeZone: 'local',
         timeFormat: FORMAT,
         events: [
           { start: '2017-07-03T23:00:00', end: '2017-07-04T13:00:00' }

+ 8 - 8
tests/automated/globals.js

@@ -138,7 +138,7 @@ window.describeValues = function(hash, callback) {
 // new Date('YYYY-MM-DD') --- parsed as UTC
 // new Date('YYYY-MM-DDT00:00:00') --- parsed as local
 
-const timezoneScenarios = {
+const timeZoneScenarios = {
   local: {
     description: 'when local timezone',
     value: 'local',
@@ -161,23 +161,23 @@ const timezoneScenarios = {
   }
 }
 
-window.describeTimezones = function(callback) {
-  $.each(timezoneScenarios, function(name, scenario) {
+window.describeTimeZones = function(callback) {
+  $.each(timeZoneScenarios, function(name, scenario) {
     describe(scenario.description, function() {
       pushOptions({
-        timezone: name
+        timeZone: name
       })
       callback(scenario)
     })
   })
 }
 
-window.describeTimezone = function(name, callback) {
-  var scenario = timezoneScenarios[name]
+window.describeTimeZone = function(name, callback) {
+  var scenario = timeZoneScenarios[name]
 
   describe(scenario.description, function() {
     pushOptions({
-      timezone: name
+      timeZone: name
     })
     callback(scenario)
   })
@@ -233,5 +233,5 @@ window.spyCall = function(func) {
 // ---------------------------------------------------------------------------------------------------------------------
 
 window.pushOptions({
-  timezone: 'UTC'
+  timeZone: 'UTC'
 })

+ 1 - 1
tests/automated/legacy/businessHours.js

@@ -8,7 +8,7 @@ import { ensureDate } from '../datelib/utils'
 
 describe('businessHours', function() {
   pushOptions({
-    timezone: 'UTC',
+    timeZone: 'UTC',
     defaultDate: '2014-11-25',
     defaultView: 'month',
     businessHours: true

+ 2 - 2
tests/automated/legacy/constraint.js

@@ -255,7 +255,7 @@ describe('event constraint', function() {
           it('does not allow a drag', function(done) {
             var options = {}
 
-            options.timezone = 'UTC'
+            options.timeZone = 'UTC'
             options.events = [ {
               start: '2014-11-10T03:00:00+00:00',
               end: '2014-11-10T05:00:00+00:00',
@@ -304,7 +304,7 @@ describe('event constraint', function() {
           it('does not allow a drag', function(done) {
             var options = {}
 
-            options.timezone = 'UTC'
+            options.timeZone = 'UTC'
             options.events = [ {
               start: '2014-11-10T03:00:00+00:00',
               end: '2014-11-10T05:00:00+00:00',

+ 1 - 1
tests/automated/legacy/current-date.js

@@ -10,7 +10,7 @@ describe('current date', function() {
     titleFormat: TITLE_FORMAT,
     titleRangeSeparator: ' - ',
     defaultDate: '2014-06-01',
-    timezone: 'UTC'
+    timeZone: 'UTC'
   })
 
   describe('defaultDate & getDate', function() { // keep getDate

+ 1 - 1
tests/automated/legacy/dayClick.js

@@ -2,7 +2,7 @@ describe('dayClick', function() {
   pushOptions({
     defaultDate: '2014-05-27',
     selectable: false,
-    timezone: 'UTC'
+    timeZone: 'UTC'
   });
 
   [ false, true ].forEach(function(isRTL) {

+ 1 - 1
tests/automated/legacy/defaultAllDayEventDuration.js

@@ -3,7 +3,7 @@ describe('defaultAllDayEventDuration', function() {
   pushOptions({
     defaultDate: '2014-05-01',
     defaultView: 'month',
-    timezone: 'UTC'
+    timeZone: 'UTC'
   })
 
   describe('when forceEventDuration is on', function() {

+ 1 - 1
tests/automated/legacy/defaultTimedEventDuration.js

@@ -3,7 +3,7 @@ describe('defaultTimedEventDuration', function() {
   pushOptions({
     defaultDate: '2014-05-01',
     defaultView: 'month',
-    timezone: 'UTC'
+    timeZone: 'UTC'
   })
 
   describe('when forceEventDuration is on', function() {

+ 1 - 1
tests/automated/legacy/displayEventEnd.js

@@ -2,7 +2,7 @@ describe('displayEventEnd', function() {
 
   pushOptions({
     defaultDate: '2014-06-13',
-    timezone: 'UTC',
+    timeZone: 'UTC',
     timeFormat: { hour: 'numeric', minute: '2-digit' }
   })
 

+ 1 - 1
tests/automated/legacy/event-dnd.js

@@ -3,7 +3,7 @@ describe('eventDrop', function() {
 
   beforeEach(function() {
     options = {
-      timezone: 'UTC',
+      timeZone: 'UTC',
       defaultDate: '2014-06-11',
       editable: true,
       dragScroll: false,

+ 7 - 7
tests/automated/legacy/event-feed-param.js

@@ -13,7 +13,7 @@ describe('event feed params', function() {
     XHRMock.teardown()
   })
 
-  it('utilizes custom startParam, endParam, and timezoneParam names', function(done) {
+  it('utilizes custom startParam, endParam, and timeZoneParam names', function(done) {
 
     XHRMock.get(/^my-feed\.php/, function(req, res) {
       expect(req.url().query).toEqual({
@@ -27,14 +27,14 @@ describe('event feed params', function() {
 
     initCalendar({
       events: 'my-feed.php',
-      timezone: 'America/Los_Angeles',
+      timeZone: 'America/Los_Angeles',
       startParam: 'mystart',
       endParam: 'myend',
-      timezoneParam: 'currtz'
+      timeZoneParam: 'currtz'
     })
   })
 
-  it('utilizes event-source-specific startParam, endParam, and timezoneParam names', function(done) {
+  it('utilizes event-source-specific startParam, endParam, and timeZoneParam names', function(done) {
 
     XHRMock.get(/^my-feed\.php/, function(req, res) {
       expect(req.url().query).toEqual({
@@ -47,16 +47,16 @@ describe('event feed params', function() {
     })
 
     initCalendar({
-      timezone: 'America/Los_Angeles',
+      timeZone: 'America/Los_Angeles',
       startParam: 'mystart',
       endParam: 'myend',
-      timezoneParam: 'currtz',
+      timeZoneParam: 'currtz',
       eventSources: [
         {
           url: 'my-feed.php',
           startParam: 'feedstart',
           endParam: 'feedend',
-          timezoneParam: 'feedctz'
+          timeZoneParam: 'feedctz'
         }
       ]
     })

+ 2 - 2
tests/automated/legacy/event-resize.js

@@ -254,7 +254,7 @@ describe('eventResize', function() {
 
       it('should have correct arguments with a timed delta, when timezone is local', function(done) {
         var options = {}
-        options.timezone = 'local'
+        options.timeZone = 'local'
         init(
           options,
           function() {
@@ -282,7 +282,7 @@ describe('eventResize', function() {
 
       it('should have correct arguments with a timed delta, when timezone is UTC', function(done) {
         var options = {}
-        options.timezone = 'UTC'
+        options.timeZone = 'UTC'
         init(
           options,
           function() {

+ 6 - 6
tests/automated/legacy/events-function.js

@@ -13,7 +13,7 @@ describe('events as a function', function() {
 
   it('requests correctly when local timezone', function(done) {
     initCalendar({
-      timezone: 'local',
+      timeZone: 'local',
       events: function(arg, callback) {
         testEventFunctionParams(arg, callback)
         expect(arg.timeZone).toEqual('local')
@@ -27,7 +27,7 @@ describe('events as a function', function() {
 
   it('requests correctly when UTC timezone', function(done) {
     initCalendar({
-      timezone: 'UTC',
+      timeZone: 'UTC',
       events: function(arg, callback) {
         testEventFunctionParams(arg, callback)
         expect(arg.timeZone).toEqual('UTC')
@@ -41,7 +41,7 @@ describe('events as a function', function() {
 
   it('requests correctly when custom timezone', function(done) {
     initCalendar({
-      timezone: 'America/Chicago',
+      timeZone: 'America/Chicago',
       events: function(arg, callback) {
         testEventFunctionParams(arg, callback)
         expect(arg.timeZone).toEqual('America/Chicago')
@@ -56,7 +56,7 @@ describe('events as a function', function() {
   it('requests correctly when timezone changed dynamically', function(done) {
     var callCnt = 0
     var options = {
-      timezone: 'America/Chicago',
+      timeZone: 'America/Chicago',
       events: function(arg, callback) {
         testEventFunctionParams(arg, callback)
         callCnt++
@@ -65,7 +65,7 @@ describe('events as a function', function() {
           expect(arg.start).toEqualDate('2014-04-27')
           expect(arg.end).toEqualDate('2014-06-08')
           setTimeout(function() {
-            currentCalendar.setOption('timezone', 'UTC')
+            currentCalendar.setOption('timeZone', 'UTC')
           }, 0)
         } else if (callCnt === 2) {
           expect(arg.timeZone).toEqual('UTC')
@@ -98,7 +98,7 @@ describe('events as a function', function() {
     spyOn(eventSource, 'events').and.callThrough()
 
     initCalendar({
-      timezone: 'UTC',
+      timeZone: 'UTC',
       eventSources: [ eventSource ],
       eventRender: function(arg) {
         expect(eventSource.events.calls.count()).toEqual(1)

+ 3 - 3
tests/automated/legacy/events-gcal.js

@@ -45,7 +45,7 @@ describe('Google Calendar plugin', function() {
   it('request/receives correctly when local timezone', function(done) {
     options.googleCalendarApiKey = API_KEY
     options.events = { googleCalendarId: HOLIDAY_CALENDAR_ID }
-    options.timezone = 'local'
+    options.timeZone = 'local'
     options.eventAfterAllRender = function() {
       var events = currentCalendar.getEvents()
       var i
@@ -63,7 +63,7 @@ describe('Google Calendar plugin', function() {
   it('request/receives correctly when UTC timezone', function(done) {
     options.googleCalendarApiKey = API_KEY
     options.events = { googleCalendarId: HOLIDAY_CALENDAR_ID }
-    options.timezone = 'UTC'
+    options.timeZone = 'UTC'
     options.eventAfterAllRender = function() {
       var events = currentCalendar.getEvents()
       var i
@@ -81,7 +81,7 @@ describe('Google Calendar plugin', function() {
   it('request/receives correctly when named timezone, defaults to not editable', function(done) {
     options.googleCalendarApiKey = API_KEY
     options.events = { googleCalendarId: HOLIDAY_CALENDAR_ID }
-    options.timezone = 'America/New York'
+    options.timeZone = 'America/New York'
     options.eventAfterAllRender = function() {
       var events = currentCalendar.getEvents()
       var eventEls = $('.fc-event')

+ 9 - 9
tests/automated/legacy/events-json-feed.js

@@ -30,7 +30,7 @@ describe('events as a json feed', function() {
 
     initCalendar({
       events: 'my-feed.php',
-      timezone: 'local'
+      timeZone: 'local'
     })
   })
 
@@ -40,7 +40,7 @@ describe('events as a json feed', function() {
       expect(req.url().query).toEqual({
         start: '2014-04-27T00:00:00Z',
         end: '2014-06-08T00:00:00Z',
-        timezone: 'UTC'
+        timeZone: 'UTC'
       })
       done()
       return res.status(200).header('content-type', 'application/json').body('[]')
@@ -48,7 +48,7 @@ describe('events as a json feed', function() {
 
     initCalendar({
       events: 'my-feed.php',
-      timezone: 'UTC'
+      timeZone: 'UTC'
     })
   })
 
@@ -58,7 +58,7 @@ describe('events as a json feed', function() {
       expect(req.url().query).toEqual({
         start: '2014-04-27T00:00:00',
         end: '2014-06-08T00:00:00',
-        timezone: 'America/Chicago'
+        timeZone: 'America/Chicago'
       })
       done()
       return res.status(200).header('content-type', 'application/json').body('[]')
@@ -66,7 +66,7 @@ describe('events as a json feed', function() {
 
     initCalendar({
       events: 'my-feed.php',
-      timezone: 'America/Chicago'
+      timeZone: 'America/Chicago'
     })
   })
 
@@ -76,7 +76,7 @@ describe('events as a json feed', function() {
       expect(req.url().query).toEqual({
         start: '2014-04-27T00:00:00',
         end: '2014-06-08T00:00:00',
-        timezone: 'America/Chicago'
+        timeZone: 'America/Chicago'
       })
       return res.status(200).header('content-type', 'application/json').body(
         JSON.stringify([
@@ -93,7 +93,7 @@ describe('events as a json feed', function() {
         url: 'my-feed.php',
         className: 'customeventclass'
       } ],
-      timezone: 'America/Chicago',
+      timeZone: 'America/Chicago',
       eventRender: function(arg) {
         expect(arg.el).toHaveClass('customeventclass')
         done()
@@ -105,7 +105,7 @@ describe('events as a json feed', function() {
 
     XHRMock.get(/^my-feed\.php/, function(req, res) {
       expect(req.url().query).toEqual({
-        timezone: 'UTC',
+        timeZone: 'UTC',
         start: '2014-04-27T00:00:00Z',
         end: '2014-06-08T00:00:00Z',
         customParam: 'yes'
@@ -128,7 +128,7 @@ describe('events as a json feed', function() {
 
     XHRMock.get(/^my-feed\.php/, function(req, res) {
       expect(req.url().query).toEqual({
-        timezone: 'UTC',
+        timeZone: 'UTC',
         start: '2014-04-27T00:00:00Z',
         end: '2014-06-08T00:00:00Z',
         customParam: 'heckyeah'

+ 2 - 2
tests/automated/legacy/external-dnd.js

@@ -218,7 +218,7 @@ describe('external drag and drop', function() {
         })
 
         it('works with timezone as "local"', function(done) { // for issue 2225
-          options.timezone = 'local'
+          options.timeZone = 'local'
           options.drop = function(arg) {
             expect(arg.date).toEqualDate('2014-08-20T01:00:00') // local
             done()
@@ -234,7 +234,7 @@ describe('external drag and drop', function() {
         })
 
         it('works with timezone as "UTC"', function(done) { // for issue 2225
-          options.timezone = 'UTC'
+          options.timeZone = 'UTC'
           options.drop = function(arg) {
             expect(arg.date).toEqualDate('2014-08-20T01:00:00Z')
             done()

+ 6 - 6
tests/automated/legacy/overlap.js

@@ -122,7 +122,7 @@ describe('event overlap', function() {
       })
       describe('when UTC timezone', function() {
         it('does not allow dragging', function(done) {
-          options.timezone = 'UTC'
+          options.timeZone = 'UTC'
           options.events = [
             {
               title: 'Event A',
@@ -167,7 +167,7 @@ describe('event overlap', function() {
         })
         describe('when UTC timezone', function() {
           it('does not allow dragging', function(done) {
-            options.timezone = 'UTC'
+            options.timeZone = 'UTC'
             options.events = [
               {
                 title: 'Event A',
@@ -854,7 +854,7 @@ describe('selectOverlap', function() {
     describe('when dragged intersecting an event\'s start', function() {
       describe('when UTC timezone', function() {
         it('does not allow selection', function(done) {
-          options.timezone = 'UTC'
+          options.timeZone = 'UTC'
           options.events = [ {
             title: 'Event A',
             start: '2014-11-12T04:00:00+00:00',
@@ -865,7 +865,7 @@ describe('selectOverlap', function() {
       })
       describe('when local timezone', function() {
         it('does not allow selection', function(done) {
-          options.timezone = 'local'
+          options.timeZone = 'local'
           options.events = [ {
             title: 'Event A',
             start: '2014-11-12T04:00:00',
@@ -889,7 +889,7 @@ describe('selectOverlap', function() {
         })
         describe('when UTC timezone', function() {
           it('does not allow selection', function(done) {
-            options.timezone = 'UTC'
+            options.timeZone = 'UTC'
             options.events = [ {
               title: 'Event A',
               start: '2014-11-12T04:00:00+00:00',
@@ -900,7 +900,7 @@ describe('selectOverlap', function() {
         })
         describe('when local timezone', function() {
           it('does not allow selection', function(done) {
-            options.timezone = 'local'
+            options.timeZone = 'local'
             options.events = [ {
               title: 'Event A',
               start: '2014-11-12T04:00:00',

+ 6 - 6
tests/automated/legacy/timezone.js → tests/automated/legacy/timeZone.js

@@ -1,4 +1,4 @@
-describe('timezone', function() {
+describe('timeZone', function() {
 
   // NOTE: Only deals with the processing of *received* events.
   // Verification of a correct AJAX *request* is done in events-json-feed.js
@@ -28,7 +28,7 @@ describe('timezone', function() {
 
   it('receives events correctly when local timezone', function(done) {
     initCalendar({
-      timezone: 'local',
+      timeZone: 'local',
       eventAfterAllRender: function() {
         expectLocalTimezone()
         done()
@@ -51,7 +51,7 @@ describe('timezone', function() {
 
   it('receives events correctly when UTC timezone', function(done) {
     initCalendar({
-      timezone: 'UTC',
+      timeZone: 'UTC',
       eventAfterAllRender: function() {
         expectUtcTimezone()
         done()
@@ -74,7 +74,7 @@ describe('timezone', function() {
 
   it('receives events correctly when custom timezone', function(done) {
     initCalendar({
-      timezone: 'America/Chicago',
+      timeZone: 'America/Chicago',
       eventAfterAllRender: function() {
         expectCustomTimezone()
         done()
@@ -99,13 +99,13 @@ describe('timezone', function() {
     var callCnt = 0
 
     initCalendar({
-      timezone: 'local',
+      timeZone: 'local',
       eventAfterAllRender: function() {
         callCnt++
         if (callCnt === 1) {
 
           expectLocalTimezone()
-          currentCalendar.setOption('timezone', 'UTC') // will cause second call...
+          currentCalendar.setOption('timeZone', 'UTC') // will cause second call...
 
         } else if (callCnt === 2) {
 

+ 1 - 1
tests/automated/view-dates/validRange.js

@@ -2,7 +2,7 @@ import { expectActiveRange, expectRenderRange } from './ViewDateUtils'
 
 describe('validRange', function() {
   pushOptions({
-    timezone: 'UTC',
+    timeZone: 'UTC',
     defaultDate: '2017-06-08'
   })
 

+ 2 - 2
tests/automated/view-dates/visibleRange.js

@@ -85,7 +85,7 @@ describe('visibleRange', function() {
         var matched = false
 
         initCalendar({
-          timezone: 'local',
+          timeZone: 'local',
           defaultDate: defaultDateInput,
           visibleRange: function(date) {
             // this function will receive the date for prev/next,
@@ -103,7 +103,7 @@ describe('visibleRange', function() {
         var matched = false
 
         initCalendar({
-          timezone: 'UTC',
+          timeZone: 'UTC',
           defaultDate: defaultDateInput,
           visibleRange: function(date) {
             // this function will receive the date for prev/next,

+ 1 - 1
tests/manual/issue_2154.html

@@ -81,7 +81,7 @@
 
     $('#calendar').fullCalendar({
       editable: true,
-      timezone: 'Europe/Berlin',
+      timeZone: 'Europe/Berlin',
       events: [
         {
           title: "event1",

+ 1 - 1
tests/manual/issue_2396_Sydney.html

@@ -20,7 +20,7 @@
       defaultDate: '2014-04-05',
       defaultView: 'agendaDay',
       selectable: true,
-      timezone: 'local',
+      timeZone: 'local',
       dayClick: function(date) {
         console.log('dayClick', date.format());
       },