From 8d8e087e3d1c86b4d1ebb7c710f05756e7244125 Mon Sep 17 00:00:00 2001 From: rolux Date: Sun, 17 Jun 2012 15:37:21 +0200 Subject: [PATCH] Ox.loadFile -> Ox.getFile --- source/Ox.UI/Ox.UI.js | 10 +++++----- source/Ox/js/Core.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/Ox.UI/Ox.UI.js b/source/Ox.UI/Ox.UI.js index 55d3a52e..0b791deb 100644 --- a/source/Ox.UI/Ox.UI.js +++ b/source/Ox.UI/Ox.UI.js @@ -96,7 +96,7 @@ Ox.load.UI = function(options, callback) { /* // SVG transform performs worse than CSS transform var src = Ox.PATH + 'Ox.UI/themes/' + options.theme + '/svg/symbolLoadingAnimated.svg' - Ox.loadFile(src, function() { + Ox.getFile(src, function() { Ox.$('') .attr({ src: src @@ -116,7 +116,7 @@ Ox.load.UI = function(options, callback) { var deg = 0, element, src = Ox.PATH + 'Ox.UI/themes/' + options.theme + '/svg/symbolLoading.svg' - Ox.loadFile(src, function() { + Ox.getFile(src, function() { element = Ox.$('') .attr({ src: src @@ -156,7 +156,7 @@ Ox.load.UI = function(options, callback) { isInternetExplorer ? browsers.pop() : browsers.shift(); browsers.forEach(function(browser) { 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(); }); }); @@ -206,7 +206,7 @@ Ox.load.UI = function(options, callback) { function loadFiles() { - Ox.loadFile(Ox.PATH + '/Ox.UI/jquery/jquery.js', function() { + Ox.getFile(Ox.PATH + '/Ox.UI/jquery/jquery.js', function() { initUI(); Ox.getJSON(Ox.UI.PATH + 'json/Ox.UI.files.json?' + Ox.VERSION, function(files) { var promises = [], themes = {}; @@ -220,7 +220,7 @@ Ox.load.UI = function(options, callback) { dfd.resolve(); }); } else { - Ox.loadFile(Ox.PATH + file, function() { + Ox.getFile(Ox.PATH + file, function() { dfd.resolve(); }); } diff --git a/source/Ox/js/Core.js b/source/Ox/js/Core.js index a276615b..204ac411 100644 --- a/source/Ox/js/Core.js +++ b/source/Ox/js/Core.js @@ -123,7 +123,7 @@ Ox.load = function() { } length = Ox.len(modules); Ox.forEach(modules, function(options, module) { - Ox.loadFile( + Ox.getFile( Ox.PATH + 'Ox.' + module + '/Ox.' + module + '.js', function() { Ox.load[module](options, function(s) {