Skip to content

issue fix #135 fadeIn() breaks initial opacity value #137

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

issue fix #135 fadeIn() breaks initial opacity value #137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
292fb28
issue fix #135 fadeIn() breaks initial opacity value
CezaryDanielNowak Nov 15, 2013
c5244b6
default jQuery easing function instead of hardcoded 'swing'
CezaryDanielNowak Nov 15, 2013
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
8 changes: 5 additions & 3 deletions scripts/src/jquery.animate-enhanced.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,8 @@ Changelog:

// deal with shortcuts
if (!parts && val == 'show') {
cleanStart = 1;
var defaultOpacity = e.css('opacity');
cleanStart = typeof defaultOpacity === 'undefined' || parseFloat(defaultOpacity) === 0 ? 1 : defaultOpacity;
if (hidden) e.css({'display': _domElementVisibleDisplayValue(e.context.tagName), 'opacity': 0});
} else if (!parts && val == "hide") {
cleanStart = 0;
Expand Down Expand Up @@ -673,6 +674,7 @@ Changelog:
return this[ optall.queue === true ? 'queue' : 'each' ](function() {
var self = jQuery(this),
opt = jQuery.extend({}, optall),
defEasing = jQuery.easing.def,
cssCallback = function(e) {
var selfCSSData = self.data(DATA_KEY) || { original: {} },
restore = {};
Expand Down Expand Up @@ -740,7 +742,7 @@ Changelog:
easeInOutBack: CUBIC_BEZIER_OPEN + '0.680, -0.550, 0.265, 1.550' + CUBIC_BEZIER_CLOSE
},
domProperties = {},
cssEasing = easings[opt.easing || 'swing'] ? easings[opt.easing || 'swing'] : opt.easing || 'swing';
cssEasing = easings[opt.easing || defEasing] ? easings[opt.easing || defEasing] : opt.easing || defEasing;

// seperate out the properties for the relevant animation functions
for (var p in prop) {
Expand Down Expand Up @@ -795,7 +797,7 @@ Changelog:
callbackQueue++;
originalAnimateMethod.apply(self, [domProperties, {
duration: opt.duration,
easing: jQuery.easing[opt.easing] ? opt.easing : (jQuery.easing.swing ? 'swing' : 'linear'),
easing: jQuery.easing[opt.easing] ? opt.easing : defEasing,
complete: propertyCallback,
queue: opt.queue
}]);
Expand Down