Skip to content
This repository has been archived by the owner on Oct 7, 2020. It is now read-only.

different animation effect #55

Open
wants to merge 1 commit into
base: refactor
Choose a base branch
from
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
8 changes: 5 additions & 3 deletions jquery.smartbanner.css

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

42 changes: 9 additions & 33 deletions jquery.smartbanner.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
*/
!function ($) {
var SmartBanner = function (options) {
this.origHtmlMargin = parseFloat($('html').css('margin-top')); // Get the original margin-top of the HTML element so we can take that into account
var options = $.extend({}, $.smartbanner.defaults, options);

this.os = options.force || this.detectOS();
Expand Down Expand Up @@ -159,8 +158,8 @@
.append('<a href="#" class="sb-close">&times;</a>')
.append($('<span class="sb-icon"></span>'))
.append($('<div class="sb-info">')
.append($('<strong>').text(this.title))
.append($('<span>').text(this.author))
.append($('<strong>').text(this.options.title))
.append($('<span>').text(this.options.author))
.append($('<span>').text(inStore))
)
.append($('<a class="sb-button">').attr('href', url)
Expand All @@ -176,12 +175,11 @@
} else{
$('#smartbanner').addClass('no-icon');
}

this.bannerHeight = $('#smartbanner').outerHeight() + 2;

if (this.scale > 1) {
$('#smartbanner')
.css('top', parseFloat($('#smartbanner').css('top')) * this.scale)
.css('height', parseFloat($('#smartbanner').css('height')) * this.scale)
.hide();
$('#smartbanner .sb-container')
Expand All @@ -190,7 +188,6 @@
.css('-moz-transform', 'scale('+this.scale+')')
.css('width', $(window).width() / this.scale);
}
$('#smartbanner').css('position', (this.options.layer) ? 'absolute' : 'static');
}

// Listen for click events
Expand All @@ -202,36 +199,25 @@
// Show smartbanner
SmartBanner.prototype.show = function() {
var banner = $('#smartbanner');
var top = this.origHtmlMargin + (this.bannerHeight * this.scale);
var speed = parseFloat(banner.css('transition-duration')) * 1000;

banner.stop();

if ($.support.transition) {
banner
.one($.support.transition.end, function() {
banner.addClass('shown');
})
.emulateTransitionEnd(speed)
.css('top', 0);

$('html')
.addClass('sb-animation')
.one($.support.transition.end, function() {
$('html').removeClass('sb-animation');
banner.addClass('shown').removeClass('showing');
})
.emulateTransitionEnd(speed)
.css('margin-top', top);
.addClass('showing');
} else {
banner.animate({top: 0}, { duration: speed, easing: 'swing' }).addClass('shown');
$('html').animate({marginTop: top}, { duration: speed, easing: 'swing' });
banner.animate({height: '78' * this.scale}, { duration: speed, easing: 'swing' }).addClass('shown');
}
}

// Hide smartbanner
SmartBanner.prototype.hide = function() {
var banner = $('#smartbanner');
var top = -1 * this.bannerHeight * this.scale;
var speed = parseFloat(banner.css('transition-duration')) * 1000;

banner.stop();
Expand All @@ -242,19 +228,9 @@
$('#smartbanner').remove();
})
.emulateTransitionEnd(speed)
.removeClass('shown')
.css('top', top);

$('html')
.addClass('sb-animation')
.one($.support.transition.end, function() {
$('html').css('margin-top', "").removeClass('sb-animation');
})
.emulateTransitionEnd(speed)
.css('margin-top', this.origHtmlMargin);
.removeClass('shown');
} else {
banner.animate({top: top}, { duration: speed, easing: 'swing' }).addClass('shown');
$('html').animate({marginTop: this.origHtmlMargin}, { duration: speed, easing: 'swing' });
banner.animate({height: 0}, { duration: speed, easing: 'swing' }).removeClass('shown');
}
}

Expand Down Expand Up @@ -369,7 +345,7 @@
!function ($) {
function transitionEnd() {
var el = document.createElement('smartbanner');

var transEndEventNames = {
WebkitTransition: 'webkitTransitionEnd',
MozTransition: 'transitionend',
Expand Down