sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

Ox -> Ox.UI

Browse source
This commit is contained in:
rlx 2014-09-26 14:31:20 +02:00
commit 552aba4271
17 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@ Ox.LoadingIcon = function(options, self) {
.options(options || {})
.addClass('OxLoadingIcon')
.attr({
src: Ox.getImageURL(
src: Ox.UI.getImageURL(
'symbolLoading',
self.options.video ? 'videoIcon' : null
)

12
source/Ox.UI/js/Core/Theme.js
View file

@ -99,7 +99,7 @@ Ox.Theme = (function() {
$('.OxColor').each(function() {
var $element = $(this);
if ($element.hasClass('OxColorName')) {
$element.attr({src: Ox.getImageURL(
$element.attr({src: Ox.UI.getImageURL(
$element.data('OxImage'), $element.data('OxColor'), theme
)});
} else {
@ -119,9 +119,9 @@ Ox.Theme = (function() {
$('img').add('input[type="image"]').not('.OxColor')
.each(function(element) {
var $element = $(this),
data = Ox.getImageData($element.attr('src'));
data = Ox.UI.getImageData($element.attr('src'));
data && $element.attr({
src: Ox.getImageURL(data.name, data.color, theme)
src: Ox.UI.getImageURL(data.name, data.color, theme)
});
});
}
@ -134,7 +134,7 @@ Ox.Theme = (function() {
() -> [s] Theme names
@*/
that.getThemes = function() {
return Object.keys(Ox.THEMES);
return Object.keys(Ox.UI.THEMES);
};
/*@
@ -143,7 +143,7 @@ Ox.Theme = (function() {
theme <s> Theme name
@*/
that.getThemeData = function(theme) {
return Ox.THEMES[theme || Ox.Theme()];
return Ox.UI.THEMES[theme || Ox.Theme()];
};
/*@
@ -183,7 +183,7 @@ Ox.Theme = (function() {
that.getColorImage = function(name, value, tooltip) {
return (tooltip ? Ox.Element({element: '<img>', tooltip: tooltip}) : $('<img>'))
.addClass('OxColor OxColorName')
.attr({src: Ox.getImageURL(name, value)})
.attr({src: Ox.UI.getImageURL(name, value)})
.data({OxColor: value, OxImage: name});
};

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

@ -82,7 +82,7 @@ Ox.getImageURL = Ox.UI.getImageURL = Ox.cache(function(name, color, theme) {
'#FF0000': 'symbolWarningColor'
}
},
image = Ox.IMAGES[name],
image = Ox.UI.IMAGES[name],
themeData,
type = Ox.toDashes(name).split('-')[0];
color = color || 'default';