fix Ox.App in Firefox 3.6 to show loading screen, fixes #393
This commit is contained in:
parent
1a6da64b6b
commit
f919d64044
3 changed files with 9 additions and 6 deletions
|
@ -47,7 +47,8 @@ Ox.API = function(options, callback) {
|
|||
Ox.forEach(result.data.actions, function(val, key) {
|
||||
that[key] = function(/*data, age, callback*/) {
|
||||
var data = {}, age = -1, callback = null;
|
||||
Ox.forEach(arguments, function(argument) {
|
||||
//Ox.makeArray required for Firefox 3.6 because Ox.isArguments fails
|
||||
Ox.forEach(Ox.makeArray(arguments), function(argument) {
|
||||
if (Ox.isObject(argument)) {
|
||||
data = argument;
|
||||
} else if (Ox.isNumber(argument)) {
|
||||
|
|
|
@ -81,11 +81,12 @@ window.Ox = {
|
|||
}
|
||||
|
||||
function loadScript(script, callback) {
|
||||
var element = document.createElement('script');
|
||||
var element = document.createElement('script'),
|
||||
head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
|
||||
element.onload = callback;
|
||||
element.src = path + script + '?' + parseInt(Math.random() * 1000000);
|
||||
element.type = 'text/javascript';
|
||||
document.head.appendChild(element);
|
||||
head.appendChild(element);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -68,6 +68,7 @@ Ox.loadFile = (function() {
|
|||
var cache = {};
|
||||
return function (file, callback) {
|
||||
var element,
|
||||
head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement,
|
||||
request,
|
||||
type = file.split('.').pop(),
|
||||
isImage = type != 'css' && type != 'js';
|
||||
|
@ -94,7 +95,7 @@ Ox.loadFile = (function() {
|
|||
element.onload = addFileToCache;
|
||||
}
|
||||
}
|
||||
document.head.appendChild(element);
|
||||
head.appendChild(element);
|
||||
} else {
|
||||
addFileToCache();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue