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

various annotation-related bugfixes

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
static/js/pandora.js
View file

@ -288,7 +288,12 @@ appPanel
pandora.$ui.body.ajaxStart(pandora.$ui.loadingIcon.start); pandora.$ui.body.ajaxStart(pandora.$ui.loadingIcon.start);
pandora.$ui.body.ajaxStop(pandora.$ui.loadingIcon.stop); pandora.$ui.body.ajaxStop(pandora.$ui.loadingIcon.stop);
Ox.Request.bindEvent({ 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; pandora.site.sectionButtonsWidth = pandora.$ui.sectionButtons.width() + 8;

6
static/js/pandora/errorDialog.js → static/js/pandora/error.js
View file

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

1
static/js/pandora/folders.js
View file

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

3
static/js/pandora/item.js
View file

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

1
static/js/pandora/menu.js
View file

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