Skip to content

Enable pagination for main grid view #4958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 15 commits into from
Jan 18, 2021
Merged

Enable pagination for main grid view #4958

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
17d2f6e
Include local video when grid is in development mode
danxuliu Jan 14, 2021
088f34a
Fix computed property not honouring development mode
danxuliu Jan 14, 2021
a68c16b
Remove unused property
danxuliu Jan 14, 2021
614dd50
Account for the local video in the "slots" property
danxuliu Jan 14, 2021
a7f81af
Simplify calculation by using "slots" property
danxuliu Jan 14, 2021
0323b91
Move "displayedVideos" to a computed property
danxuliu Jan 14, 2021
461a44a
Move "numberOfPages" to a computed property
danxuliu Jan 14, 2021
39e0379
Fix grid view jumping back to first page in some updates
danxuliu Jan 14, 2021
baf2532
Fix layout hint not removed in some cases
danxuliu Jan 14, 2021
567f83a
Move layout hint event to a watcher
danxuliu Jan 14, 2021
3e2e704
Use a more accurate name for the CSS class
danxuliu Jan 14, 2021
d92cc8f
Fix CSS syntax typo
danxuliu Jan 14, 2021
8edff77
Enable pagination for main grid view
danxuliu Jan 14, 2021
55bc3bb
Remove layout hint notification
danxuliu Jan 14, 2021
f3a04d9
Reset current page when switching between stripe and full grid
danxuliu Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simplify calculation by using "slots" property 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Jan 14, 2021
commit a7f81afe0c5ad20b262e90140744b4af00a400ec
7 changes: 1 addition & 6 deletions src/components/CallView/Grid/Grid.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,12 +565,7 @@ export default {
this.shrinkGrid(this.videosCount)
}
// Once the grid is done, populate it with video components
if (this.isStripe) {
this.displayedVideos = this.videos.slice(0, this.rows * this.columns)
} else {
// `- 1` because we a ccount for the localVideo component (see template)
this.displayedVideos = this.videos.slice(0, this.rows * this.columns - 1)
}
this.displayedVideos = this.videos.slice(0, this.slots)
// Send event to display hint in the topbar component if there's an
// overflow of videos (only if in full-grid mode, not stripe)
if (this.hasVideoOverflow) {
Expand Down