social_stream 0.22.1 → 0.23.1

data/base/app/assets/javascripts/activities.js.erb

@@ -3,91 +3,6 @@
 //
 //= require social_stream.wall
 //
-//initial state
-
-$('#masterSubmitButton').live('click',function(){
-  $('#wrapper_activities_header form:visible').submit();
-});
-
-
-//clicks form selector
-$('.activity_form_selector').live('click',function(){
-	$('.activity_form_selector').removeClass('selected');
-	$(this).addClass('selected');
-	$('#wrapper_activities_header form').hide();
-	$('#new_'+this.id.split("_")[1]).show();
-});
-
-//javascript for main activities input
-$(function() {
-  $("#input_activities").click(function(){
-      $("#masterSubmitButton").show();
-  });
-});
-
-
-//javascript for comments
-$(function() {  
-  //show only the text fields for new comment if there are any comment to the post
-  $(".activity_new_comment").each(function(){
-  	if ($.trim($(this).siblings(".activity_comments").text()) != ""){
-  	  $(this).show();
-  	}
-  });
-  $(".activities_comment_btn").hide();
-  $(".actor_name_new_comment").hide();
-  $(".actor_logo_new_comment").hide();
-  
-  //if there are 4 or more commments we only show the last 2 and a link to show the rest
-  $("#wall .activity_comments").each(function(){
-  	var comments = $(this).children(".subactivity");  	
-  	//check if there are more than 3 comments
-  	if (comments.size() > 3){
-  		$(this).prepend("<div class='hide_show_comments'><a href='#' onclick='showAllComments(\""+ 
-  		                 $(this).attr('id') +"\"); return false;'>" + I18n.t('comment.view_all') + "(" +
-  		                comments.size() + ")</a></div><div class='space_comments'></div>");
-  		comments.slice(0,comments.size()-2).hide();
-  		//hide alto space_comments
-  		$(this).children(".space_comments").slice(0,comments.size()-2).hide();
-  	}
-  });
-});
-
-showAllComments = function(id){
-	$("#"+id).children().show();
-	//and hide the hide_show_comments
-	$("#"+id).children(".hide_show_comments").hide();
-};
-
-//usa livequery para usar el javascript luego de una accion con  AJAX
-$(".input_new_comments").live("click", function(){
-	$(".activities_comment_btn").hide();
-	$(".new_comment").removeClass("new_comment_shown");
-	$(".actor_name_new_comment").hide();
-	$(".actor_logo_new_comment").hide();
-  var comment= $(this).parents(".activity_new_comment");
-  comment.find(".activities_comment_btn").show();
-  $(this).parents(".new_comment").addClass("new_comment_shown");
-  comment.find(".actor_name_new_comment").show();
-  comment.find(".actor_logo_new_comment").show();
-  return false;
-});
-
-autoSize= function(activity_dom_id) {
-  // Copy textarea contents; browser will calculate correct height of copy,
-  // which will make overall container taller, which will make textarea taller.
-  var text = $("#comment_text_"+activity_dom_id).val().replace(/\n/g, '<br/>');
-  $("#copy_comment_text_"+activity_dom_id).html(text);
-}  
-    
-
-//javascript for tocomment option
-$(".to_comment").live("click", function(){
-  $(this).parents(".activity_content").find(".activity_new_comment").show();
-  $(this).parents(".activity_content").find(".input_new_comments").click();  
-  $(this).parents(".activity_content").find(".input_new_comments").focus();
-	return false;
-});
 
 //move he last list item before the first item. The purpose of this is if the user clicks to slide left he will be able to see the last item.
 $('#carousel_ul li:first').before($('#carousel_ul li:last'));

data/base/app/assets/javascripts/social_stream.comments.js

