Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • B bootstrap
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 263
    • Issues 263
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 114
    • Merge requests 114
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Bootstrap
  • bootstrap
  • Merge requests
  • !14357
Something went wrong while fetching comments. Please try again.

Fix bug not re-calculating scrollbar width when opening modal

  • Review changes

  • Download
  • Email patches
  • Plain diff
Closed Administrator requested to merge github/fork/stefansundin/master into master 10 years ago
  • Overview 0
  • Commits 2
  • Pipelines 0
  • Changes 1

Created by: stefansundin

If opening a modal when a scrollbar is present, closing it, then resizing the window so the scrollbar disappears, then opening the modal again, the content would shift. This fixes the problem by always calculating the scrollbar width every time a modal is opened.

See buggy example: http://jsfiddle.net/02rthxw5/ See fixed example: http://jsfiddle.net/02rthxw5/2/

Should I add compiled files to the PR? I could not find if this is desired in the docs.

Compare
  • master (base)

and
  • latest version
    634a680b
    2 commits, 1 year ago

1 file
+ 2
- 2

    Preferences

    File browser
    Compare changes
js/modal.js
+ 2
- 2
  • View file @ 634a680b


@@ -207,8 +207,7 @@
}
Modal.prototype.checkScrollbar = function () {
if (document.body.clientWidth >= window.innerWidth) return
this.scrollbarWidth = this.scrollbarWidth || this.measureScrollbar()
this.scrollbarWidth = this.measureScrollbar()
}
Modal.prototype.setScrollbar = function () {
@@ -221,6 +220,7 @@
}
Modal.prototype.measureScrollbar = function () { // thx walsh
if (document.body.clientWidth >= window.innerWidth) return 0
var scrollDiv = document.createElement('div')
scrollDiv.className = 'modal-scrollbar-measure'
this.$body.append(scrollDiv)
0 Assignees
None
Assign to
0 Reviewers
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
Lock merge request
Unlocked
1
1 participant
Administrator
Reference:
Source branch: github/fork/stefansundin/master

Menu

Explore Projects Groups Snippets