From 252c9a33037a662321c16245636f60a490751730 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sun, 23 Jan 2011 00:59:30 +0530 Subject: [PATCH] use init request instead of site config --- build/js/ox.ui.js | 69 +++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/build/js/ox.ui.js b/build/js/ox.ui.js index f5a834b2..be23b803 100644 --- a/build/js/ox.ui.js +++ b/build/js/ox.ui.js @@ -222,42 +222,39 @@ requires }); userAgents.indexOf(userAgent) > -1 ? start() : stop(); function start() { - $.getJSON(self.options.config, function(data) { - var config = data; - //Ox.print('config', config); - document.title = config.site.name; - loadImages(function() { - that.api.api(function(result) { - $.each(result.data.actions, function(key, value) { - that.api[key] = function(data, callback) { - if (arguments.length == 1 && Ox.isFunction(data)) { - callback = data; - data = {}; - } - return Ox.Request.send($.extend({ - url: self.options.apiURL, - data: { - action: key, - data: JSON.stringify(data) - }, - callback: callback - }, !value.cache ? {age: 0}: {})); - }; - }); - that.api[self.options.init](getUserData(), function(data) { - var user = data.data.user; - $(function() { - var $div = $body.find('div'); - $body.find('img').remove(); - $div.animate({ - opacity: 0 - }, 1000, function() { - $div.remove(); - }); - callback({ - config: config, - user: user - }); + loadImages(function() { + that.api.api(function(result) { + $.each(result.data.actions, function(key, value) { + that.api[key] = function(data, callback) { + if (arguments.length == 1 && Ox.isFunction(data)) { + callback = data; + data = {}; + } + return Ox.Request.send($.extend({ + url: self.options.apiURL, + data: { + action: key, + data: JSON.stringify(data) + }, + callback: callback + }, !value.cache ? {age: 0}: {})); + }; + }); + that.api[self.options.init](getUserData(), function(data) { + var user = data.data.user, + config = data.data.config; + document.title = config.site.name; + $(function() { + var $div = $body.find('div'); + $body.find('img').remove(); + $div.animate({ + opacity: 0 + }, 1000, function() { + $div.remove(); + }); + callback({ + config: config, + user: user }); }); });