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

some embedDialog fixes

Browse source
This commit is contained in:
j 2014-02-18 09:41:23 +00:00
parent 2f68be4cce
commit 7f79228915
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
static/js/embedDialog.js
View file

@ -745,14 +745,12 @@ pandora.ui.embedDialog = function(/*[url, ]callback*/) {
} }
function limitPoint(value, min, max) { function limitPoint(value, min, max) {
/*
if (Ox.typeOf(min) == 'number') { if (Ox.typeOf(min) == 'number') {
min = Ox.formatDuration(min) min = Ox.formatDuration(min)
} }
if (Ox.typeOf(max) == 'number') { if (Ox.typeOf(max) == 'number') {
max = Ox.formatDuration(max) max = Ox.formatDuration(max)
} }
*/
return Ox.formatDuration( return Ox.formatDuration(
Ox.limit( Ox.limit(
Ox.parseDuration(value), Ox.parseDuration(value),
@ -915,7 +913,9 @@ pandora.ui.embedDialog = function(/*[url, ]callback*/) {
} }
options.mapMode = !ui.item ? 'find' : 'item'; options.mapMode = !ui.item ? 'find' : 'item';
options.item = ui.item; options.item = ui.item;
options.document = ui.documentsSelection[ui.item][0] || ''; options.document = ui.documentsSelection[ui.item] && ui.documentsSelection[ui.item].length
? ui.documentsSelection[ui.item][0]
: '';
options.list = ui._list; options.list = ui._list;
options.edit = ui.edit; options.edit = ui.edit;
options.text = ui.text; options.text = ui.text;
@ -928,6 +928,9 @@ pandora.ui.embedDialog = function(/*[url, ]callback*/) {
options[key] = ui.videoPoints[ui.item][key] || ''; options[key] = ui.videoPoints[ui.item][key] || '';
}); });
} }
if (pandora.$ui[pandora.user.ui.videoView]) {
duration = pandora.$ui[pandora.user.ui.videoView].options('duration');
}
} }
Ox.forEach(options, function(value, key) { Ox.forEach(options, function(value, key) {
if (key == 'view') { if (key == 'view') {
@ -1017,4 +1020,4 @@ pandora.ui.embedDialog = function(/*[url, ]callback*/) {
return that; return that;
}; };