app/assets/javascripts/activities.js.erb in social_stream-base-0.9.21 vs app/assets/javascripts/activities.js.erb in social_stream-base-0.9.22
- old
+ new
@@ -1,18 +1,53 @@
//= require jquery.livequery
-//= require chosen.jquery
//= require jquery.tipsy
//
//initial state
+var default_security_width = '100px';
$(function() {
$('#wrapper_activities_header form').hide();
$('#new_<%= SocialStream.activity_forms.first %>').show();
$('#select_<%= SocialStream.activity_forms.first %>').addClass('selected');
- $('#security').chosen();
+ chosen = $('#security').security_chosen();
+ $('#security').change(function() {
+ $(this).children("option:selected").each(function(i,opt){
+ if(opt.value==relation_public){
+ if(public_selected==false){
+ public_selected = true;
+ for(id in relation_options){
+ if(id==relation_public_pos){
+ $("#securitychzn_o_" + relation_public_pos).click();
+ }else{
+ chosen.result_deselect(id);
+ }
+ }
+ chosen.results_update_field();
+ }else{
+ if($('#security').children("option:selected").size()>1){
+ public_selected = false;
+ chosen.result_deselect(relation_public_pos);
+ chosen.results_update_field();
+ }
+ }
+ }
+ });
+
+ $('#securities .search-choice a').click(function(){
+ console.log($('#security').children("option:selected").size());
+ if($('#security').children("option:selected").size()==0){
+ $('#securities input').css('width', default_security_width)
+ }
+ });
+ });
+ $('#securities input').blur(function(){
+ console.log($('#security').children("option:selected").size());
+ if($('#security').children("option:selected").size()==0){
+ $('#securities input').css('width', default_security_width)
+ }
+ });
// Remove width calculation
- $('#securities input.default').css('width', '');
-
+ $('#securities input.default').css('width', default_security_width);
setActivityPrivacyTooltips();
});
$(document).ready(function() {
@@ -62,10 +97,10 @@
$("#masterSubmitButton").val("<%= I18n.t('share') %>").removeAttr("disabled");
$('#wrapper_activities_header form').find('input[type=text]').each(function() {
$(this).removeAttr("readonly").val("").blur();
});
//New comments
- $('.input_new_comments').each(function() {
+ $('.input_new_comments').each(function() {chosen.result_deselect(0)
$(this).removeAttr("readonly").val("");
});
}
$('#masterSubmitButton').live('click',function(){