Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ticket/218] Apply changes to prosilver portal_clock.js to subsilver2

Browse Source 
B3P-218
This commit is contained in:
Marc Alexander
2014-02-20 10:58:33 +01:00
parent e178f9c40f
commit e7c32ec1f0
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
styles/subsilver2/template/portal/modules/portal_clock.js
View File

@@ -20,9 +20,16 @@ phpbb.b3pFlipClock = function(identifierUp, identifierDown, val, type) {
var backIdUp = identifierUp.replace('-front-', '-back-'); var backIdUp = identifierUp.replace('-front-', '-back-');
var backIdDown = identifierDown.replace('-front-', '-back-'); var backIdDown = identifierDown.replace('-front-', '-back-');
var backPosition = $(backIdUp).css('background-position'); var backPosition = $(backIdUp).css('background-position');
var backPositionLength = backPosition.length; var backPositionLength;
var backY; var backY;
// Workaround for Internet Explorer bug
if (backPosition === undefined) {
backPosition = $(backIdUp).css('background-position-x') + ' ' + $(backIdUp).css('background-position-y');
}
backPositionLength = backPosition.length;
if (backPosition.substring(backPositionLength - 3, backPositionLength - 2) === '0') { if (backPosition.substring(backPositionLength - 3, backPositionLength - 2) === '0') {
backY = '0px'; backY = '0px';
} else { } else {
@@ -59,6 +66,12 @@ phpbb.b3pFlipClock = function(identifierUp, identifierDown, val, type) {
// now get the vertical offset of the bottom digit // now get the vertical offset of the bottom digit
backPosition = $(identifierDown).css('background-position'); backPosition = $(identifierDown).css('background-position');
// Workaround for Internet Explorer bug
if (backPosition === undefined) {
backPosition = $(identifierDown).css('background-position-x') + ' ' + $(identifierDown).css('background-position-y');
}
backPositionLength = backPosition.length; backPositionLength = backPosition.length;
if (backPosition.substring(backPositionLength - 3, backPositionLength - 2) === '0') { if (backPosition.substring(backPositionLength - 3, backPositionLength - 2) === '0') {
@@ -86,6 +99,7 @@ phpbb.b3pFlipClock = function(identifierUp, identifierDown, val, type) {
return; return;
} }
// Animate the top number flipping
$(identifierUp).animate({ $(identifierUp).animate({
height: '0px', height: '0px',
'margin-top': '21px' 'margin-top': '21px'
@@ -94,13 +108,20 @@ phpbb.b3pFlipClock = function(identifierUp, identifierDown, val, type) {
'duration': 150, 'duration': 150,
defaultEasing: 'easeInOutSine', defaultEasing: 'easeInOutSine',
'complete': function(){ 'complete': function(){
// Now animate the bottom number flipping
$(identifierDown).animate( $(identifierDown).animate(
{height: '20px'}, {height: '20px'},
{ {
'duration': 150, 'duration': 150,
defaultEasing: 'easeInOutSine', defaultEasing: 'easeInOutSine',
'complete': function(){ 'complete': function(){
$(backIdDown).css('background-position', $(identifierDown).css('background-position')); // For compatibility with IE8
if ($(identifierDown).css('background-position') !== undefined) {
$(backIdDown).css('background-position', $(identifierDown).css('background-position'));
} else {
$(backIdDown).css('background-position-x', $(identifierDown).css('background-position-x'));
$(backIdDown).css('background-position-y', $(identifierDown).css('background-position-y'));
}
$(identifierDown).css({ $(identifierDown).css({
'visibility': 'hidden', 'visibility': 'hidden',
'display': 'inline-block' 'display': 'inline-block'