0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

Ox.loadFile -> Ox.getFile

Browse source
This commit is contained in:
rolux 2012-06-17 15:37:21 +02:00
parent 77adfbf7b8
commit 8d8e087e3d
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/Ox.UI/Ox.UI.js
View file

@ -96,7 +96,7 @@ Ox.load.UI = function(options, callback) {
/* /*
// SVG transform performs worse than CSS transform // SVG transform performs worse than CSS transform
var src = Ox.PATH + 'Ox.UI/themes/' + options.theme + '/svg/symbolLoadingAnimated.svg' var src = Ox.PATH + 'Ox.UI/themes/' + options.theme + '/svg/symbolLoadingAnimated.svg'
Ox.loadFile(src, function() { Ox.getFile(src, function() {
Ox.$('<img>') Ox.$('<img>')
.attr({ .attr({
src: src src: src
@ -116,7 +116,7 @@ Ox.load.UI = function(options, callback) {
var deg = 0, var deg = 0,
element, element,
src = Ox.PATH + 'Ox.UI/themes/' + options.theme + '/svg/symbolLoading.svg' src = Ox.PATH + 'Ox.UI/themes/' + options.theme + '/svg/symbolLoading.svg'
Ox.loadFile(src, function() { Ox.getFile(src, function() {
element = Ox.$('<img>') element = Ox.$('<img>')
.attr({ .attr({
src: src src: src
@ -156,7 +156,7 @@ Ox.load.UI = function(options, callback) {
isInternetExplorer ? browsers.pop() : browsers.shift(); isInternetExplorer ? browsers.pop() : browsers.shift();
browsers.forEach(function(browser) { browsers.forEach(function(browser) {
browser.src = Ox.PATH + 'Ox.UI/png/browser' + browser.name.replace(' ', '') + '128.png'; browser.src = Ox.PATH + 'Ox.UI/png/browser' + browser.name.replace(' ', '') + '128.png';
Ox.loadFile(browser.src, function() { Ox.getFile(browser.src, function() {
++counter == browsers.length && showIcons(); ++counter == browsers.length && showIcons();
}); });
}); });
@ -206,7 +206,7 @@ Ox.load.UI = function(options, callback) {
function loadFiles() { function loadFiles() {
Ox.loadFile(Ox.PATH + '/Ox.UI/jquery/jquery.js', function() { Ox.getFile(Ox.PATH + '/Ox.UI/jquery/jquery.js', function() {
initUI(); initUI();
Ox.getJSON(Ox.UI.PATH + 'json/Ox.UI.files.json?' + Ox.VERSION, function(files) { Ox.getJSON(Ox.UI.PATH + 'json/Ox.UI.files.json?' + Ox.VERSION, function(files) {
var promises = [], themes = {}; var promises = [], themes = {};
@ -220,7 +220,7 @@ Ox.load.UI = function(options, callback) {
dfd.resolve(); dfd.resolve();
}); });
} else { } else {
Ox.loadFile(Ox.PATH + file, function() { Ox.getFile(Ox.PATH + file, function() {
dfd.resolve(); dfd.resolve();
}); });
} }

2
source/Ox/js/Core.js
View file

@ -123,7 +123,7 @@ Ox.load = function() {
} }
length = Ox.len(modules); length = Ox.len(modules);
Ox.forEach(modules, function(options, module) { Ox.forEach(modules, function(options, module) {
Ox.loadFile( Ox.getFile(
Ox.PATH + 'Ox.' + module + '/Ox.' + module + '.js', Ox.PATH + 'Ox.' + module + '/Ox.' + module + '.js',
function() { function() {
Ox.load[module](options, function(s) { Ox.load[module](options, function(s) {