decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

merge loading icon and reload button

Browse source
This commit is contained in:
rolux 2013-07-29 09:47:25 +00:00
commit ec644ea8fc
3 changed files with 55 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
static/js/mainMenu.js
View file

@ -9,8 +9,7 @@ pandora.ui.mainMenu = function() {
fullscreenState = Ox.Fullscreen.getState(),
that = Ox.MainMenu({
extras: [
pandora.$ui.loadingIcon = pandora.ui.loadingIcon(),
pandora.$ui.reloadButton = pandora.ui.reloadButton()
pandora.$ui.loadingIcon = pandora.ui.loadingIcon()
],
id: 'mainMenu',
menus: [].concat(
@ -211,7 +210,6 @@ pandora.ui.mainMenu = function() {
? [
{ id: 'debugMenu', title: Ox._('Debug'), items: [
{ id: 'clearcache', title: Ox._('Clear Cache')},
{ id: 'reloadapplication', title: Ox._('Reload Application')},
{},
{ id: 'debugmode', title: Ox._((pandora.localStorage('enableDebugMode') ? 'Disable' : 'Enable') + ' Debug Mode') },
{ id: 'eventlogging', title: Ox._((pandora.localStorage('enableEventLogging') ? 'Disable' : 'Enable') + ' Event Logging')},
@ -421,8 +419,6 @@ pandora.ui.mainMenu = function() {
pandora.$ui.contentPanel.replaceElement(0, pandora.$ui.browser = pandora.ui.browser());
} else if (data.id == 'clearcache') {
Ox.Request.clearCache();
} else if (data.id == 'reloadapplication') {
pandora.$ui.appPanel.reload();
} else if (data.id == 'debugmode') {
if (pandora.localStorage('enableDebugMode')) {
pandora.localStorage['delete']('enableDebugMode');