Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16071 from edx/HarryRein/LEARNER-2471-safari-sock-issue

Browse Source 
Fixing sock issue on master in safari.
This commit is contained in:
Harry Rein
2017-09-22 13:09:54 -04:00
committed by GitHub
parent 3088c70f25 2fa8fa2249
commit 75c22f563b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openedx/features/course_experience/static/course_experience/js/CourseSock.js
View File

@@ -5,6 +5,7 @@ export class CourseSock { // eslint-disable-line import/prefer-default-export
const $toggleActionButton = $('.action-toggle-verification-sock'); const $toggleActionButton = $('.action-toggle-verification-sock');
const $verificationSock = $('.verification-sock .verification-main-panel'); const $verificationSock = $('.verification-sock .verification-main-panel');
const $upgradeToVerifiedButton = $('.verification-sock .action-upgrade-certificate'); const $upgradeToVerifiedButton = $('.verification-sock .action-upgrade-certificate');
const $miniCert = $('.mini-cert');
const pageLocation = window.location.href.indexOf('courseware') > -1 const pageLocation = window.location.href.indexOf('courseware') > -1
? 'Course Content Page' : 'Home Page'; ? 'Course Content Page' : 'Home Page';
@@ -20,18 +21,17 @@ export class CourseSock { // eslint-disable-line import/prefer-default-export
const endFixed = (startFixed + $verificationSock.height()) - 220; const endFixed = (startFixed + $verificationSock.height()) - 220;
// Ensure update button stays in sock even when max-width is exceeded // Ensure update button stays in sock even when max-width is exceeded
const distLeft = ($verificationSock.offset().left + $verificationSock.width()) const distRight = window.outerWidth - ($miniCert.offset().left + $miniCert.width());
- ($upgradeToVerifiedButton.width() + 22);
// Update positioning when scrolling is in fixed window and screen width is sufficient // Update positioning when scrolling is in fixed window and screen width is sufficient
if ((documentBottom > startFixed && documentBottom < endFixed) if ((documentBottom > startFixed && documentBottom < endFixed)
|| $(window).width() < 960) { || $(window).width() < 960) {
$upgradeToVerifiedButton.addClass('attached'); $upgradeToVerifiedButton.addClass('attached');
$upgradeToVerifiedButton.css('left', `${distLeft}px`); $upgradeToVerifiedButton.css('right', `${distRight}px`);
} else { } else {
// If outside sliding window, reset to un-attached state // If outside sliding window, reset to un-attached state
$upgradeToVerifiedButton.removeClass('attached'); $upgradeToVerifiedButton.removeClass('attached');
$upgradeToVerifiedButton.css('left', 'auto'); $upgradeToVerifiedButton.css('right', '20px');
// Add class to define absolute location // Add class to define absolute location
if (documentBottom < startFixed) { if (documentBottom < startFixed) {