Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion jquery-scrolltofixed-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 15 additions & 4 deletions jquery-scrolltofixed.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,14 @@
'top' : base.options.bottom == -1?getMarginTop():'',
'bottom' : base.options.bottom == -1?'':base.options.bottom,
'margin-left' : '0px'
}
};
if (!base.options.dontSetWidth){ cssOptions['width']=target.css('width'); };

target.css(cssOptions);

// fadeIn if fade option is set to true
if (base.options.fade) {target.fadeIn(300);}

target.addClass(base.options.baseClassName);

if (base.options.className) {
Expand All @@ -182,10 +185,18 @@
'left' : left,
'margin-left' : '0px',
'bottom' : ''
}
};
if (!base.options.dontSetWidth){ cssOptions['width']=target.css('width'); };

target.css(cssOptions);
// fadeOut if fade option is set to true
if (base.options.fade) {
//Ensure fade out occurs prior to modifying css
target.fadeOut(300, function(){
target.css(cssOptions);
});
} else {
target.css(cssOptions);
}

position = 'absolute';
}
Expand Down Expand Up @@ -248,7 +259,7 @@
// Checks to see if we need to do something based on new scroll position
// of the page.
function checkScroll() {
if (!$.isScrollToFixed(target) || target.is(':hidden')) return;
if (!$.isScrollToFixed(target) || (target.is(':hidden') && !base.options.fade)) return;
var wasReset = isReset;
var wasUnfixed = isUnfixed();

Expand Down