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

update pandora.js

Browse source
This commit is contained in:
rolux 2012-06-30 11:56:58 +00:00
parent 28ac401988
commit 7e5ef95229
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
static/js/pandora.js
View file

@ -31,7 +31,8 @@ appPanel
}; };
var animationInterval, var animationInterval,
debug = localStorage && localStorage['pandora.debug'], enableDebugMode = localStorage && localStorage['pandora.enableDebugMode'],
enableEventLogging = localStorage && localStorage['pandora.enableEventLogging'],
isMSIE = /MSIE/.test(navigator.userAgent), 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';
@ -86,7 +87,7 @@ appPanel
images.loadingIcon.style.width = '32px'; images.loadingIcon.style.width = '32px';
images.loadingIcon.style.height = '32px'; images.loadingIcon.style.height = '32px';
images.loadingIcon.style.margin = 'auto'; images.loadingIcon.style.margin = 'auto';
images.loadingIcon.src = '/static/oxjs/' + (debug ? 'dev' : 'build') images.loadingIcon.src = '/static/oxjs/' + (enableDebugMode ? 'dev' : 'build')
+ '/Ox.UI/themes/' + theme + '/svg/symbolLoading.svg'; + '/Ox.UI/themes/' + theme + '/svg/symbolLoading.svg';
callback(images); callback(images);
}; };
@ -129,13 +130,13 @@ appPanel
gradient && loadingScreen.appendChild(gradient); gradient && loadingScreen.appendChild(gradient);
loadingScreen.appendChild(images.loadingIcon); loadingScreen.appendChild(images.loadingIcon);
//FF3.6 document.body can be undefined here // FF3.6 document.body can be undefined here
window.onload = function() { window.onload = function() {
document.body.style.margin = 0; document.body.style.margin = 0;
document.body.appendChild(loadingScreen); document.body.appendChild(loadingScreen);
startAnimation(); startAnimation();
}; };
//IE8 does not call onload if already loaded before set // IE8 does not call onload if already loaded before set
document.body && window.onload(); document.body && window.onload();
} }
@ -151,7 +152,7 @@ appPanel
} else { } else {
script.onload = callback; script.onload = callback;
} }
script.src = '/static/oxjs/' + (debug ? 'dev' : 'build') + '/Ox.js'; script.src = '/static/oxjs/' + (enableDebugMode ? 'dev' : 'build') + '/Ox.js';
script.type = 'text/javascript'; script.type = 'text/javascript';
head.appendChild(script); head.appendChild(script);
} }
@ -175,6 +176,7 @@ appPanel
ui: {} ui: {}
}); });
loadPandoraFiles(function() { loadPandoraFiles(function() {
enableEventLogging && Ox.Event.bind(pandora.logEvent);
initPandora(data); initPandora(data);
if (pandora.localStorage('local')) { if (pandora.localStorage('local')) {
var url = pandora.localStorage('local'); var url = pandora.localStorage('local');
@ -191,7 +193,7 @@ appPanel
function loadPandoraFiles(callback) { function loadPandoraFiles(callback) {
var prefix = '/static/'; var prefix = '/static/';
if (debug) { if (enableDebugMode) {
Ox.getJSON(prefix + 'json/pandora.json?' + Ox.random(1000), function(files) { Ox.getJSON(prefix + 'json/pandora.json?' + Ox.random(1000), function(files) {
Ox.getFile(files.map(function(file) { Ox.getFile(files.map(function(file) {
return prefix + file; return prefix + file;