Skip to content

GD-2261: Allow overridden top values to support views with nested scrolling #2

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

Open
ryoe wants to merge 1 commit into
base: orange-function-patched-v3.2.5
Choose a base branch
from
Open

GD-2261: Allow overridden top values to support views with nested scrolling #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 19 additions & 7 deletions vendor/assets/javascripts/foundation/jquery.foundation.reveal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,15 @@
* @type {Function}
* @default function(){}
*/
closed: $.noop
closed: $.noop,
/**
* Override the calculated inline CSS value for the modal's 'top'.
*
* @property overrideTop
* @type {Integer}
* @default undefined
*/
overrideTop: undefined
}
;
//
Expand Down Expand Up @@ -302,7 +310,8 @@
//
// Set the 'top' property to the document scroll minus the calculated top offset.
//
cssOpts.open.top = $doc.scrollTop() - topOffset;
var modalTop = options.overrideTop !== undefined ? options.overrideTop : $doc.scrollTop() - topOffset;
cssOpts.open.top = modalTop;
//
// Flip the opacity to 0.
//
Expand Down Expand Up @@ -362,7 +371,8 @@
// Yes, were executing 'fade'.
// Okay, let's set the modal properties.
//
cssOpts.open.top = $doc.scrollTop() + topMeasure;
var modalTop = options.overrideTop !== undefined ? options.overrideTop : $doc.scrollTop() + topMeasure;
cssOpts.open.top = modalTop;
//
// Flip the opacity to 0.
//
Expand Down Expand Up @@ -422,7 +432,8 @@
//
// Set the top property.
//
cssOpts.open.top = $doc.scrollTop() + topMeasure;
var modalTop = options.overrideTop !== undefined ? options.overrideTop : $doc.scrollTop() + topMeasure;
cssOpts.open.top = modalTop;
//
// Set the opacity property to full opacity, since we're not fading (animating).
//
Expand Down Expand Up @@ -491,11 +502,12 @@
//
// Yes, okay, let's set the animation properties.
//
var modalTop = options.overrideTop !== undefined ? options.overrideTop : $doc.scrollTop() - topOffset;
modal.animate( {
//
// Set the top property to the document scrollTop minus calculated topOffset.
//
"top": $doc.scrollTop() - topOffset + 'px',
"top": modalTop + 'px',
//
// Fade the modal out, by using the opacity property.
//
Expand Down Expand Up @@ -685,7 +697,7 @@
if (iframe.length > 0) {
iframe.data("src", iframe.attr("src"));
iframe.attr("src", "");
video.fadeOut(100);
video.fadeOut(100);
}
}

Expand Down Expand Up @@ -791,4 +803,4 @@

}; // end $.fn

} ( jQuery ) );
} ( jQuery ) );