forked from 0x2620/pandora
avoid ? if possible
This commit is contained in:
parent
8158e2594c
commit
96c0ccc29b
1 changed files with 14 additions and 13 deletions
|
@ -414,7 +414,17 @@ pandora.ui.insertEmbedDialog = function(/*[url, ]callback*/) {
|
|||
function formatURL() {
|
||||
var data = Ox.map($input, function($element) {
|
||||
return $element.options('value');
|
||||
});
|
||||
}),
|
||||
options = Ox.serialize({
|
||||
title: data.title || void 0,
|
||||
showTimeline: data.showTimeline || void 0,
|
||||
timeline: data.timeline && data.timeline != 'default' ? data.timeline : void 0,
|
||||
showAnnotations: data.showAnnotations || void 0,
|
||||
showLayers: data.showAnnotations && data.showLayers ? data.showLayers : void 0,
|
||||
//matchRatio: true
|
||||
}, true)
|
||||
.replace(/_/g, '%09').replace(/\s/g, '_')
|
||||
.replace(/"/g, '"');
|
||||
url = data.protocol + '://'
|
||||
+ data.site + '/'
|
||||
+ data.item + '/'
|
||||
|
@ -425,17 +435,8 @@ pandora.ui.insertEmbedDialog = function(/*[url, ]callback*/) {
|
|||
: []
|
||||
).join(',')
|
||||
+ (data.annotation || '')
|
||||
+ '#embed?'
|
||||
+ Ox.serialize({
|
||||
title: data.title || void 0,
|
||||
showTimeline: data.showTimeline || void 0,
|
||||
timeline: data.timeline && data.timeline != 'default' ? data.timeline : void 0,
|
||||
showAnnotations: data.showAnnotations || void 0,
|
||||
showLayers: data.showAnnotations && data.showLayers ? data.showLayers : void 0,
|
||||
//matchRatio: true
|
||||
}, true)
|
||||
.replace(/_/g, '%09').replace(/\s/g, '_')
|
||||
.replace(/"/g, '"');
|
||||
+ '#embed'
|
||||
+ (options ? '?' + options : '');
|
||||
Ox.print('FU', url);
|
||||
$input.url.options({value: url});
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue