forked from 0x2620/pandora
update to recent oxjs api changes
This commit is contained in:
parent
f666bc2312
commit
19eb6ec49d
2 changed files with 6 additions and 4 deletions
|
@ -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> -->
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue