various annotation-related bugfixes

This commit is contained in:
rolux 2012-01-27 19:58:49 +05:30
parent bb3f993b70
commit f327f6b6d8
5 changed files with 13 additions and 5 deletions

View file

@ -288,7 +288,12 @@ appPanel
pandora.$ui.body.ajaxStart(pandora.$ui.loadingIcon.start);
pandora.$ui.body.ajaxStop(pandora.$ui.loadingIcon.stop);
Ox.Request.bindEvent({
error: pandora.ui.errorDialog
error: pandora.ui.errorDialog,
request: function(data) {
pandora.$ui.loadingIcon.options({
tooltip: data.requests + ' request' + (data.requests == 1 ? '' : 's')
});
}
});
pandora.site.sectionButtonsWidth = pandora.$ui.sectionButtons.width() + 8;

View file

@ -26,7 +26,7 @@ pandora.ui.errorDialog = function(data) {
content: Ox.Element()
.append(
$('<img>')
.attr({src: Ox.UI.PATH + 'png/icon128.png'})
.attr({src: '/static/png/icon64.png'})
.css({position: 'absolute', left: '16px', top: '16px', width: '64px', height: '64px'})
)
.append(
@ -41,7 +41,7 @@ pandora.ui.errorDialog = function(data) {
title: Ox.toTitleCase(data.status.text),
width: 368
})
.addClass('OxErrorDialog');
.addClass('OxErrorDialog')
.open();
} else {
// 0 (timeout) or 500 (error)
@ -84,7 +84,7 @@ pandora.ui.errorDialog = function(data) {
title: 'Server ' + Ox.toTitleCase(error),
width: 368
})
.addClass('OxErrorDialog');
.addClass('OxErrorDialog')
.open();
}
}, 250);

View file

@ -307,6 +307,7 @@ pandora.ui.folders = function() {
),
fixedSize: true,
height: 128,
removeOnClose: true,
width: 304,
title: title
}).open();

View file

@ -321,6 +321,9 @@ pandora.ui.item = function() {
operator: '&'
} : pandora.site.user.ui.itemFind);
},
info: function(data) {
pandora.ui.annotationDialog(data.layer).open();
},
muted: function(data) {
pandora.UI.set('videoMuted', data.muted);
},

View file

@ -7,7 +7,6 @@ pandora.ui.mainMenu = function() {
findState = pandora.getFindState(ui.find),
that = Ox.MainMenu({
extras: [
$('<div>').html('beta').css({marginRight: '8px', color: 'rgb(128, 128, 128)'}),
pandora.$ui.loadingIcon = Ox.LoadingIcon({
size: 'medium'
})