forked from 0x2620/oxjs
better Ox.documentReady
This commit is contained in:
parent
e7b870d3cb
commit
ecde8e7f87
6 changed files with 31 additions and 19 deletions
|
|
@ -43,6 +43,8 @@ Ox.load.UI = function(options, callback) {
|
|||
|
||||
function showScreen() {
|
||||
|
||||
console.log('showScreen')
|
||||
|
||||
var body = Ox.element('body'),
|
||||
css = {
|
||||
position: 'absolute',
|
||||
|
|
@ -154,10 +156,17 @@ Ox.load.UI = function(options, callback) {
|
|||
Ox.loadFile(Ox.PATH + 'js/jquery/jquery.js', function() {
|
||||
initUI();
|
||||
$.getJSON(Ox.PATH + 'json/Ox.UI.json', function(files) {
|
||||
var counter = 0;
|
||||
var promises = [];
|
||||
files.forEach(function(file) {
|
||||
var dfd = new $.Deferred();
|
||||
Ox.loadFile(Ox.PATH + file, function() {
|
||||
++counter == files.length && Ox.documentReady(function() {
|
||||
dfd.resolve();
|
||||
});
|
||||
promises.push(dfd.promise())
|
||||
});
|
||||
$.when.apply(null, promises)
|
||||
.done(function() {
|
||||
$(function() {
|
||||
var $div;
|
||||
Ox.Theme(options.theme);
|
||||
if (browserSupported && options.showScreen && options.hideScreen) {
|
||||
|
|
@ -171,8 +180,10 @@ Ox.load.UI = function(options, callback) {
|
|||
}
|
||||
callback(browserSupported);
|
||||
});
|
||||
})
|
||||
.fail(function() {
|
||||
throw new Error('File not found.')
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue