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

update metadataDialog and insertEmbedDialog

Browse source
This commit is contained in:
rolux 2013-02-23 12:20:50 +05:30
parent 367636dabc
commit 2920705076
2 changed files with 47 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
static/js/pandora/insertEmbedDialog.js
View file

@ -6,7 +6,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
dialogWidth = 416 - Ox.UI.SCROLLBAR_SIZE, dialogWidth = 416 - Ox.UI.SCROLLBAR_SIZE,
dialogHeight = 416, dialogHeight = 416,
formWidth = dialogWidth - 32, formWidth = dialogWidth - 32,
$element = {}, $input = {},
$panel = Ox.TabPanel({ $panel = Ox.TabPanel({
content: function(id) { content: function(id) {
@ -15,7 +15,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
var $form = Ox.Element().attr({id: 'form'}); var $form = Ox.Element().attr({id: 'form'});
$element.advanced = Ox.ButtonGroup({ $input.advanced = Ox.ButtonGroup({
buttons: [ buttons: [
{id: 'basic', title: 'Basic'}, {id: 'basic', title: 'Basic'},
{id: 'advanced', title: 'Advanced'} {id: 'advanced', title: 'Advanced'}
@ -39,7 +39,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
space().appendTo($form); space().appendTo($form);
$element.url = Ox.Input({ $input.url = Ox.Input({
label: 'URL', label: 'URL',
labelWidth: 128, labelWidth: 128,
width: formWidth width: formWidth
@ -53,7 +53,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
space().appendTo($form); space().appendTo($form);
$element.protocol = Ox.Select({ $input.protocol = Ox.Select({
items: [ items: [
{id: 'http', title: 'http'}, {id: 'http', title: 'http'},
{id: 'https', title: 'https'} {id: 'https', title: 'https'}
@ -69,7 +69,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
.addClass('advanced') .addClass('advanced')
.appendTo($form); .appendTo($form);
$element.site = Ox.SelectInput({ $input.site = Ox.SelectInput({
inputWidth: 128, inputWidth: 128,
items: [pandora.site.site] items: [pandora.site.site]
.concat(pandora.site.sites) .concat(pandora.site.sites)
@ -89,7 +89,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
.addClass('advanced') .addClass('advanced')
.appendTo($form); .appendTo($form);
$element.item = Ox.Input({ $input.item = Ox.Input({
label: pandora.site.itemName.singular, label: pandora.site.itemName.singular,
labelWidth: 128, labelWidth: 128,
width: formWidth width: formWidth
@ -99,7 +99,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
}) })
.appendTo($input); .appendTo($input);
$element.link = Ox.Select({ $input.link = Ox.Select({
items: [ items: [
{id: 'default', title: 'Default'}, {id: 'default', title: 'Default'},
{id: 'player', title: 'Player'}, {id: 'player', title: 'Player'},
@ -117,7 +117,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
}) })
.appendTo($form); .appendTo($form);
$element.position = Ox.Input({ $input.position = Ox.Input({
label: 'Position', label: 'Position',
labelWidth: 128, labelWidth: 128,
width: formWidth width: formWidth
@ -131,7 +131,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
}) })
.appendTo($form); .appendTo($form);
$element['in'] = Ox.Input({ $input['in'] = Ox.Input({
label: 'In Point', label: 'In Point',
labelWidth: 128, labelWidth: 128,
width: formWidth width: formWidth
@ -144,7 +144,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
}) })
.appendTo($form); .appendTo($form);
$element.out = Ox.Input({ $input.out = Ox.Input({
label: 'Out Point', label: 'Out Point',
labelWidth: 128, labelWidth: 128,
width: formWidth width: formWidth
@ -157,7 +157,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
}) })
.appendTo($form); .appendTo($form);
$element.annotation = Ox.Input({ $input.annotation = Ox.Input({
label: 'Annotation', label: 'Annotation',
labelWidth: 128, labelWidth: 128,
width: formWidth width: formWidth
@ -169,7 +169,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
space().appendTo($form); space().appendTo($form);
$element.title = Ox.Input({ $input.title = Ox.Input({
label: 'Title', label: 'Title',
labelWidth: 128, labelWidth: 128,
width: formWidth width: formWidth
@ -180,7 +180,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
.addClass('advanced') .addClass('advanced')
.appendTo($form); .appendTo($form);
$element.showTimeline = Ox.Checkbox({ $input.showTimeline = Ox.Checkbox({
label: 'Show Large Timeline', label: 'Show Large Timeline',
labelWidth: 128, labelWidth: 128,
value: false, value: false,
@ -192,7 +192,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
.addClass('advanced') .addClass('advanced')
.appendTo($form); .appendTo($form);
$element.timeline = Ox.Select({ $input.timeline = Ox.Select({
items: [ items: [
{id: 'default', title: 'Default'} {id: 'default', title: 'Default'}
].concat( ].concat(
@ -209,7 +209,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
.addClass('advanced') .addClass('advanced')
.appendTo($form); .appendTo($form);
$element.showAnnotations = Ox.Checkbox({ $input.showAnnotations = Ox.Checkbox({
label: 'Show Annotations', label: 'Show Annotations',
labelWidth: 128, labelWidth: 128,
value: false, value: false,
@ -221,7 +221,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
.addClass('advanced') .addClass('advanced')
.appendTo($form); .appendTo($form);
$element.showLayersLabel = Ox.Label({ Ox.Label({
title: 'Show Layers', title: 'Show Layers',
width: formWidth width: formWidth
}) })
@ -231,7 +231,7 @@ pandora.ui.insertEmbedDialog = function(callback) {
.addClass('advanced') .addClass('advanced')
.appendTo($form); .appendTo($form);
$element.showLayers = Ox.CheckboxGroup({ $input.showLayers = Ox.CheckboxGroup({
checkboxes: pandora.site.layers.map(function(layer) { checkboxes: pandora.site.layers.map(function(layer) {
return {id: layer.id, title: layer.title}; return {id: layer.id, title: layer.title};
}), }),
@ -256,8 +256,8 @@ pandora.ui.insertEmbedDialog = function(callback) {
} }
function formatURL() { function formatURL() {
var data = $element.map(function($e) { var data = $input.map(function($element) {
return $e.options('value'); return $element.options('value');
}); });
$url.value( $url.value(
data.protocol + '://' data.protocol + '://'
@ -278,20 +278,32 @@ pandora.ui.insertEmbedDialog = function(callback) {
function parseURL(url) { function parseURL(url) {
var parsed = Ox.parseURL(url); var parsed = Ox.parseURL(url);
pandora.URL.parse(url, function(state) { pandora.URL.parse(parsed.pathname + path.search + path.hash, function(state) {
var data = { var query = {};
state.hash.query.forEach(function(condition) {
query[condition.key] = condition.value;
});
Ox.forEach({
protocol: parsed.protocol, protocol: parsed.protocol,
site: parsed.hostname, site: parsed.hostname,
item: state.item, item: state.item || '',
link: state.view, // FIXME: wrong, user-dependent? link: state.view || 'default', // FIXME: wrong, user-dependent
// ... position: Ox.isArray(state.span)
}; ? Ox.formatDuration(state.span[0]) : '',
state.hash.query.forEach(function(condition) { 'in': Ox.isArray(state.span)
data[condition.key] = condition.value; ? Ox.formatDuration(state.span[state.span.length - 2]) : '',
}); out: Ox.isArray(state.span)
// loop over elements so we can set missing ones to false? ? Ox.formatDuration(state.span[state.span.length - 1]) : ''
Ox.forEach(data, function(value, key) { annotation: Ox.isString(state.span) ? state.span : '',
$element[key].options({value: value}); title: hash.title || '',
showTimeline: hash.showTimeline || false,
timeline: hash.timeline || 'default',
showAnnotations: hash.showAnnotations || false,
showLayers: hash.showLayers || pandora.site.layers.map(function(layer) {
return layer.id;
})
}, function(value, key) {
$input[key].options({value: value});
}); });
}); });
} }
@ -330,15 +342,16 @@ pandora.ui.insertEmbedDialog = function(callback) {
}) })
.bindEvent({ .bindEvent({
click: function() { click: function() {
callback($element.url.options('value')); callback($input.url.options('value'));
that.close(); that.close();
} }
}) })
], ],
closeButton: true, closeButton: true,
content: self.$content, content: $panel,
height: 416, height: 416,
keys: {enter: 'insert', escape: 'cancel'}, keys: {enter: 'insert', escape: 'cancel'},
removeOnClose: true,
title: 'Insert Embed', title: 'Insert Embed',
width: 416 + Ox.UI.SCROLLBAR_SIZE width: 416 + Ox.UI.SCROLLBAR_SIZE
}); });

2
static/js/pandora/metadataDialog.js
View file

@ -196,7 +196,7 @@ pandora.ui.metadataDialog = function(data) {
removeOnClose: true, removeOnClose: true,
title: 'Update Metadata', title: 'Update Metadata',
width: 304 width: 304
}).open() }).open();
} }