Skip to content

Commit

Permalink
eventdisplay renames
Browse files Browse the repository at this point in the history
  • Loading branch information
arshaw committed Apr 13, 2020
1 parent b45cf7a commit 37fec75
Show file tree
Hide file tree
Showing 22 changed files with 94 additions and 94 deletions.
8 changes: 4 additions & 4 deletions examples/background-events.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,28 +47,28 @@
groupId: 'availableForMeeting',
start: '2020-02-11T10:00:00',
end: '2020-02-11T16:00:00',
rendering: 'background'
display: 'background'
},
{
groupId: 'availableForMeeting',
start: '2020-02-13T10:00:00',
end: '2020-02-13T16:00:00',
rendering: 'background'
display: 'background'
},

// red areas where no events can be dropped
{
start: '2020-02-24',
end: '2020-02-28',
overlap: false,
rendering: 'background',
display: 'background',
color: '#ff9f89'
},
{
start: '2020-02-06',
end: '2020-02-08',
overlap: false,
rendering: 'background',
display: 'background',
color: '#ff9f89'
}
]
Expand Down
4 changes: 2 additions & 2 deletions examples/timeline-background-events.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
events: [

// background event, associated with a resource
{ id: 'bg1', resourceId: 'b', rendering: 'background', start: '2020-02-07T01:00:00', end: '2020-02-07T04:00:00' },
{ id: 'bg1', resourceId: 'b', display: 'background', start: '2020-02-07T01:00:00', end: '2020-02-07T04:00:00' },

// background event, NOT associated with a resource
{ id: 'bg2', rendering: 'background', start: '2020-02-07T05:00:00', end: '2020-02-07T08:00:00' },
{ id: 'bg2', display: 'background', start: '2020-02-07T05:00:00', end: '2020-02-07T08:00:00' },

// normal events...
{ id: '1', resourceId: 'b', start: '2020-02-07T02:00:00', end: '2020-02-07T07:00:00', title: 'event 1' },
Expand Down
2 changes: 1 addition & 1 deletion packages-premium
4 changes: 2 additions & 2 deletions packages/__tests__/src/event-click-hover/eventClick.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ describe('eventClick', function() {
it('fires on a background event', function(done) {
let calendar = initCalendar({
events: [
{ start: '2018-08-31', rendering: 'background' }
{ start: '2018-08-31', display: 'background' }
],
eventClick(arg) {
expect(arg.event.rendering).toBe('background')
expect(arg.event.display).toBe('background')
done()
}
})
Expand Down
2 changes: 1 addition & 1 deletion packages/__tests__/src/event-data/Event.mutation.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ describe('event mutations on non-instances', function() {
defaultView: 'dayGridWeek',
now: '2018-09-03',
events: [
{ id: '1', start: '2018-09-04', rendering: 'inverse-background' } // will make two segs
{ id: '1', start: '2018-09-04', display: 'inverse-background' } // will make two segs
]
})

Expand Down
74 changes: 37 additions & 37 deletions packages/__tests__/src/legacy/background-events.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('background events', function() {
events: [ {
title: 'hi',
start: '2014-11-04',
rendering: 'background'
display: 'background'
} ]
})

Expand All @@ -39,7 +39,7 @@ describe('background events', function() {
title: 'hi',
start: '2014-11-04',
end: '2014-11-11',
rendering: 'background'
display: 'background'
} ]
})

Expand All @@ -60,12 +60,12 @@ describe('background events', function() {
{
start: '2014-11-04',
end: '2014-11-07',
rendering: 'background'
display: 'background'
},
{
start: '2014-11-05',
end: '2014-11-08',
rendering: 'background'
display: 'background'
}
]
})
Expand Down Expand Up @@ -97,7 +97,7 @@ describe('background events', function() {
events: [ {
title: 'hi',
start: '2014-11-04',
rendering: 'background'
display: 'background'
} ]
})

Expand All @@ -116,7 +116,7 @@ describe('background events', function() {
title: 'hi',
start: '2014-11-04',
end: '2014-11-11',
rendering: 'background'
display: 'background'
} ]
})

