0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

fix load in IE8

Browse source
This commit is contained in:
j 2012-05-25 21:41:16 +00:00
parent 32602a2c47
commit c425ecd829
2 changed files with 61 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
static/js/pandora.js
View file

@ -33,6 +33,7 @@ appPanel
var animationInterval, var animationInterval,
debug = localStorage && localStorage['pandora.debug'], debug = localStorage && localStorage['pandora.debug'],
isMSIE = /MSIE/.test(navigator.userAgent),
theme = localStorage && localStorage['Ox.theme'] theme = localStorage && localStorage['Ox.theme']
&& JSON.parse(localStorage['Ox.theme']) || 'modern'; && JSON.parse(localStorage['Ox.theme']) || 'modern';
@ -64,19 +65,22 @@ appPanel
images.logo.style.width = width + 'px'; images.logo.style.width = width + 'px';
images.logo.style.height = height + 'px'; images.logo.style.height = height + 'px';
images.logo.style.margin = 'auto'; images.logo.style.margin = 'auto';
images.reflection = document.createElement('img'); if (!isMSIE) {
images.reflection.style.position = 'absolute'; images.reflection = document.createElement('img');
images.reflection.style.left = 0; images.reflection.style.position = 'absolute';
images.reflection.style.top = height + 'px'; images.reflection.style.left = 0;
images.reflection.style.right = 0; images.reflection.style.top = height + 'px';
images.reflection.style.bottom = 0; images.reflection.style.right = 0;
images.reflection.style.width = width + 'px'; images.reflection.style.bottom = 0;
images.reflection.style.height = height + 'px'; images.reflection.style.width = width + 'px';
images.reflection.style.margin = 'auto'; images.reflection.style.height = height + 'px';
images.reflection.style.MozTransform = 'scaleY(-1)'; images.reflection.style.margin = 'auto';
images.reflection.style.OTransform = 'scaleY(-1)'; images.reflection.style.MozTransform = 'scaleY(-1)';
images.reflection.style.WebkitTransform = 'scaleY(-1)'; images.reflection.style.MSTransform = 'scaleY(-1)';
images.reflection.src = '/static/png/logo.png'; images.reflection.style.OTransform = 'scaleY(-1)';
images.reflection.style.WebkitTransform = 'scaleY(-1)';
images.reflection.src = '/static/png/logo.png';
}
images.loadingIcon = document.createElement('img'); images.loadingIcon = document.createElement('img');
images.loadingIcon.setAttribute('id', 'loadingIcon'); images.loadingIcon.setAttribute('id', 'loadingIcon');
images.loadingIcon.style.position = 'absolute'; images.loadingIcon.style.position = 'absolute';
@ -95,24 +99,27 @@ appPanel
} }
function loadScreen(images) { function loadScreen(images) {
var gradient = document.createElement('div');
gradient.style.position = 'absolute'; if (!isMSIE) {
gradient.style.left = 0; var gradient = document.createElement('div');
gradient.style.top = '160px'; gradient.style.position = 'absolute';
gradient.style.right = 0; gradient.style.left = 0;
gradient.style.bottom = 0; gradient.style.top = '160px';
gradient.style.width = '320px'; gradient.style.right = 0;
gradient.style.height = '160px'; gradient.style.bottom = 0;
gradient.style.margin = 'auto'; gradient.style.width = '320px';
gradient.style.background = theme == 'classic' gradient.style.height = '160px';
? '-moz-linear-gradient(top, rgba(224, 224, 224, 0.75), rgba(224, 224, 224, 1), rgba(224, 224, 224, 1))' gradient.style.margin = 'auto';
: '-moz-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))'; gradient.style.background = theme == 'classic'
gradient.style.background = theme == 'classic' ? '-moz-linear-gradient(top, rgba(224, 224, 224, 0.75), rgba(224, 224, 224, 1), rgba(224, 224, 224, 1))'
? '-o-linear-gradient(top, rgba(224, 224, 224, 0.75), rgba(224, 224, 224, 1), rgba(224, 224, 224, 1))' : '-moz-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))';
: '-o-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))'; gradient.style.background = theme == 'classic'
gradient.style.background = theme == 'classic' ? '-o-linear-gradient(top, rgba(224, 224, 224, 0.75), rgba(224, 224, 224, 1), rgba(224, 224, 224, 1))'
? '-webkit-linear-gradient(top, rgba(224, 224, 224, 0.75), rgba(224, 224, 224, 1), rgba(224, 224, 224, 1))' : '-o-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))';
: '-webkit-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))'; gradient.style.background = theme == 'classic'
? '-webkit-linear-gradient(top, rgba(224, 224, 224, 0.75), rgba(224, 224, 224, 1), rgba(224, 224, 224, 1))'
: '-webkit-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))';
}
var loadingScreen = document.createElement('div'); var loadingScreen = document.createElement('div');
loadingScreen.setAttribute('id', 'loadingScreen'); loadingScreen.setAttribute('id', 'loadingScreen');
loadingScreen.className = 'OxScreen'; loadingScreen.className = 'OxScreen';
@ -123,12 +130,19 @@ appPanel
? 'rgb(224, 224, 224)' : 'rgb(32, 32, 32)'; ? 'rgb(224, 224, 224)' : 'rgb(32, 32, 32)';
loadingScreen.style.zIndex = '1002'; loadingScreen.style.zIndex = '1002';
loadingScreen.appendChild(images.logo); loadingScreen.appendChild(images.logo);
loadingScreen.appendChild(images.reflection); images.reflection && loadingScreen.appendChild(images.reflection);
loadingScreen.appendChild(gradient); gradient && loadingScreen.appendChild(gradient);
loadingScreen.appendChild(images.loadingIcon); loadingScreen.appendChild(images.loadingIcon);
document.body.style.margin = 0;
document.body.appendChild(loadingScreen); //FF3.6 document.body can be undefined here
startAnimation(); window.onload = function() {
document.body.style.margin = 0;
document.body.appendChild(loadingScreen);
startAnimation();
};
//IE8 does not call onload if already loaded before set
document.body && window.onload();
} }
function loadOxJS(callback) { function loadOxJS(callback) {
@ -136,7 +150,12 @@ appPanel
|| document.getElementsByTagName('head')[0] || document.getElementsByTagName('head')[0]
|| document.documentElement, || document.documentElement,
script = document.createElement('script'); script = document.createElement('script');
script.onload = callback; if (isMSIE) {
// fixme: find a way to check if css/js have loaded in msie
setTimeout(callback, 2500);
} else {
script.onload = callback;
}
script.src = '/static/oxjs/dev/Ox.js'; script.src = '/static/oxjs/dev/Ox.js';
script.type = 'text/javascript'; script.type = 'text/javascript';
head.appendChild(script); head.appendChild(script);
@ -177,7 +196,7 @@ appPanel
function loadPandoraFiles(callback) { function loadPandoraFiles(callback) {
var prefix = '/static/'; var prefix = '/static/';
if (localStorage && localStorage['pandora.debug']) { if (debug) {
Ox.getJSON(prefix + 'json/pandora.json?' + Ox.random(1000), function(files) { Ox.getJSON(prefix + 'json/pandora.json?' + Ox.random(1000), function(files) {
Ox.loadFile(files.map(function(file) { Ox.loadFile(files.map(function(file) {
return prefix + file; return prefix + file;
@ -312,9 +331,7 @@ appPanel
} }
function loadBrowserMessage() { function loadBrowserMessage() {
var browsers = [].concat(
var isMSIE = $.browser.msie,
browsers = [].concat(
isMSIE ? [{name: 'Chrome Frame', url: 'http://google.com/chromeframe/'}] : [], isMSIE ? [{name: 'Chrome Frame', url: 'http://google.com/chromeframe/'}] : [],
[ [
{name: 'Chrome', url: 'http://google.com/chrome/'}, {name: 'Chrome', url: 'http://google.com/chrome/'},
@ -326,8 +343,7 @@ appPanel
return Ox.PATH + 'Ox.UI/png/browser' + browser.name.replace(' ', '') + '128.png'; return Ox.PATH + 'Ox.UI/png/browser' + browser.name.replace(' ', '') + '128.png';
}), }),
$loadingScreen = $('#loadingScreen'); $loadingScreen = $('#loadingScreen');
Ox.loadFile(images, function() {
loadImages(images, function() {
var html = pandora.site.site.name var html = pandora.site.site.name
+ ' requires an up-to-date web browser. Please take a moment to ' + ' requires an up-to-date web browser. Please take a moment to '
+ ( + (
@ -385,16 +401,6 @@ appPanel
.appendTo($message); .appendTo($message);
}); });
function loadImages(images, callback) {
Ox.loadFile(images.shift(), function() {
if (images.length) {
loadImages(images, callback);
} else {
callback();
}
});
}
pandora.proceed = function() { pandora.proceed = function() {
$loadingScreen.animate({ $loadingScreen.animate({
opacity: 0 opacity: 0
@ -415,6 +421,7 @@ appPanel
deg = Math.round((deg + delta * 360) % 360 / 30) * 30; deg = Math.round((deg + delta * 360) % 360 / 30) * 30;
css = 'rotate(' + deg + 'deg)'; css = 'rotate(' + deg + 'deg)';
loadingIcon.style.MozTransform = css; loadingIcon.style.MozTransform = css;
loadingIcon.style.MSTransform = css;
loadingIcon.style.OTransform = css; loadingIcon.style.OTransform = css;
loadingIcon.style.WebkitTransform = css; loadingIcon.style.WebkitTransform = css;
}, 83); }, 83);

2
static/js/pandora/menu.js
View file

@ -332,7 +332,7 @@ pandora.ui.mainMenu = function() {
}); });
} else if (data.id == 'debug') { } else if (data.id == 'debug') {
if(pandora.localStorage('debug')) { if(pandora.localStorage('debug')) {
pandora.localStorage.delete('debug'); pandora.localStorage['delete']('debug');
} else { } else {
pandora.localStorage('debug', true); pandora.localStorage('debug', true);
} }