@@ -0,0 +1,63 @@
+//= require social_stream.timeline
+//= require social_stream.objects
+
+SocialStream.Comments = (function(SS, $, undefined){
+	var initNew = function(){
+		// show only the text fields for new comment
+		// if there are any comment to the post
+		$(".activity_new_comment").each(function(){
+			if ($.trim($(this).siblings(".activity_comments").text()) != ""){
+				$(this).show();
+			}
+		});
+
+		$(".activities_comment_btn").hide();
+		$(".actor_name_new_comment").hide();
+		$(".actor_logo_new_comment").hide();
+
+		$(".input_new_comments").Watermark(I18n.t('comment.input'),"#666");
+
+		$(".input_new_comments")
+			.change(function(){autoSize(this);})
+			.keydown(function(){autoSize(this);})
+			.keyup(function(){autoSize(this);});
+
+		$(".input_new_comments").each(function(){autoSize(this)});
+
+		$(".input_new_comments").click(function(){
+			$(".activities_comment_btn").hide();
+			$(".new_comment").removeClass("new_comment_shown");
+			$(".actor_name_new_comment").hide();
+			$(".actor_logo_new_comment").hide();
+			var comment= $(this).parents(".activity_new_comment");
+			comment.find(".activities_comment_btn").show();
+			$(this).parents(".new_comment").addClass("new_comment_shown");
+			comment.find(".actor_name_new_comment").show();
+			comment.find(".actor_logo_new_comment").show();
+			return false;
+		});
+
+		//javascript for tocomment option
+		$(".to_comment").click(function(){
+			$(this).parents(".activity_content").find(".activity_new_comment").show();
+			$(this).parents(".activity_content").find(".input_new_comments").click();  
+			$(this).parents(".activity_content").find(".input_new_comments").focus();
+			return false;
+		});
+	}
+
+	var autoSize = function(e) {
+		// Copy textarea contents; browser will calculate correct height of copy,
+		// which will make overall container taller, which will make textarea taller.
+		var text = $(e).val().replace(/\n/g, '<br/>');
+		$(e).siblings(".copy_new_comment").html(text);
+	}  
+
+	SocialStream.Timeline.addInitCallback(initNew);
+	SocialStream.Objects.addInitCallback(initNew);
+
+	return {
+		initNew: initNew
+	};
+
+})(SocialStream, jQuery);

data/base/app/assets/javascripts/social_stream.objects.js

@@ -0,0 +1,23 @@
+//= require social_stream.timeline
+//= require social_stream.wall
+
+SocialStream.Objects = (function(SS, $, undefined){
+	var initCallbacks = [];
+
+	var addInitCallback = function(callback){
+		initCallbacks.push(callback);
+	}
+
+	var init = function(){
+		$.each(initCallbacks, function(i, callback){ callback(); });
+	}
+
+	addInitCallback(SocialStream.Timeline.initPrivacyTooltips);
+	addInitCallback(SocialStream.Wall.activateAntiRebounds);
+
+	return {
+		addInitCallback: addInitCallback,
+		init: init
+	}
+
+})(SocialStream, jQuery);

data/base/app/assets/javascripts/social_stream.timeline.js