Expand All @@ -141,7 +141,7 @@ describe('background events', function() {
events: [ {
title: 'hi',
start: '2014-11-04',
rendering: 'inverse-background'
display: 'inverse-background'
} ]
})
let dayGridWrapper = new DayGridViewWrapper(calendar).dayGrid
Expand Down Expand Up @@ -171,7 +171,7 @@ describe('background events', function() {
title: 'hi',
start: '2014-11-04',
end: '2014-11-11',
rendering: 'inverse-background'
display: 'inverse-background'
} ]
})
let dayGridWrapper = new DayGridViewWrapper(calendar).dayGrid
Expand All @@ -198,7 +198,7 @@ describe('background events', function() {
events: [ {
start: '2014-10-24',
end: '2014-11-06',
rendering: 'inverse-background'
display: 'inverse-background'
} ]
})
let dayGridWrapper = new DayGridViewWrapper(calendar).dayGrid
Expand All @@ -220,7 +220,7 @@ describe('background events', function() {
events: [ {
start: '2014-11-27',
end: '2014-12-08',
rendering: 'inverse-background'
display: 'inverse-background'
} ]
})

Expand All @@ -244,12 +244,12 @@ describe('background events', function() {
{
groupId: 'hi',
start: '2014-11-06',
rendering: 'inverse-background'
display: 'inverse-background'
},
{
groupId: 'hi',
start: '2014-11-04',
rendering: 'inverse-background'
display: 'inverse-background'
}
]
})
Expand All @@ -274,7 +274,7 @@ describe('background events', function() {
events: [ {
title: 'hi',
start: '2014-11-04',
rendering: 'inverse-background'
display: 'inverse-background'
} ]
})
let dayGridWrapper = new DayGridViewWrapper(calendar).dayGrid
Expand All @@ -296,7 +296,7 @@ describe('background events', function() {
let calendar = initCalendar({
defaultView: 'dayGridMonth',
eventSources: [ {
rendering: 'background',
display: 'background',
events: [ {
start: '2014-11-04'
} ]
Expand All @@ -315,7 +315,7 @@ describe('background events', function() {
let calendar = initCalendar({
defaultView: 'timeGridWeek',
eventSources: [ {
rendering: 'background',
display: 'background',
events: [ {
start: '2014-11-04T01:00:00'
} ]
Expand All @@ -339,7 +339,7 @@ describe('background events', function() {
events: [ {
start: '2014-11-04T01:00:00',
end: '2014-11-04T05:00:00',
rendering: 'background'
display: 'background'
} ]
})

Expand All @@ -363,7 +363,7 @@ describe('background events', function() {
events: [ {
start: '2014-11-04T01:00:00',
end: '2014-11-05T05:00:00',
rendering: 'background'
display: 'background'
} ]
})
let timeGridWrapper = new TimeGridViewWrapper(calendar).timeGrid
Expand All @@ -379,12 +379,12 @@ describe('background events', function() {
{
start: '2014-11-04T01:00:00',
end: '2014-11-05T05:00:00',
rendering: 'background'
display: 'background'
},
{
start: '2014-11-04T03:00:00',
end: '2014-11-05T08:00:00',
rendering: 'background'
display: 'background'
}
]
})
Expand Down Expand Up @@ -444,7 +444,7 @@ describe('background events', function() {
events: [ {
start: '2014-11-04T01:00:00',
end: '2014-11-04T05:00:00',
rendering: 'background'
display: 'background'
} ]
})

Expand All @@ -467,7 +467,7 @@ describe('background events', function() {
events: [ {
start: '2014-11-04T01:00:00',
end: '2014-11-05T05:00:00',
rendering: 'background'
display: 'background'
} ]
})
let timeGridWrapper = new TimeGridViewWrapper(calendar).timeGrid
Expand Down Expand Up @@ -516,7 +516,7 @@ describe('background events', function() {
events: [ {
start: '2014-11-04T01:00:00',
end: '2014-11-04T05:00:00',
rendering: 'inverse-background'
display: 'inverse-background'
} ]
})
let timeGridWrapper = new TimeGridViewWrapper(calendar).timeGrid
Expand All @@ -537,7 +537,7 @@ describe('background events', function() {
events: [ {
start: '2014-11-04T01:00:00',
end: '2014-11-05T05:00:00',
rendering: 'inverse-background'
display: 'inverse-background'
} ]
})
let timeGridWrapper = new TimeGridViewWrapper(calendar).timeGrid
Expand All @@ -558,7 +558,7 @@ describe('background events', function() {
events: [ {
start: '2014-10-30T01:00:00',
end: '2014-11-04T05:00:00',
rendering: 'inverse-background'
display: 'inverse-background'
} ]
})
let timeGridWrapper = new TimeGridViewWrapper(calendar).timeGrid
Expand All @@ -579,7 +579,7 @@ describe('background events', function() {
events: [ {
start: '2014-11-04T01:00:00',
end: '2014-11-12T05:00:00',
rendering: 'inverse-background'
display: 'inverse-background'
} ]
})
let timeGridWrapper = new TimeGridViewWrapper(calendar).timeGrid
Expand All @@ -598,13 +598,13 @@ describe('background events', function() {
groupId: 'hello',
start: '2014-11-05T01:00:00',
end: '2014-11-05T05:00:00',
rendering: 'inverse-background'
display: 'inverse-background'
},
{
groupId: 'hello',
start: '2014-11-03T01:00:00',
end: '2014-11-03T05:00:00',
rendering: 'inverse-background'
display: 'inverse-background'
}
]
})
Expand All @@ -628,13 +628,13 @@ describe('background events', function() {
groupId: 'hello',
start: '2014-11-05T01:00:00',
end: '2014-11-05T05:00:00',
rendering: 'inverse-background'
display: 'inverse-background'
},
{
groupId: 'hello',
start: '2014-11-05T02:00:00',
end: '2014-11-05T04:00:00',
rendering: 'inverse-background'
display: 'inverse-background'
}
]
})
Expand Down Expand Up @@ -668,7 +668,7 @@ describe('background events', function() {
events: [ {
start: '2014-11-04T01:00:00',
end: '2014-11-04T05:00:00',
rendering: 'inverse-background'
display: 'inverse-background'
} ]
})
let timeGridWrapper = new TimeGridViewWrapper(calendar).timeGrid
Expand All @@ -692,7 +692,7 @@ describe('background events', function() {
events: [ {
start: '2014-01-01T01:00:00',
end: '2014-01-01T05:00:00',
rendering: 'inverse-background'
display: 'inverse-background'
} ]
})
let timeGridWrapper = new TimeGridViewWrapper(calendar).timeGrid
Expand All @@ -705,7 +705,7 @@ describe('background events', function() {
let calendar = initCalendar({
events: [ {
start: '2014-11-04T01:00:00',
rendering: 'background',
display: 'background',
color: 'red'
} ]
})
Expand All @@ -718,7 +718,7 @@ describe('background events', function() {
let calendar = initCalendar({
events: [ {
start: '2014-11-04T01:00:00',
rendering: 'background',
display: 'background',
backgroundColor: 'red'
} ]
})
Expand All @@ -733,7 +733,7 @@ describe('background events', function() {
color: 'red',
events: [ {
start: '2014-11-04T01:00:00',
rendering: 'background'
display: 'background'
} ]
} ]
})
Expand All @@ -748,7 +748,7 @@ describe('background events', function() {
backgroundColor: 'red',
events: [ {
start: '2014-11-04T01:00:00',
rendering: 'background'
display: 'background'
} ]
} ]
})
Expand All @@ -763,7 +763,7 @@ describe('background events', function() {
eventSources: [ {
events: [ {
start: '2014-11-04T01:00:00',
rendering: 'background'
display: 'background'
} ]
} ]
})
Expand All @@ -778,7 +778,7 @@ describe('background events', function() {
eventSources: [ {
events: [ {
start: '2014-11-04T01:00:00',
rendering: 'background'
display: 'background'
} ]
} ]
})
Expand Down

0 comments on commit 37fec75

Please sign in to comment.