diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index aeb80a24..2321d92a 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -93,14 +93,18 @@ var orbitDesktop = function(dom){ var cache = false; if(!o.desktopData[o.currentface]){ $(o.contentHolder).empty().load(url,function(){ - if(typeof o.data_method != "undefined" || o.data_method != "") - window.o[o.data_method](target,url,cache); + if(typeof o.data_method != "undefined"){ + if(o.data_method != "") + window.o[o.data_method](target,url,cache); + } }); }else{ $(o.contentHolder).html(o.desktopData[o.currentface]); cache = true; - if(typeof o.data_method != "undefined" || o.data_method != "") + if(typeof o.data_method != "undefined"){ + if(o.data_method != "") window.o[o.data_method](target,url,cache); + } } }); } @@ -118,7 +122,15 @@ var orbitDesktop = function(dom){ // main: '.tinycanvas', // fill: '.s_grid_con' // }) - window.o[o.data_method][sub_data_method](); + if(typeof o.data_method != "undefined"){ + if(o.data_method != ""){ + if(typeof sub_data_method != "undefined"){ + if(sub_data_method != ""){ + window.o[o.data_method][sub_data_method](); + } + } + } + } }) } $('.s_menu a').removeClass('thmc1 thmtxt active'); @@ -1373,16 +1385,3 @@ var uselessfunction = function(){ $.post("/desktop/temp_func",{sectionid:"4f83e7bbbd98eb041600001d"}); } - - - -orbitDesktop.prototype.initCourses = function(){ - o.notify("Hi there","",""); -} - -orbitDesktop.prototype.something = function(){ - o.notify("something","",""); -} - - - diff --git a/app/views/desktop/journal_pages/list.html.erb b/app/views/desktop/journal_pages/list.html.erb index 3d396711..14abf97d 100644 --- a/app/views/desktop/journal_pages/list.html.erb +++ b/app/views/desktop/journal_pages/list.html.erb @@ -85,18 +85,3 @@ -Panel::PersonalJournal::Plugin::WritingJournals -