@@ -1,15 +1,15 @@
 SocialStream.Timeline = (function(SS, $, undefined){
-	var setupCallbacks = [];
+	var initCallbacks = [];
 
-	var addSetupCallback = function(callback){
-		setupCallbacks.push(callback);
+	var addInitCallback = function(callback){
+		initCallbacks.push(callback);
 	}
 
-	var setup = function(){
-		$.each(setupCallbacks, function(i, callback){ callback(); });
+	var init = function(){
+		$.each(initCallbacks, function(i, callback){ callback(); });
 	}
 
-	var setPrivacyTooltips = function(activityId) {
+	var initPrivacyTooltips = function(activityId) {
 		var fullId = '.activity_audience';
 		var summaryId = '.activity_audience_summary';
 
@@ -27,16 +27,43 @@ SocialStream.Timeline = (function(SS, $, undefined){
 		});
 	};
 
+	var initComments = function(){
+		//if there are 4 or more commments we only show the last 2 and a link to show the rest
+		$("#wall .activity_comments").each(function(){
+			var comments = $(this).children(".subactivity");  	
+			//check if there are more than 3 comments
+			if (comments.size() > 3){
+				$(this).prepend("<div class='hide_show_comments'><a href='#' onclick='SocialStream.Timeline.showAllComments(\""+ 
+					$(this).attr('id') +"\"); return false;'>" + I18n.t('comment.view_all') + "(" +
+					comments.size() + ")</a></div><div class='space_comments'></div>");
+				comments.slice(0,comments.size()-2).hide();
+				//hide alto space_comments
+				$(this).children(".space_comments").slice(0,comments.size()-2).hide();
+			}
+		});
+
+	}
+
+	var showAllComments = function(id){
+		$("#"+id).children().show();
+		//and hide the hide_show_comments
+		$("#"+id).children(".hide_show_comments").hide();
+	};
+
+
 	var newActivity = function(activityId){
-		setPrivacyTooltips(activityId);
+		initPrivacyTooltips(activityId);
 		SS.Wall.unblockForms();
 	}
 
-	addSetupCallback(setPrivacyTooltips);
+	addInitCallback(initPrivacyTooltips);
+	addInitCallback(initComments);
 
 	return {
-		addSetupCallback: addSetupCallback,
-		setup: setup,
+		addInitCallback: addInitCallback,
+		init: init,
+		initPrivacyTooltips: initPrivacyTooltips,
+		showAllComments: showAllComments,
                 newActivity: newActivity
 	};
 }) (SocialStream, jQuery);

data/base/app/assets/javascripts/social_stream.wall.js.erb

@@ -1,125 +1,142 @@
 //= require social_stream.timeline
 //
 SocialStream.Wall = (function(SS, $, undefined){
-	var setupCallbacks = [];
-
-	var addSetupCallback = function(callback){
-		setupCallbacks.push(callback);
-	}
-
-	var setup = function(){
-		$.each(setupCallbacks, function(i, callback){ callback(); });
-	}
-
-	var setupFirstForm = function(){
-		$('#wrapper_activities_header form').hide();
-		$('#new_<%= SocialStream.activity_forms.first %>').show();
-		$('#select_<%= SocialStream.activity_forms.first %>').addClass('selected');
-	}
-
-	var setupSecuritySelect = function(){
-		var default_security_width = '100px';
-
-		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(){
-				if($('#security').children("option:selected").size()==0){
-					$('#securities input').css('width', default_security_width)
-				}
-			});      
-		  });
-
-		  $('#securities input').blur(function(){
-			  if($('#security').children("option:selected").size()==0){
-				  $('#securities input').css('width', default_security_width)
-			  }
-		  });
-
-		  // Remove width calculation
-		  $('#securities input.default').css('width', default_security_width);
-
-	}
-
-        var activateAntiRebounds = function(){
-          $('#wrapper_activities_header form').submit(function() {
-            $(this).find('input[type=text]').each(function() {
-              $(this).blur().attr('readonly', true);
-            });
-            $("#masterSubmitButton").val(I18n.t('activity.sending') + '...').attr("disabled", true); 
-
-            // Add _relation_ids[] parameter from authorization selector
-            $('.liveAdded').remove();
-
-            var currentForm = $(this);
-
-            $('#security option:selected').each(function() {
-              currentForm.append(
-                $('<input/>')
-                .addClass('liveAdded')
-                .attr('type', 'hidden')
-                .attr('name', currentForm
-                  .attr('id').split('_')[1]+'[_relation_ids][]')
-                .val($(this).attr('value')));
-            });
-            return true;
-          });
-
-          $('.new_comment').submit(function() {
-            $(this).find('input[type=text]').each(function() {
-              $(this).blur().attr('readonly', true); 
-            });
-            $(this).find(".submitActivity").each(function() {
-              $(this).val(I18n.t('activity.sending') + '...').attr("disabled", true);   
-            });
-            return true;    
-          });
+  var initCallbacks = [];
+
+  var addInitCallback = function(callback){
+    initCallbacks.push(callback);
+  }
+
+  var init = function(){
+    $.each(initCallbacks, function(i, callback){ callback(); });
+  }
+
+  var initFirstForm = function(){
+    $('#wrapper_activities_header form').hide();
+    $('#new_<%= SocialStream.activity_forms.first %>').show();
+    $('#select_<%= SocialStream.activity_forms.first %>').addClass('selected');
+  }
+
+  var initFormButton = function(){
+    $('#masterSubmitButton').click(function(){
+      $('#wrapper_activities_header form:visible').submit();
+    });
+  }
+
+  var initFormSelector = function(){
+    $('.activity_form_selector').click(function(){
+      $('.activity_form_selector').removeClass('selected');
+      $(this).addClass('selected');
+      $('#wrapper_activities_header form').hide();
+      $('#new_'+this.id.split("_")[1]).show();
+    });
+  }
+
+  var initSecuritySelect = function(){
+    var default_security_width = '100px';
+
+    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();
+            }
+          }
         }
+      });
 
