0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

cleanup; wording

Browse source
This commit is contained in:
rolux 2015-04-19 11:09:12 +02:00
parent 016240b6f8
commit 02552f3f83
4 changed files with 118 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
static/js/licenseDialog.js
View file

@ -6,6 +6,7 @@ pandora.ui.licenseDialog = function() {
var that = pandora.ui.iconDialog({ var that = pandora.ui.iconDialog({
buttons: [ buttons: [
Ox.Button({ Ox.Button({
disabled: true,
id: 'close', id: 'close',
title: Ox._('Close') title: Ox._('Close')
}) })
@ -20,8 +21,16 @@ pandora.ui.licenseDialog = function() {
+ 'Please contact your vendor for more information on ' + 'Please contact your vendor for more information on '
+ 'how to acquire a license or renew an expired one.' + 'how to acquire a license or renew an expired one.'
), ),
keys: {enter: 'close', escape: 'close'},
title: Ox._('License') title: Ox._('License')
})
.bindEvent({
open: function() {
setTimeout(function() {
that.enableButton('close');
}, 15000);
}
}); });
return that; return that;
}; };

20
static/js/pandora.js
View file

@ -202,7 +202,8 @@ appPanel
} else { } else {
script.onload = callback; script.onload = callback;
} }
script.src = '/static/oxjs/' + (enableDebugMode ? 'dev' : 'min') + '/Ox.js?' + getPandoraVersion(); script.src = '/static/oxjs/' + (enableDebugMode ? 'dev' : 'min')
+ '/Ox.js?' + getPandoraVersion();
script.type = 'text/javascript'; script.type = 'text/javascript';
head.appendChild(script); head.appendChild(script);
} }
@ -244,13 +245,18 @@ appPanel
function loadPandoraFiles(callback) { function loadPandoraFiles(callback) {
var prefix = '/static/'; var prefix = '/static/';
if (enableDebugMode) { if (enableDebugMode) {
Ox.getJSON(prefix + 'json/pandora.json?' + Ox.random(1000), function(files) { Ox.getJSON(
prefix + 'json/pandora.json?' + Ox.random(1000),
function(files) {
Ox.getFile(files.map(function(file) { Ox.getFile(files.map(function(file) {
return prefix + file + '?' + getPandoraVersion(); return prefix + file + '?' + getPandoraVersion();
}), callback); }), callback);
}); }
);
} else { } else {
Ox.getScript(prefix + 'js/pandora.min.js?' + getPandoraVersion(), callback); Ox.getScript(
prefix + 'js/pandora.min.js?' + getPandoraVersion(), callback
);
} }
} }
@ -296,7 +302,8 @@ appPanel
pandora.user.ui.itemView = pandora.site.user.ui.itemView; pandora.user.ui.itemView = pandora.site.user.ui.itemView;
} }
// patch theme ... this can be removed at a later point // patch theme ... this can be removed at a later point
pandora.user.ui.theme = legacyThemes[pandora.user.ui.theme] || pandora.user.ui.theme; pandora.user.ui.theme = legacyThemes[pandora.user.ui.theme]
|| pandora.user.ui.theme;
// make sure theme is valid // make sure theme is valid
if (!Ox.contains(pandora.site.themes, pandora.user.ui.theme)) { if (!Ox.contains(pandora.site.themes, pandora.user.ui.theme)) {
pandora.user.ui.theme = pandora.site.user.ui.theme; pandora.user.ui.theme = pandora.site.user.ui.theme;
@ -449,7 +456,8 @@ appPanel
] ]
), ),
images = browsers.map(function(browser) { images = browsers.map(function(browser) {
return Ox.PATH + 'UI/png/browser' + browser.name.replace(' ', '') + '128.png'; return Ox.PATH + 'UI/png/browser'
+ browser.name.replace(' ', '') + '128.png';
}), }),
$loadingScreen = $('#loadingScreen'); $loadingScreen = $('#loadingScreen');
Ox.getFile(images, function() { Ox.getFile(images, function() {

19
static/js/uploadVideoDialog.js
View file

@ -5,15 +5,18 @@ pandora.ui.uploadVideoDialog = function(data) {
var cancelled = false, var cancelled = false,
file, file,
hasFirefogg = !(typeof Firefogg == 'undefined') && ( hasFirefogg = !(Ox.isUndefined(Firefogg)) && (
$.browser.version < "35" || Firefogg().version >= 334), $.browser.version < '35' || Firefogg().version >= 334
itemView = pandora.site.capabilities.canSeeExtraItemViews[pandora.user.level] ? 'media' : 'info', ),
itemView = pandora.site.capabilities.canSeeExtraItemViews[pandora.user.level]
? 'media' : 'info',
selectFile, selectFile,
$actionButton, $actionButton,
$closeButton, $closeButton,
$content = Ox.Element().css({margin: '16px'}), $content = Ox.Element().css({margin: '16px'}),
$info = $('<div>').css({padding: '4px'}) $info = $('<div>')
.html(Ox._('Please select the video file you want to upload.')), .css({padding: '4px'})
.html(Ox._('Please select the video file that you want to upload.')),
$progress, $progress,
$status = $('<div>').css({padding: '4px', paddingTop: '8px'}), $status = $('<div>').css({padding: '4px', paddingTop: '8px'}),
that = Ox.Dialog({ that = Ox.Dialog({
@ -87,8 +90,8 @@ pandora.ui.uploadVideoDialog = function(data) {
$info.html(formatVideoInfo(info)); $info.html(formatVideoInfo(info));
$status.html( $status.html(
info.direct info.direct
? Ox._('Your video will be used directly.') ? Ox._('Your video will be uploaded directly.')
: Ox._('Your video will be transcoded.') : Ox._('Your video will be transcoded before uploading.')
); );
}); });
//$closeButton.options('title', Ox._('Cancel')); //$closeButton.options('title', Ox._('Cancel'));
@ -116,7 +119,7 @@ pandora.ui.uploadVideoDialog = function(data) {
$info.html(Ox._( $info.html(Ox._(
'You can only upload a video to an existing {0}.' 'You can only upload a video to an existing {0}.'
+ ' Please check if an entry for the {0}' + ' Please check if an entry for the {0}'
+ ' you want to upload exists and create otherwise.', + ' you want to upload exists, and create one otherwise.',
[pandora.site.itemName.singular.toLowerCase()] [pandora.site.itemName.singular.toLowerCase()]
)); ));
$actionButton.hide(); $actionButton.hide();

91
static/js/utils.js
View file

@ -135,7 +135,9 @@ pandora.addFolderItem = function(section) {
}; };
pandora.api.find({ pandora.api.find({
query: { query: {
conditions: [{key: 'list', value: newList, operator: '=='}], conditions: [
{key: 'list', value: newList, operator: '=='}
],
operator: '&' operator: '&'
}, },
keys: ['id', 'posterFrame'], keys: ['id', 'posterFrame'],
@ -148,9 +150,15 @@ pandora.addFolderItem = function(section) {
posterFrames = posterFrames.length == 1 posterFrames = posterFrames.length == 1
? Ox.repeat([posterFrames[0]], 4) ? Ox.repeat([posterFrames[0]], 4)
: posterFrames.length == 2 : posterFrames.length == 2
? [posterFrames[0], posterFrames[1], posterFrames[1], posterFrames[0]] ? [
posterFrames[0], posterFrames[1],
posterFrames[1], posterFrames[0]
]
: posterFrames.length == 3 : posterFrames.length == 3
? [posterFrames[0], posterFrames[1], posterFrames[2], posterFrames[0]] ? [
posterFrames[0], posterFrames[1],
posterFrames[2], posterFrames[0]
]
: posterFrames; : posterFrames;
setPosterFrames(newList, posterFrames); setPosterFrames(newList, posterFrames);
}); });
@ -189,7 +197,9 @@ pandora.addFolderItem = function(section) {
.editCell(newList, 'name', true); .editCell(newList, 'name', true);
pandora.UI.set(isItems ? { pandora.UI.set(isItems ? {
find: { find: {
conditions: [{key: 'list', value: newList, operator: '=='}], conditions: [
{key: 'list', value: newList, operator: '=='}
],
operator: '&' operator: '&'
} }
} : { } : {
@ -226,9 +236,13 @@ pandora.addText = function(options) {
} }
pandora.beforeUnloadWindow = function() { pandora.beforeUnloadWindow = function() {
if (pandora.firefogg) if (pandora.firefogg) {
return Ox._("Encoding is currently running\nDo you want to leave this page?"); return Ox._(
//prevent error dialogs on unload 'Encoding is currently running. '
+ 'Are you sure that you want to leave this page?'
);
}
// Prevent error dialogs on unload
pandora.isUnloading = true; pandora.isUnloading = true;
}; };
@ -524,9 +538,7 @@ pandora.enableDragAndDrop = function($list, canMove, section, getItems) {
section = section || pandora.user.ui.section; section = section || pandora.user.ui.section;
var $tooltip = Ox.Tooltip({ var $tooltip = Ox.Tooltip({animate: false}),
animate: false
}),
drag = {}, drag = {},
scrollInterval; scrollInterval;
@ -636,7 +648,6 @@ pandora.enableDragAndDrop = function($list, canMove, section, getItems) {
} }
}, },
draganddropend: function(data) { draganddropend: function(data) {
Ox.Log('', data, drag, '------------');
canMove && Ox.$window.off({ canMove && Ox.$window.off({
keydown: keydown, keydown: keydown,
keyup: keyup keyup: keyup
@ -770,7 +781,9 @@ pandora.enableDragAndDrop = function($list, canMove, section, getItems) {
width: '16px', width: '16px',
height: '16px', height: '16px',
padding: '2px', padding: '2px',
border: '2px solid rgb(' + Ox.Theme.getThemeData().symbolDefaultColor.join(', ') + ')', border: '2px solid rgb('
+ Ox.Theme.getThemeData().symbolDefaultColor.join(', ')
+ ')',
borderRadius: '12px', borderRadius: '12px',
margin: '3px 2px 2px 2px' margin: '3px 2px 2px 2px'
}) })
@ -811,6 +824,7 @@ pandora.enableDragAndDrop = function($list, canMove, section, getItems) {
$tooltip.options({title: getTitle()}).show(); $tooltip.options({title: getTitle()}).show();
} }
} }
function keyup(e) { function keyup(e) {
if (drag.action == 'move') { if (drag.action == 'move') {
drag.action = 'copy'; drag.action = 'copy';
@ -822,12 +836,17 @@ pandora.enableDragAndDrop = function($list, canMove, section, getItems) {
pandora.enterFullscreen = function() { pandora.enterFullscreen = function() {
pandora.$ui.appPanel.size(0, 0); pandora.$ui.appPanel.size(0, 0);
pandora.user.ui.showSidebar && pandora.$ui.mainPanel.size(0, 0); if (pandora.user.ui.showSidebar) {
pandora.$ui.mainPanel.size(0, 0);
}
pandora.$ui.rightPanel.size(0, 0).size(2, 0); pandora.$ui.rightPanel.size(0, 0).size(2, 0);
!pandora.user.ui.showBrowser && pandora.$ui.contentPanel.css({ if (pandora.user.ui.showBrowser) {
pandora.$ui.contentPanel.size(0, 0);
} else {
pandora.$ui.contentPanel.css({
top: (-112 - Ox.UI.SCROLLBAR_SIZE) + 'px' // fixme: rightPanel.size(0, 0) doesn't preserve negative top of browser top: (-112 - Ox.UI.SCROLLBAR_SIZE) + 'px' // fixme: rightPanel.size(0, 0) doesn't preserve negative top of browser
}); });
pandora.user.ui.showBrowser && pandora.$ui.contentPanel.size(0, 0); }
pandora.$ui.player.options({ pandora.$ui.player.options({
height: pandora.$document.height() - 2, height: pandora.$document.height() - 2,
width: pandora.$document.width() - 2 width: pandora.$document.width() - 2
@ -836,12 +855,17 @@ pandora.enterFullscreen = function() {
pandora.exitFullscreen = function() { pandora.exitFullscreen = function() {
pandora.$ui.appPanel.size(0, 20); pandora.$ui.appPanel.size(0, 20);
pandora.user.ui.showSidebar && pandora.$ui.mainPanel.size(0, pandora.user.ui.sidebarSize); if (pandora.user.ui.showSidebar) {
pandora.$ui.mainPanel.size(0, pandora.user.ui.sidebarSize);
}
pandora.$ui.rightPanel.size(0, 24).size(2, 16); pandora.$ui.rightPanel.size(0, 24).size(2, 16);
!pandora.user.ui.showBrowser && pandora.$ui.contentPanel.css({ if (pandora.user.ui.showBrowser) {
pandora.$ui.contentPanel.size(0, 112 + Ox.UI.SCROLLBAR_SIZE);
} else {
pandora.$ui.contentPanel.css({
top: 24 + (-112 - Ox.UI.SCROLLBAR_SIZE) + 'px' // fixme: rightPanel.size(0, 0) doesn't preserve negative top of browser top: 24 + (-112 - Ox.UI.SCROLLBAR_SIZE) + 'px' // fixme: rightPanel.size(0, 0) doesn't preserve negative top of browser
}); });
pandora.user.ui.showBrowser && pandora.$ui.contentPanel.size(0, 112 + Ox.UI.SCROLLBAR_SIZE); }
}; };
pandora.getAllItemsTitle = function(section) { pandora.getAllItemsTitle = function(section) {
@ -910,10 +934,10 @@ pandora.getClipsQuery = function(callback) {
if (result.data.type == 'smart') { if (result.data.type == 'smart') {
addClipsConditions(result.data.query.conditions); addClipsConditions(result.data.query.conditions);
} }
callback(clipsQuery) callback(clipsQuery);
}); });
} else { } else {
callback(clipsQuery) callback(clipsQuery);
} }
} else { } else {
return clipsQuery; return clipsQuery;
@ -1032,7 +1056,8 @@ pandora.getFoldersHeight = function(section) {
var height = 0; var height = 0;
pandora.site.sectionFolders[section].forEach(function(folder, i) { pandora.site.sectionFolders[section].forEach(function(folder, i) {
height += 16 + pandora.user.ui.showFolder[section][folder.id] * ( height += 16 + pandora.user.ui.showFolder[section][folder.id] * (
!!(folder.showBrowser && folder.hasItems) * 40 + (folder.items || 1) * 16 !!(folder.showBrowser && folder.hasItems) * 40
+ (folder.items || 1) * 16
); );
}); });
return height; return height;
@ -1043,8 +1068,8 @@ pandora.getFoldersWidth = function(section) {
var width = pandora.user.ui.sidebarSize; var width = pandora.user.ui.sidebarSize;
if ( if (
pandora.$ui.appPanel pandora.$ui.appPanel
&& pandora.getFoldersHeight(section) && pandora.getFoldersHeight(section) > window.innerHeight
> window.innerHeight - 20 - 24 - 16 - 1 - pandora.getInfoHeight(section) - 20 - 24 - 16 - 1 - pandora.getInfoHeight(section)
) { ) {
width -= Ox.UI.SCROLLBAR_SIZE; width -= Ox.UI.SCROLLBAR_SIZE;
} }
@ -1811,7 +1836,6 @@ pandora.getVideoOptions = function(data) {
canPlayVideo = data.editable || pandora.site.capabilities.canPlayVideo[pandora.user.level] >= data.rightslevel, canPlayVideo = data.editable || pandora.site.capabilities.canPlayVideo[pandora.user.level] >= data.rightslevel,
options = {}; options = {};
options.subtitlesLayer = pandora.getSubtitlesLayer(); options.subtitlesLayer = pandora.getSubtitlesLayer();
options.censored = canPlayVideo ? [] options.censored = canPlayVideo ? []
: canPlayClips ? ( : canPlayClips ? (
options.subtitlesLayer && data.layers[options.subtitlesLayer].length options.subtitlesLayer && data.layers[options.subtitlesLayer].length
@ -1883,7 +1907,6 @@ pandora.getVideoOptions = function(data) {
}) })
}); });
}); });
Ox.Log('Video', 'VideoOptions', options);
return options; return options;
}; };
@ -1944,7 +1967,7 @@ pandora.isClipView = function(view, item) {
}; };
pandora.isEmbeddableView = function(url) { pandora.isEmbeddableView = function(url) {
//fixme. actually return true for embeddable views // FIXME: actually return true for embeddable views
return false; return false;
}; };
@ -2116,7 +2139,6 @@ pandora.renameList = function(oldId, newId, newName, folder) {
} }
}, false); }, false);
pandora.UI.set('lists.' + pandora.UI.encode(oldId), null, false); pandora.UI.set('lists.' + pandora.UI.encode(oldId), null, false);
} else { } else {
pandora.replaceURL = true; pandora.replaceURL = true;
pandora.UI.set(pandora.user.ui.section + '.' + pandora.UI.encode(newId), pandora.UI.set(pandora.user.ui.section + '.' + pandora.UI.encode(newId),
@ -2313,7 +2335,7 @@ pandora.setLocale = function(locale, callback) {
'/static/json/locale.' + pandora.site.site.id + '.' + locale + '.json', '/static/json/locale.' + pandora.site.site.id + '.' + locale + '.json',
]; ];
} else { } else {
url = '/static/json/locale.' + locale + '.json' url = '/static/json/locale.' + locale + '.json';
} }
} }
Ox.setLocale(locale, url, callback); Ox.setLocale(locale, url, callback);
@ -2357,7 +2379,9 @@ pandora.updateItemContext = function() {
if (result.data.positions[pandora.user.ui.item] === void 0) { if (result.data.positions[pandora.user.ui.item] === void 0) {
pandora.stayInItemView = true; pandora.stayInItemView = true;
pandora.UI.set({find: pandora.site.user.ui.find}); pandora.UI.set({find: pandora.site.user.ui.find});
pandora.$ui.contentPanel.replaceElement(0, pandora.$ui.browser = pandora.ui.browser()); pandora.$ui.contentPanel.replaceElement(
0, pandora.$ui.browser = pandora.ui.browser()
);
} else { } else {
pandora.$ui.browser.reloadList(); pandora.$ui.browser.reloadList();
} }
@ -2386,8 +2410,9 @@ pandora.updateStatus = function(item) {
if (result.data.rendered) { if (result.data.rendered) {
Ox.Request.clearCache(); Ox.Request.clearCache();
if (pandora.isVideoView()) { if (pandora.isVideoView()) {
pandora.$ui.mainPanel.replaceElement(1, pandora.$ui.mainPanel.replaceElement(
pandora.$ui.rightPanel = pandora.ui.rightPanel()); 1, pandora.$ui.rightPanel = pandora.ui.rightPanel()
);
} else if(pandora.$ui.item) { } else if(pandora.$ui.item) {
pandora.updateItemContext(); pandora.updateItemContext();
pandora.$ui.item.reload(); pandora.$ui.item.reload();
@ -2401,12 +2426,12 @@ pandora.updateStatus = function(item) {
delete pandora.$ui.updateStatus[item]; delete pandora.$ui.updateStatus[item];
} }
}, 10000); }, 10000);
function isActive() { function isActive() {
return ui.item == item && [ return ui.item == item && [
'info', 'player', 'editor', 'timeline' 'info', 'player', 'editor', 'timeline'
].indexOf(ui.itemView) > -1 && !( ].indexOf(ui.itemView) > -1 && !(
pandora.$ui.uploadVideoDialog && pandora.$ui.uploadVideoDialog.is('::visible') pandora.$ui.uploadVideoDialog
&& pandora.$ui.uploadVideoDialog.is('::visible')
); );
} }
}; };