forked from 0x2620/pandora
fix a bug in normalizeHashQuery
This commit is contained in:
parent
8661f96be4
commit
2e3aa03c6b
2 changed files with 7 additions and 3 deletions
|
@ -17,6 +17,7 @@ pandora.ui.embedPanel = function() {
|
|||
right: 0,
|
||||
bottom: 0,
|
||||
});
|
||||
|
||||
$errorBox = $('<div>')
|
||||
.css({
|
||||
position: 'absolute',
|
||||
|
@ -30,6 +31,7 @@ pandora.ui.embedPanel = function() {
|
|||
margin: 'auto'
|
||||
})
|
||||
.appendTo(that);
|
||||
|
||||
$errorLogo = $('<img>')
|
||||
.css({width: '96px', opacity: 0})
|
||||
.one({
|
||||
|
@ -39,6 +41,7 @@ pandora.ui.embedPanel = function() {
|
|||
})
|
||||
.attr({src: '/static/png/logo.png'})
|
||||
.appendTo($errorBox);
|
||||
|
||||
$errorText = $('<div>')
|
||||
.css({marginTop: '4px', fontSize: '9px', textAlign: 'center'})
|
||||
.html('This view cannot<br>be embedded.')
|
||||
|
|
|
@ -1057,9 +1057,10 @@ pandora.normalizeHashQuery = function(state) {
|
|||
'showAnnotations', 'showCloseButton', 'showLayers', 'showTimeline',
|
||||
'title', 'width'
|
||||
],
|
||||
isEmbed = Ox.indexOf(state.hash.query, function(condition) {
|
||||
return Ox.isEqual(condition, {key: 'embed', value: true});
|
||||
}) > -1,
|
||||
isEmbed = state.hash && state.hash.query
|
||||
&& Ox.indexOf(state.hash.query, function(condition) {
|
||||
return Ox.isEqual(condition, {key: 'embed', value: true});
|
||||
}) > -1,
|
||||
newState = Ox.clone(state, true),
|
||||
removeKeys = [];
|
||||
if (state.hash && state.hash.anchor) {
|
||||
|
|
Loading…
Reference in a new issue