-        var unblockForms = function() {  
-          //Sharing buttons
-          $(".submitActivity").val(I18n.t('share')).removeAttr("disabled");  
-          //Header activities form
-          $("#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() {chosen.result_deselect(0)
-            $(this).removeAttr("readonly").val("");
-          }); 
+      $('#securities .search-choice a').click(function(){
+        if($('#security').children("option:selected").size()==0){
+          $('#securities input').css('width', default_security_width)
         }
-
-	addSetupCallback(setupFirstForm);
-	addSetupCallback(setupSecuritySelect);
-	addSetupCallback(activateAntiRebounds);
-
-	return {
-		addSetupCallback: addSetupCallback,
-                setup: setup,
-                activateAntiRebounds: activateAntiRebounds,
-                unblockForms: unblockForms  
-	};
+      });      
+    });
+
+    $('#securities input').blur(function(){
+      if($('#security').children("option:selected").size()==0){
+        $('#securities input').css('width', default_security_width)
+      }
+    });
+
+    // Remove width calculation
+    $('#securities input.default').css('width', default_security_width);
+
+  }
+
+  var activateAntiRebounds = function(){
+    $('#wrapper_activities_header form').submit(function() {
+      $(this).find('input[type=text]').each(function() {
+        $(this).blur().attr('readonly', true);
+      });
+      $("#masterSubmitButton").val(I18n.t('activity.sending') + '...').attr("disabled", true); 
+
+      // Add _relation_ids[] parameter from authorization selector
+      $('.liveAdded').remove();
+
+      var currentForm = $(this);
+
+      $('#security option:selected').each(function() {
+        currentForm.append(
+          $('<input/>')
+          .addClass('liveAdded')
+          .attr('type', 'hidden')
+          .attr('name', currentForm
+            .attr('id').split('_')[1]+'[_relation_ids][]')
+          .val($(this).attr('value')));
+      });
+      return true;
+    });
+
+    $('.new_comment').submit(function() {
+      $(this).find('input[type=text]').each(function() {
+        $(this).blur().attr('readonly', true); 
+      });
+      $(this).find(".submitActivity").each(function() {
+        $(this).val(I18n.t('activity.sending') + '...').attr("disabled", true);   
+      });
+      return true;    
+    });
+  }
+
+  var unblockForms = function() {  
+    //Sharing buttons
+    $(".submitActivity").val(I18n.t('share')).removeAttr("disabled");  
+    //Header activities form
+    $("#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() {chosen.result_deselect(0)
+      $(this).removeAttr("readonly").val("");
+    }); 
+  }
+
+  addInitCallback(initFirstForm);
+  addInitCallback(initFormButton);
+  addInitCallback(initFormSelector);
+  addInitCallback(initSecuritySelect);
+  addInitCallback(activateAntiRebounds);
+
+  return {
+    addInitCallback: addInitCallback,
+      init: init,
+      activateAntiRebounds: activateAntiRebounds,
+      unblockForms: unblockForms  
+  };
 }) (SocialStream, jQuery)