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

only open help dialog via keyboard if no other dialog or screen is present

Browse source
This commit is contained in:
rolux 2011-11-02 08:27:22 +00:00
parent b85a637486
commit 3a682c7932
6 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
static/50x.html
View file

@ -1,21 +1,19 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<style> <title>We will be back in a moment.</title>
<link rel="stylesheet" type="text/css" href="/static/oxjs/build/Ox.UI/css/Ox.UI.css"/>
<style>
body { body {
text-align: center; text-align: center;
padding-top: 128px; padding-top: 128px;
background: #101010; background: rgb(16, 16, 16);
color: #F0F0F0; color: rgb(240, 240, 240);
} }
</style> </style>
<link rel="stylesheet" type="text/css" href="/static/oxjs/build/Ox.UI/css/Ox.UI.css"/> </head>
<title>We will be back in a minute</title> <body class="OxThemeModern">
</head> <img src="/static/png/logo256.png" style="width: 256px"/>
<body class="OxThemeModern"> <div style="padding-top: 16px">We will be back in a moment.</div>
<img src="/static/png/logo256.png" style="width: 256px"/> </body>
<div style="padding-top: 16px"> </html>
We will be back in a minute.
</div>
</body>

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

@ -4,7 +4,7 @@ pandora.ui.folders = function() {
that = Ox.Element() that = Ox.Element()
.css({overflowX: 'hidden', overflowY: 'auto'}) .css({overflowX: 'hidden', overflowY: 'auto'})
.bindEvent({ .bindEvent({
resize: pandora.resizeFolders resize: pandora.resizeFolders,
}); });
var counter = 0; var counter = 0;
//var $sections = []; //var $sections = [];

4
static/js/pandora/info.js
View file

@ -10,7 +10,6 @@ pandora.ui.info = function() {
toggle: function(data) { toggle: function(data) {
Ox.print('INFO TOGGLE') Ox.print('INFO TOGGLE')
pandora.UI.set({showInfo: !data.collapsed}); pandora.UI.set({showInfo: !data.collapsed});
//pandora.resizeFolders();
}, },
pandora_find: function() { pandora_find: function() {
if (pandora.user.ui._list != pandora.UI.getPrevious('_list')) { if (pandora.user.ui._list != pandora.UI.getPrevious('_list')) {
@ -19,9 +18,6 @@ pandora.ui.info = function() {
}, },
pandora_item: updateInfo, pandora_item: updateInfo,
pandora_listselection: updateInfo, pandora_listselection: updateInfo,
pandora_showinfo: function(data) {
pandora.resizeFolders();
}
}); });
//pandora.$ui.leftPanel && resize(); //pandora.$ui.leftPanel && resize();

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

@ -13,7 +13,7 @@ pandora.ui.leftPanel = function() {
collapsed: !pandora.user.ui.showInfo, collapsed: !pandora.user.ui.showInfo,
collapsible: true, collapsible: true,
element: pandora.$ui.info = pandora.ui.info(), element: pandora.$ui.info = pandora.ui.info(),
size: pandora.getInfoHeight(), size: pandora.getInfoHeight(true),
tooltip: 'info' tooltip: 'info'
} }
], ],

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

@ -334,6 +334,7 @@ pandora.ui.list = function() {
return {'in': clip['in'], out: clip.out}; return {'in': clip['in'], out: clip.out};
}) : [], }) : [],
subtitles: isClipsQuery ? data.clips.map(function(clip) { subtitles: isClipsQuery ? data.clips.map(function(clip) {
Ox.print('CLIP:::::', clip)
return {'in': clip['in'], out: clip.out, text: clip.annotations[0].value}; return {'in': clip['in'], out: clip.out, text: clip.annotations[0].value};
}) : [] }) : []
} }

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

@ -298,7 +298,9 @@ pandora.ui.mainMenu = function() {
pandora.UI.set({showSidebar: !ui.showSidebar}); pandora.UI.set({showSidebar: !ui.showSidebar});
}, },
key_shift_slash: function() { key_shift_slash: function() {
if ($('.OxDialog').length == 0 && $('.OxScreen').length == 0) {
pandora.URL.push('/help'); pandora.URL.push('/help');
}
}, },
pandora_find: function() { pandora_find: function() {
var action = ui._list var action = ui._list