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

Ox -> Ox.UI

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

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

@ -247,14 +247,14 @@ Ox.load.UI = function(options, callback) {
});
}
length = data.files.length;
Ox.IMAGES = data.images;
Ox.THEMES = {};
Ox.UI.IMAGES = data.images;
Ox.UI.THEMES = {};
data.files.forEach(function(file) {
path = Ox.PATH + file + '?' + Ox.VERSION;
if (/\.jsonc$/.test(file)) {
Ox.getJSONC(path, function(data) {
var theme = /\/themes\/(\w+)\/json\//.exec(file)[1];
Ox.THEMES[theme] = data;
Ox.UI.THEMES[theme] = data;
++counter == length && initUI();
});
} else {

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

@ -145,8 +145,8 @@ Ox.DocPage = function(options, self) {
Ox.$('<img>')
.attr({
src: isExpanded
? Ox.getImageURL('symbolDown')
: Ox.getImageURL('symbolRight')
? Ox.UI.getImageURL('symbolDown')
: Ox.UI.getImageURL('symbolRight')
})
.css({
width: '12px',
@ -156,11 +156,11 @@ Ox.DocPage = function(options, self) {
.on({
click: function() {
var $this = $(this),
isExpanded = $this.attr('src') == Ox.getImageURL('symbolRight');
isExpanded = $this.attr('src') == Ox.UI.getImageURL('symbolRight');
$this.attr({
src: isExpanded
? Ox.getImageURL('symbolDown')
: Ox.getImageURL('symbolRight')
? Ox.UI.getImageURL('symbolDown')
: Ox.UI.getImageURL('symbolRight')
});
$('.' + className).each(function() {
var $this = $(this), isHidden = false;

4
source/Ox.UI/js/Code/DocPanel.js
View file

@ -197,7 +197,7 @@ Ox.DocPanel = function(options, self) {
self.options.showTooltips ? getTooltip(results) : null
);
} else if (!Ox.endsWith(id, '/')) {
$icon = $('<img>').attr({src: Ox.getImageURL('symbolCenter')});
$icon = $('<img>').attr({src: Ox.UI.getImageURL('symbolCenter')});
}
return $icon;
}
@ -293,7 +293,7 @@ Ox.DocPanel = function(options, self) {
expanded: self.options.expanded,
icon: self.options.showTests
? getIcon
: Ox.getImageURL('symbolCenter'),
: Ox.UI.getImageURL('symbolCenter'),
items: treeItems,
selected: self.options.selected ? [self.options.selected] : '',
width: self.options.size

2
source/Ox.UI/js/Code/ExamplePanel.js
View file

@ -75,7 +75,7 @@ Ox.ExamplePanel = function(options, self) {
});
self.$list = Ox.TreeList({
expanded: true,
icon: Ox.getImageURL('symbolCenter'),
icon: Ox.UI.getImageURL('symbolCenter'),
items: treeItems,
selected: self.options.selected ? [self.options.selected] : [],
width: self.options.size

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';

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

@ -152,7 +152,7 @@ Ox.Button = function(options, self) {
function setTitle() {
if (self.options.type == 'image') {
that.attr({
src: Ox.getImageURL(
src: Ox.UI.getImageURL(
'symbol' + self.options.title[0].toUpperCase()
+ self.options.title.slice(1),
self.options.style == 'overlay' ? 'overlay' + (

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

@ -31,7 +31,7 @@ Ox.FormPanel = function(options, self) {
format: function(value) {
return $('<img>')
.attr({
src: Ox.getImageURL('symbolCheck')
src: Ox.UI.getImageURL('symbolCheck')
})
.css({
width: '10px',

2
source/Ox.UI/js/List/IconItem.js
View file

@ -46,7 +46,7 @@ Ox.IconItem = function(options, self) {
infoIsObject: Ox.isObject(self.options.info),
lineLength: self.options.itemWidth == 64 ? 15 : 23,
lines: self.options.itemWidth == 64 ? 4 : 5,
url: Ox.UI_PATH + 'png/transparent.png'
url: Ox.UI.PATH + 'png/transparent.png'
});
self.title = formatText(self.options.title, self.lines - 1 - self.infoIsObject, self.lineLength);

18
source/Ox.UI/js/List/TableList.js
View file

@ -253,7 +253,7 @@ Ox.TableList = function(options, self) {
tooltip: self.options.clearButtonTooltip
})
.addClass('OxClear')
.attr({src: Ox.getImageURL('symbolClose')})
.attr({src: Ox.UI.getImageURL('symbolClose')})
.css(Ox.UI.SCROLLBAR_SIZE == 16 ? {
paddingLeft: '4px',
paddingRight: '2px',
@ -467,7 +467,7 @@ Ox.TableList = function(options, self) {
if (column.titleImage) {
self.$titleImages[i] = $('<img>').
attr({
src: Ox.getImageURL(
src: Ox.UI.getImageURL(
'symbol' + Ox.toTitleCase(column.titleImage)
)
})
@ -478,7 +478,7 @@ Ox.TableList = function(options, self) {
if (column.operator) {
self.$orderImages[i] = $('<img>')
.attr({
src: Ox.getImageURL(
src: Ox.UI.getImageURL(
'symbol' + (column.operator == '+' ? 'Up' : 'Down'),
'selected'
)
@ -909,7 +909,7 @@ Ox.TableList = function(options, self) {
});
if (self.visibleColumns[pos].titleImage) {
self.$titleImages[pos].attr({
src: Ox.getImageURL(
src: Ox.UI.getImageURL(
'symbol' + Ox.toTitleCase(self.visibleColumns[pos].titleImage),
isSelected ? 'selected' : ''
)
@ -950,16 +950,16 @@ Ox.TableList = function(options, self) {
// FIXME: not yet used
that.$body.find('img').each(function(i, element) {
var $element = $(element),
data = Ox.getImageData($element.attr('src'));
data = Ox.UI.getImageData($element.attr('src'));
if (data && data.color == 'selected') {
$element.attr({src: Ox.getImageURL(data.name, 'default')});
$element.attr({src: Ox.UI.getImageURL(data.name, 'default')});
}
});
that.$body.find('.OxSelected img').each(function(i, element) {
var $element = $(element),
data = Ox.getImageData($element.attr('src'));
data = Ox.UI.getImageData($element.attr('src'));
if (data && data.color == 'default') {
$element.attr({src: Ox.getImageURL(data.name, 'selected')});
$element.attr({src: Ox.UI.getImageURL(data.name, 'selected')});
}
});
}
@ -969,7 +969,7 @@ Ox.TableList = function(options, self) {
pos = getColumnPositionById(id);
if (pos > -1) {
self.$orderImages[pos].attr({
src: Ox.getImageURL(
src: Ox.UI.getImageURL(
'symbol' + (operator == '+' ? 'Up' : 'Down'),
'selected'
)

2
source/Ox.UI/js/List/TreeList.js
View file

@ -128,7 +128,7 @@ Ox.TreeList = function(options, self) {
$icon = $('<img>').attr({src: self.options.icon});
}
} else {
$icon = $('<img>').attr({src: Ox.getImageURL(
$icon = $('<img>').attr({src: Ox.UI.getImageURL(
'symbol' + (expanded ? 'Down' : 'Right')
)});
}

4
source/Ox.UI/js/Video/BlockVideoTimeline.js
View file

@ -81,7 +81,7 @@ Ox.BlockVideoTimeline = function(options, self) {
self.$positionMarker = Ox.$('<img>')
.attr({
src: Ox.getImageURL('markerPosition')
src: Ox.UI.getImageURL('markerPosition')
})
.addClass('OxMarkerPosition')
.appendTo(that);
@ -94,7 +94,7 @@ Ox.BlockVideoTimeline = function(options, self) {
self.$pointMarker[point] = Ox.$('<img>')
.addClass('OxMarkerPoint' + titlecase)
.attr({
src: Ox.getImageURL('marker' + titlecase)
src: Ox.UI.getImageURL('marker' + titlecase)
})
.appendTo(that);
setPointMarker(point);

8
source/Ox.UI/js/Video/LargeVideoTimeline.js
View file

@ -98,10 +98,10 @@ Ox.LargeVideoTimeline = function(options, self) {
setTimeout(function() {
var $cut = $('<img>')
.addClass('OxCut')
.attr({src: Ox.getImageURL('markerCut')}),
.attr({src: Ox.UI.getImageURL('markerCut')}),
$chapter = $('<img>')
.addClass('OxChapter')
.attr({src: Ox.getImageURL('markerChapter')}),
.attr({src: Ox.UI.getImageURL('markerChapter')}),
chapters = self.options.chapters.slice(1).map(function(chapter) {
return chapter.position;
});
@ -115,7 +115,7 @@ Ox.LargeVideoTimeline = function(options, self) {
self.$markerPosition = $('<img>')
.addClass('OxMarkerPosition')
.attr({src: Ox.getImageURL('markerPosition')})
.attr({src: Ox.UI.getImageURL('markerPosition')})
.appendTo(that);
setMarker();
@ -124,7 +124,7 @@ Ox.LargeVideoTimeline = function(options, self) {
var titlecase = Ox.toTitleCase(point);
self.$pointMarker[point] = $('<img>')
.addClass('OxMarkerPoint' + titlecase)
.attr({src: Ox.getImageURL('marker' + titlecase)})
.attr({src: Ox.UI.getImageURL('marker' + titlecase)})
.appendTo(self.$timeline);
setPointMarker(point);
});

4
source/Ox.UI/js/Video/SmallVideoTimeline.js
View file

@ -127,7 +127,7 @@ Ox.SmallVideoTimeline = function(options, self) {
self.$positionMarker = $('<img>')
.addClass('OxMarkerPosition')
.attr({
src: Ox.getImageURL('markerPosition')
src: Ox.UI.getImageURL('markerPosition')
})
.appendTo(that);
}
@ -140,7 +140,7 @@ Ox.SmallVideoTimeline = function(options, self) {
self.$pointMarker[point] = $('<img>')
.addClass('OxMarkerPoint' + titlecase)
.attr({
src: Ox.getImageURL('marker' + titlecase)
src: Ox.UI.getImageURL('marker' + titlecase)
})
.appendTo(that);
setPointMarker(point);

8
source/Ox.UI/js/Video/VideoPlayer.js
View file

@ -552,7 +552,7 @@ Ox.VideoPlayer = function(options, self) {
self.$playIcon = $('<img>')
.addClass('OxPlayIcon OxVideo')
.attr({
src: Ox.getImageURL('symbol' + (
src: Ox.UI.getImageURL('symbol' + (
self.options.paused ? 'Play' : 'Pause'
), 'videoIcon')
})
@ -572,7 +572,7 @@ Ox.VideoPlayer = function(options, self) {
})
.addClass('OxCensoredIcon OxVideo')
.attr({
src: Ox.getImageURL(
src: Ox.UI.getImageURL(
'symbol' + self.options.censoredIcon, 'videoIcon'
)
})
@ -609,7 +609,7 @@ Ox.VideoPlayer = function(options, self) {
self.$pointMarker[point][edge] = $('<img>')
.addClass('OxPointMarker OxPointMarker' + titleCase)
.attr({
src: Ox.getImageURL('marker' + titleCase)
src: Ox.UI.getImageURL('marker' + titleCase)
})
.appendTo(self.$videoContainer);
});
@ -2665,7 +2665,7 @@ Ox.VideoPlayer = function(options, self) {
function togglePlayIcon() {
self.$playIcon.attr({
src: Ox.getImageURL(
src: Ox.UI.getImageURL(
'symbol' + (self.options.paused ? 'Play' : 'Pause'
), 'videoIcon')
});

4
source/Ox.UI/js/Video/VideoPlayerMenu.js
View file

@ -24,7 +24,7 @@ Ox.VideoPlayerMenu = function(options, self) {
return $item.data().group == group;
}).forEach(function($item) {
$($item.children()[1]).attr({
src: Ox.getImageURL('symbol' + (
src: Ox.UI.getImageURL('symbol' + (
$item.data().id == id ? 'Check' : 'None'
))
});
@ -62,7 +62,7 @@ Ox.VideoPlayerMenu = function(options, self) {
}
$('<div>').html(item.title).appendTo($item);
$('<img>').attr({
src: Ox.getImageURL(
src: Ox.UI.getImageURL(
'symbol' + (item.checked ? 'Check' : 'None')
)
}).appendTo($item);