base/app/views/cheesecake/_cheesecake.html.erb in social_stream-0.20.0 vs base/app/views/cheesecake/_cheesecake.html.erb in social_stream-0.20.1

- old
+ new

@@ -35,44 +35,42 @@ }; cheesecakeData.sectors = <%= raw(current_subject.cheesecake_json) %>.sectors; var cheese = new socialCheesecake.Cheesecake(cheesecakeData); cheese.syncSectorFocusCallbacks = false; cheese.onSectorFocusBegin = function(cheesecake,callback){ - if(cheese.highlightedSector.auxiliar){ + if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){ $("#contacts_explorer").animate({width: 0},500,function(){ $("#contacts_explorer").hide(); }); - setTimeout(function(){ - $("#sector_form").show(); - $("#sector_form").animate({width: 300},500); - },100); + $("#sector_editor").show(); + $("#sector_editor").animate({width: 300},500); }else{ $("#contacts_grid_available").fadeOut("fast", callback); } }; cheese.onSectorFocusEnd = function(cheesecake){ - if(cheese.highlightedSector.auxiliar){ + if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){ }else{ - $("#contacts_grid_available").fadeIn("fast"); + $("#contacts_grid_available").fadeIn("fast"); + $("#edit_sector_button").fadeIn("fast"); } }; cheese.onSectorUnfocusBegin = function(cheesecake,callback){ - if(cheese.highlightedSector.auxiliar){ + if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){ }else{ - $("#contacts_grid_available").fadeOut("fast", callback); + $("#contacts_grid_available").fadeOut("fast", callback); + $("#edit_sector_button").fadeOut("fast"); } }; cheese.onSectorUnfocusEnd = function(cheesecake){ - if(cheese.highlightedSector.auxiliar){ - $("#sector_form").animate({width: 0},500,function(){ - $("#sector_form").hide(); + if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){ + $("#sector_editor").animate({width: 0},500,function(){ + $("#sector_editor").hide(); }); - setTimeout(function(){ - $("#contacts_explorer").show(); - $("#contacts_explorer").animate({width: 300},500); - },100); + $("#contacts_explorer").show(); + $("#contacts_explorer").animate({width: 300},500); }else{ $("#contacts_grid_available").fadeIn("fast"); } }; $("#contacts_filter_input").keyup(function(){ \ No newline at end of file