decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

button cleanup, fixes #2765

Browse source
This commit is contained in:
j 2015-04-26 16:55:39 +02:00
parent d39c237b04
commit 86a1d96484
1 changed files with 69 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
static/js/uploadVideoDialog.js
View file

@ -5,7 +5,7 @@ pandora.ui.uploadVideoDialog = function(data) {
var cancelled = false, var cancelled = false,
file, file,
hasFirefogg = !(Ox.isUndefined(Firefogg)) && ( hasFirefogg = !(Ox.isUndefined(window.Firefogg)) && (
$.browser.version < '35' || Firefogg().version >= 334 $.browser.version < '35' || Firefogg().version >= 334
), ),
itemView = pandora.site.capabilities.canSeeExtraItemViews[ itemView = pandora.site.capabilities.canSeeExtraItemViews[
@ -40,71 +40,29 @@ pandora.ui.uploadVideoDialog = function(data) {
} }
} }
}), }),
$actionButton = hasFirefogg ? Ox.Button({ $actionButton = hasFirefogg ?
id: 'action', Ox.Button({
title: Ox._('Select Video') id: 'action',
}).bindEvent({ title: Ox._('Select Video')
click: function() { }).bindEvent({
if ($actionButton.options('title') == Ox._('Select Video')) { click: function() {
if (selectVideo()) { if ($actionButton.options('title') == Ox._('Select Video')) {
$actionButton.options('title', Ox._('Upload')); if (selectVideo()) {
$actionButton.options('title', Ox._('Upload'));
}
} else if ($actionButton.options('title') == Ox._('Cancel')) {
cancelled = true;
pandora.firefogg && pandora.firefogg.cancel();
pandora.$ui.upload && pandora.$ui.upload.abort();
$actionButton.options('title', Ox._('Select Video'));
$closeButton.show();
} else {
$closeButton.options('title', Ox._('Cancel'));
$actionButton.hide().options('title', Ox._('Select Video'));
encode();
} }
} else if ($actionButton.options('title') == Ox._('Cancel')) {
cancelled = true;
pandora.firefogg && pandora.firefogg.cancel();
pandora.$ui.upload && pandora.$ui.upload.abort();
$actionButton.options('title', Ox._('Select Video'));
$closeButton.show();
} else {
$closeButton.options('title', Ox._('Cancel'));
$actionButton.hide().options('title', Ox._('Select Video'));
encode();
} }
} }) : getSelectVideoButton()
}) : Ox.FileButton({
id: 'action',
title: Ox._('Select Video'),
maxFiles: 1,
width: 96
}).css({
float: 'left'
}).bindEvent({
click: function(data) {
if (data.files.length) {
cancelled = false;
$actionButton.replaceWith($actionButton = Ox.Button({
id: 'action',
title: 'Upload',
disabled: true
}).css({
float: 'left'
}));
getInfo(data.files[0], function(info) {
console.log(info);
$actionButton.options({
disabled: false
}).bindEvent({
click: function() {
info.direct
? directUpload(data.files[0], info)
: upload(data.files[0]);
}
});
$info.html(formatVideoInfo(info));
$status.html(
info.direct
? Ox._(
'Your video will be uploaded directly.'
)
: Ox._(
'Your video will be transcoded before uploading.'
)
);
});
//$closeButton.options('title', Ox._('Cancel'));
}
}
})
], ],
content: $content, content: $content,
height: 128, height: 128,
@ -272,6 +230,53 @@ pandora.ui.uploadVideoDialog = function(data) {
return resolution; return resolution;
} }
function getSelectVideoButton() {
return Ox.FileButton({
id: 'action',
title: Ox._('Select Video'),
maxFiles: 1,
width: 96
}).css({
float: 'left'
}).bindEvent({
click: function(data) {
if (data.files.length) {
cancelled = false;
$actionButton.replaceWith($actionButton = Ox.Button({
id: 'action',
title: 'Upload',
disabled: true
}).css({
float: 'left'
}));
getInfo(data.files[0], function(info) {
$actionButton.options({
disabled: false
}).bindEvent({
click: function() {
$actionButton.replaceWith($actionButton = getSelectVideoButton().hide());
info.direct
? directUpload(data.files[0], info)
: upload(data.files[0]);
}
});
$info.html(formatVideoInfo(info));
$status.html(
info.direct
? Ox._(
'Your video will be uploaded directly.'
)
: Ox._(
'Your video will be transcoded before uploading.'
)
);
});
$closeButton.options('title', Ox._('Cancel'));
}
}
});
}
function uploadStream(item, info, file) { function uploadStream(item, info, file) {
var oshash = info.oshash, var oshash = info.oshash,
format = pandora.site.video.formats[0], format = pandora.site.video.formats[0],