0x2620/cablegates
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update to recent oxjs api changes

Browse source
This commit is contained in:
rlx 2011-04-27 19:26:01 +00:00
parent c301cff088
commit 2a5890eacb
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/templates/index.html
View file

@ -10,10 +10,10 @@ if(typeof(console)=='undefined') {
console.log = function() {}; console.log = function() {};
} }
</script> </script>
<script type="text/javascript" src="/static/oxjs/build/js/jquery/jquery.js"></script> <script type="text/javascript" src="/static/oxjs/build/jquery/jquery.js"></script>
<script type="text/javascript" src="/static/js/jquery/jquery.tmpl.min.js"></script> <script type="text/javascript" src="/static/js/jquery/jquery.tmpl.min.js"></script>
<script type="text/javascript" src="/static/js/jquery/jquery.videosupport.js"></script> <script type="text/javascript" src="/static/js/jquery/jquery.videosupport.js"></script>
<script type="text/javascript" src="/static/oxjs/build/js/Ox.js"></script> <script type="text/javascript" src="/static/oxjs/build/Ox.js"></script>
<script type="text/javascript" src="/static/js/pandora.js"></script> <script type="text/javascript" src="/static/js/pandora.js"></script>
<!-- <!--
<script type="text/javascript" src="/static/js/pandora.local.js"></script> --> <script type="text/javascript" src="/static/js/pandora.local.js"></script> -->

6
static/js/pandora.js
View file

@ -9,7 +9,9 @@
// fixme: rename config to site (site/user is better than config/user) // fixme: rename config to site (site/user is better than config/user)
Ox.load('UI', { Ox.load('UI', {
debug: true,
hideScreen: false, hideScreen: false,
loadImages: true,
showScreen: true, showScreen: true,
theme: 'modern' theme: 'modern'
}, function() { }, function() {
@ -20,6 +22,8 @@ Ox.load('UI', {
Ox.print('Ox.App load', data); Ox.print('Ox.App load', data);
Ox.UI.hideLoadingScreen();
$.extend(app, { $.extend(app, {
$ui: { $ui: {
body: $('body'), body: $('body'),
@ -85,8 +89,6 @@ Ox.load('UI', {
app.ui.sectionButtonsWidth = app.$ui.sectionButtons.width() + 8; app.ui.sectionButtonsWidth = app.$ui.sectionButtons.width() + 8;
Ox.UI.hideLoadingScreen();
window.pandora.app = app; window.pandora.app = app;
} }