Ox -> Ox.UI

This commit is contained in:
rolux 2014-09-26 14:30:51 +02:00
parent bd190b4695
commit 3a764b38f9
11 changed files with 22 additions and 22 deletions

View file

@ -241,7 +241,7 @@ pandora.UI = (function() {
triggerEvents && Ox.forEach(trigger, function(val, key) { triggerEvents && Ox.forEach(trigger, function(val, key) {
Ox.Log('UI', 'TRIGGER ', key, val); Ox.Log('UI', 'TRIGGER ', key, val);
Ox.forEach(pandora.$ui, function($element) { Ox.forEach(pandora.$ui, function($element) {
if (Ox.isOxElement($element)) { if (Ox.UI.isElement($element)) {
$element.triggerEvent('pandora_' + key.toLowerCase(), { $element.triggerEvent('pandora_' + key.toLowerCase(), {
value: val, value: val,
previousValue: self.previousUI[key] previousValue: self.previousUI[key]

View file

@ -103,7 +103,7 @@ Ox.load('UI', {
} }
}) })
); );
Ox.hideScreen(); Ox.UI.hideScreen();
}); });
return that; return that;
}, },
@ -111,7 +111,7 @@ Ox.load('UI', {
var that = Ox.Element(); var that = Ox.Element();
pandora.user.ui.item = options.item; pandora.user.ui.item = options.item;
pandora.api.get({id: options.item, keys: videoKeys}, function(result) { pandora.api.get({id: options.item, keys: videoKeys}, function(result) {
Ox.hideScreen(); Ox.UI.hideScreen();
var data = getVideoOptions(result.data), var data = getVideoOptions(result.data),
ui = pandora.user.ui; ui = pandora.user.ui;
that.append(pandora.player = Ox.VideoTimelinePlayer({ that.append(pandora.player = Ox.VideoTimelinePlayer({

View file

@ -27,7 +27,7 @@ pandora.ui.folderBrowserList = function(id, section) {
/* /*
format: function() { format: function() {
return $('<img>').attr({ return $('<img>').attr({
src: Ox.getImageURL('symbolIcon') src: Ox.UI.getImageURL('symbolIcon')
}).css({ }).css({
width: '10px', width: '10px',
height: '10px', height: '10px',
@ -78,7 +78,7 @@ pandora.ui.folderBrowserList = function(id, section) {
format: function(value, data) { format: function(value, data) {
return $('<img>') return $('<img>')
.attr({ .attr({
src: Ox.getImageURL( src: Ox.UI.getImageURL(
value == 'static' ? 'symbolClick' value == 'static' ? 'symbolClick'
: value == 'smart' ? 'symbolFind' : value == 'smart' ? 'symbolFind'
: value == 'html' ? 'symbolFile' : value == 'html' ? 'symbolFile'
@ -110,7 +110,7 @@ pandora.ui.folderBrowserList = function(id, section) {
format: function(value) { format: function(value) {
return $('<img>') return $('<img>')
.attr({ .attr({
src: Ox.getImageURL( src: Ox.UI.getImageURL(
'symbol' + (id == 'favorite' ? 'Like' : 'Star') 'symbol' + (id == 'favorite' ? 'Like' : 'Star')
) )
}) })

View file

@ -88,7 +88,7 @@ pandora.ui.folderList = function(id, section) {
format: function(value, data) { format: function(value, data) {
return $('<img>') return $('<img>')
.attr({ .attr({
src: Ox.getImageURL( src: Ox.UI.getImageURL(
value == 'static' ? 'symbolClick' value == 'static' ? 'symbolClick'
: value == 'smart' ? 'symbolFind' : value == 'smart' ? 'symbolFind'
: value == 'html' ? 'symbolFile' : value == 'html' ? 'symbolFile'
@ -120,7 +120,7 @@ pandora.ui.folderList = function(id, section) {
var symbols = {personal: 'Publish', favorite: 'Like', featured: 'Star'}; var symbols = {personal: 'Publish', favorite: 'Like', featured: 'Star'};
return $('<img>') return $('<img>')
.attr({ .attr({
src: Ox.getImageURL( src: Ox.UI.getImageURL(
'symbol' + symbols[id] 'symbol' + symbols[id]
) )
}) })
@ -171,7 +171,7 @@ pandora.ui.folderList = function(id, section) {
{ {
format: function() { format: function() {
return $('<img>').attr({ return $('<img>').attr({
src: Ox.getImageURL('symbolVolume') src: Ox.UI.getImageURL('symbolVolume')
}).css({ }).css({
width: '10px', width: '10px',
height: '10px', height: '10px',
@ -206,7 +206,7 @@ pandora.ui.folderList = function(id, section) {
format: function(value, data) { format: function(value, data) {
return $('<img>') return $('<img>')
.attr({ .attr({
src: Ox.getImageURL(data.mounted ? 'symbolSync' : 'symbolEdit') src: Ox.UI.getImageURL(data.mounted ? 'symbolSync' : 'symbolEdit')
}) })
.css({ .css({
width: '10px', width: '10px',
@ -227,7 +227,7 @@ pandora.ui.folderList = function(id, section) {
format: function(value, data) { format: function(value, data) {
return $('<img>') return $('<img>')
.attr({ .attr({
src: Ox.getImageURL('symbolMount') src: Ox.UI.getImageURL('symbolMount')
}) })
.css({ .css({
width: '10px', width: '10px',

View file

@ -547,10 +547,10 @@ pandora.ui.list = function() {
// fixme: doesn't update title icon, passes useless options // fixme: doesn't update title icon, passes useless options
if (hasIcons()) { if (hasIcons()) {
if (ui.listView == 'list') { if (ui.listView == 'list') {
src = Ox.getImageURL( src = Ox.UI.getImageURL(
data.value == 'posters' ? 'symbolSetPoster' : 'symbolIcon' data.value == 'posters' ? 'symbolSetPoster' : 'symbolIcon'
); );
previousSrc = Ox.getImageURL( previousSrc = Ox.UI.getImageURL(
data.previousValue == 'posters' ? 'symbolSetPoster' : 'symbolIcon' data.previousValue == 'posters' ? 'symbolSetPoster' : 'symbolIcon'
); );
that.find('img[src="' + previousSrc + '"]').attr({src: src}); that.find('img[src="' + previousSrc + '"]').attr({src: src});

View file

@ -7,7 +7,7 @@ pandora.ui.loadingIcon = function() {
tooltip: Ox._('Click to reload {0}', [pandora.site.site.name]) tooltip: Ox._('Click to reload {0}', [pandora.site.site.name])
}, self) }, self)
.attr({ .attr({
src: Ox.getImageURL('symbolRedo') src: Ox.UI.getImageURL('symbolRedo')
}) })
.css(getCSS('stop')) .css(getCSS('stop'))
.bindEvent({ .bindEvent({
@ -23,7 +23,7 @@ pandora.ui.loadingIcon = function() {
if (!self.loadingInterval) { if (!self.loadingInterval) {
that.css(getCSS('start')) that.css(getCSS('start'))
.attr({ .attr({
src: Ox.getImageURL('symbolLoading') src: Ox.UI.getImageURL('symbolLoading')
}); });
that.superStart(); that.superStart();
} }
@ -34,7 +34,7 @@ pandora.ui.loadingIcon = function() {
that.superStop(function() { that.superStop(function() {
that.css(getCSS('stop')) that.css(getCSS('stop'))
.attr({ .attr({
src: Ox.getImageURL('symbolRedo') src: Ox.UI.getImageURL('symbolRedo')
}); });
}); });
} }

View file

@ -85,7 +85,7 @@ pandora.ui.mediaView = function(options) {
? 1 : 0; ? 1 : 0;
return $('<img>') return $('<img>')
.attr({ .attr({
src: Ox.getImageURL('symbol' + ({ src: Ox.UI.getImageURL('symbol' + ({
'available': 'Check', 'available': 'Check',
'encoding': 'Sync', 'encoding': 'Sync',
'failed': 'Warning', 'failed': 'Warning',

View file

@ -12,7 +12,7 @@ pandora.ui.printView = function(data) {
); );
$($loading.find('img')[0]).attr({ $($loading.find('img')[0]).attr({
src: Ox.getImageURL('symbolLoadingAnimated', null, 'oxlight') src: Ox.UI.getImageURL('symbolLoadingAnimated', null, 'oxlight')
}); });
Ox.$body.css({ Ox.$body.css({
background: 'rgb(255, 255, 255)', background: 'rgb(255, 255, 255)',

View file

@ -54,7 +54,7 @@ pandora.ui.tv = function() {
function play() { function play() {
var $loading = $('<img>') var $loading = $('<img>')
.attr({src: Ox.getImageURL('symbolLoadingAnimated')}) .attr({src: Ox.UI.getImageURL('symbolLoadingAnimated')})
.css({ .css({
position: 'absolute', position: 'absolute',
left: 0, top: 0, right: 0, bottom: 0, left: 0, top: 0, right: 0, bottom: 0,

View file

@ -101,7 +101,7 @@ pandora.ui.usersDialog = function() {
format: function(value, data) { format: function(value, data) {
return $('<img>') return $('<img>')
.attr({ .attr({
src: Ox.getImageURL('symbolCheck') src: Ox.UI.getImageURL('symbolCheck')
}) })
.css({ .css({
width: '10px', width: '10px',
@ -123,7 +123,7 @@ pandora.ui.usersDialog = function() {
format: function(value) { format: function(value) {
return $('<img>') return $('<img>')
.attr({ .attr({
src: Ox.getImageURL('symbolMail') src: Ox.UI.getImageURL('symbolMail')
}) })
.css({ .css({
width: '10px', width: '10px',

View file

@ -769,7 +769,7 @@ pandora.enableDragAndDrop = function($list, canMove, section) {
}) })
.append( .append(
$('<img>') $('<img>')
.attr({src: Ox.getImageURL(image)}) .attr({src: Ox.UI.getImageURL(image)})
.css({width: '16px', height: '16px'}) .css({width: '16px', height: '16px'})
) )
) )