diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index e68a448c..2c79bb90 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -331,14 +331,14 @@ var orbitDesktop = function(dom){ }); } - if(!o.desktopData[o.currentface]){ + // if(!o.desktopData[o.currentface]){ $(o.contentHolder).empty().load("/desktop/"+target,function(){ bindHandlers(); }); - }else{ - $(o.contentHolder).html(o.desktopData[o.currentface]); - bindHandlers(); - } + // }else{ + // $(o.contentHolder).html(o.desktopData[o.currentface]); + // bindHandlers(); + // } }; this.loadWallpaper = function(wallpaper){ if(!wallpaper)wallpaper = o.themesettings.background; diff --git a/app/views/desktop/settings.html.erb b/app/views/desktop/settings.html.erb index 3396d27d..293c80af 100644 --- a/app/views/desktop/settings.html.erb +++ b/app/views/desktop/settings.html.erb @@ -43,26 +43,26 @@
Theme Color | +Theme Color | Line Color | -Text Color | -Background Color | +Text Color | +Background Color |
---|---|---|---|---|---|---|
- - - + + + | - + | - - + + | - + |