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

fixing loader

Browse source
This commit is contained in:
rolux 2011-04-25 11:33:39 +02:00
parent 6cfb6b7647
commit e7b870d3cb
4 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
demos/calendar/index.html
View file

@ -3,7 +3,7 @@
<head>
<title>ox.js calendar demo</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<script type="text/javascript" src="../../build/js/OxUI.js"></script>
<script type="text/javascript" src="../../build/js/Ox.js"></script>
<script type="text/javascript" src="js/calendar.js"></script>
</head>
<body></body>

2
demos/calendar/js/calendar.js
View file

@ -2,7 +2,7 @@ console.log('calling Ox.UI()')
//console.log('Ox =', Ox)
//console.log('Ox.UI =', Ox.UI)
Ox.UI({display: 'console', theme: 'modern'}, function() {
Ox.load('UI', {showScreen: true, theme: 'modern'}, function() {
console.log('running Ox.UI()')
//console.log('Ox =', Ox)

2
source/js/Ox.UI/Form/Ox.Input.js
View file

@ -211,7 +211,7 @@ Ox.Input = function(options, self) {
// probably better: divs in the background
if (self.options.type == 'textarea') {
$.extend(self, {
colors: Ox.theme() == 'classic' ?
colors: Ox.Theme() == 'classic' ?
[208, 232, 244] :
//[0, 16, 32],
[32, 48, 64],

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

@ -43,10 +43,7 @@ Ox.load.UI = function(options, callback) {
function showScreen() {
Ox.print('showScreen')
var body = Ox.element('body')
.addClass('OxTheme' + Ox.toTitleCase(options.theme)),
var body = Ox.element('body'),
css = {
position: 'absolute',
left: 0,
@ -77,8 +74,7 @@ Ox.load.UI = function(options, callback) {
browserSupported ? showIcon() : showWarning();
function showIcon() {
// fixme: directory should be 'Ox.UI. ...'
var src = Ox.PATH + 'svg/ox.ui.' + options.theme + '/symbolLoading.svg'
var src = Ox.PATH + 'svg/Ox.UI.' + options.theme + '/symbolLoading.svg'
Ox.loadFile(src, function() {
Ox.element('<img>')
.attr({
@ -163,7 +159,8 @@ Ox.load.UI = function(options, callback) {
Ox.loadFile(Ox.PATH + file, function() {
++counter == files.length && Ox.documentReady(function() {
var $div;
if (browserSupported && options.hideScreen) {
Ox.Theme(options.theme);
if (browserSupported && options.showScreen && options.hideScreen) {
$div = $('.OxLoadingScreen');
//$div.find('img').remove();
$div.animate({
@ -221,14 +218,10 @@ Ox.load.UI = function(options, callback) {
if (filename == 'symbolPlay.svg') {
filename = 'symbolRight.svg';
}
return Ox.UI.PATH + filename.split('.').pop() +
return Ox.PATH + filename.split('.').pop() +
'/Ox.UI.' + Ox.Theme() + '/' + filename;
};
Ox.UI.IMAGE_CACHE = [];
Ox.UI.ready = function(callback) {
}
Ox.UI.SCROLLBAR_SIZE = $.browser.mozilla ? 16 : 12;
// fixme: the follwing should be deprecated
Ox.UI.getBarSize = function(size) {