saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean Harry's code

This commit is contained in:
Matt K. Fu 2013-04-10 18:16:52 +08:00
parent 2416030adc
commit 7e9fce0c2d
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/orbitdesktop.js
View File

@ -574,20 +574,6 @@ var orbitDesktop = function(dom){
});
}else{
$(o.contentHolder).html(o.desktopData[o.currentface]);
<<<<<<< Updated upstream
header_ani();
try {
if(!customload){
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data);
} else {
if(submenuitem){
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]"));
} else {
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data);
}
}
} catch(EX){}
=======
try{
if(!customload){
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"));
@ -598,7 +584,6 @@ var orbitDesktop = function(dom){
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"));
}
}catch(EX){}
>>>>>>> Stashed changes
cache = true;
if(typeof o.data_method != "undefined"){
if(o.data_method != ""){

8
lib/tasks/migrate.rake
View File

@ -302,4 +302,12 @@ namespace :migrate do
page.save
end
end
task :to_daily_0410 => :environment do
#applying Harry's code
Rake::Task["desktop:upload_all_packages"].execute
#applying Spen's code
Rake::Task["web_link_url:web_link_url_i18n"].execute
end
end