social_stream-presence 0.5.2 → 0.5.3

data/app/assets/javascripts/chat_interface_manager.js.erb

@@ -178,7 +178,7 @@ function updateChatWindow(){
   var stropheConnectedAndOnlineStatus = ((isStropheConnected()) && (userStatus!="offline") && (!disconnectionFlag));
   $.post("/chatWindow", { userConnected: stropheConnectedAndOnlineStatus }, function(data){
       $(".tooltip").hide() //Prevent tooltips
-      $("#chat_partial").html(data);
+      $("#chat_partial").html(modifyChatPartialIfMainBox(data));
       if (isStropheConnected()) {
         setStatusWidgetTitle(userStatus);
         $(".user_presence a[title]").tooltip();

data/app/assets/javascripts/chat_persistence.js

@@ -4,6 +4,7 @@
 
 
 function storeChatData(){
+	
   //Check for Session Storage support
   if (! window.sessionStorage){
     return
@@ -75,6 +76,19 @@ function storeUserChatStatus(){
 	sessionStorage.setItem("chat_user_status", userStatus);
 }
 
+function removeAllDataStored(){
+	sessionStorage.removeItem("cookie");
+  sessionStorage.removeItem("chat_user_name");
+  sessionStorage.removeItem("chat_user_slug");
+  sessionStorage.removeItem("chat_user_jid");
+	
+	sessionStorage.removeItem("chat_user_status");
+	
+	sessionStorage.removeItem("slugs_with_stored_log");
+	sessionStorage.removeItem("slugs_with_visible_max_chatbox");
+	sessionStorage.removeItem("slugs_with_visible_min_chatbox");
+}
+
 function getRestoreUserChatStatus(){
 	if (!window.sessionStorage) {
 		return "available";

data/app/assets/javascripts/chat_window_manager.js

@@ -8,6 +8,7 @@ var chatBoxWidth = 230;
 var chatBoxHeight = 170;
 var videoBoxHeight = 150;
 var visibleChatBoxes = new Array();
+var offsetForFlowBox = 0;
 var chatBoxSeparation = chatBoxWidth+12;
 
 
@@ -98,6 +99,11 @@ function getBoxParams(){
 		} else {
 		  nBox++;
 		  boxParams[0] = (nBox-1)*(chatBoxSeparation);
+			
+			if((nBox!=1)&&(mainChatBox!=null)){
+				boxParams[0] = boxParams[0] - offsetForFlowBox;
+			}
+			
 		  boxParams[1] = nBox;
 		}
 		
@@ -115,11 +121,18 @@ function getSlugFromChatVariable(variable){
 }
 
 function getVisibleChatBoxes(){
+	
+	for(i=0; i<visibleChatBoxes.length; i++){
+		if (visibleChatBoxes[i][0].id==chatSlugId){
+      visibleChatBoxes.splice(i,1)
+    }
+	}
+	
 	return visibleChatBoxes
 }
 
 function getAllChatBoxes(){
-  return $(".chatbox")
+  return $(".chatbox").not(document.getElementById(chatSlugId))
 }
 
 ////////////////////
@@ -191,3 +204,69 @@ function toogleVideoBoxForSlug(slug){
 function getVideoEmbedForSlug(slug){
 	return "<img src=\"http://www.batiburrillo.net/wp-content/uploads/2011/03/Freemake.jpg?cda6c1\" width=\"" + (chatBoxWidth-20) + "\"/>"
 }
+
+
+///////////////////////////
+// Create Main Chat Box
+///////////////////////////
+
+var mainChatBox;
+var chatSlugId="SocialStream_MainChat"
+
+function createMainChatBox(){
+	if (mainChatBox==null){
+		
+		//createChatBox(guest_slug,guest_name,guest_jid,user_name,user_jid)
+		if (createChatBox(chatSlugId,"Chat","Any","Any","Any")){
+			mainChatBox = window[getChatVariableFromSlug(chatSlugId)]
+			
+			//Modify default box
+			
+			//Delete closeTick and video Tick
+			$(mainChatBox.parent().parent()).find(".ui-chatbox-titlebar").find(".ui-icon-closethick").remove();
+			$(mainChatBox.parent().parent()).find(".ui-videobox-icon").remove();
+			//Delete nofitications div
+			$(mainChatBox.parent()).find(".ui-chatbox-notify").remove();
+			//Delete video div
+			$(mainChatBox.parent()).find(".ui-videobox").remove();
+			//Delete input
+			$(mainChatBox.parent()).find(".ui-chatbox-input").remove();
+			
+			//Set height
+			window[getChatVariableFromSlug(chatSlugId)].css( "height", "180" ); 
+			
+			//Set width
+			var windowWidth=150;
+			window[getChatVariableFromSlug(chatSlugId)].parent().parent().css( "width", windowWidth );
+			$(mainChatBox.parent().parent()).find(".ui-chatbox-titlebar").css( "width", windowWidth-6 );
+			$(mainChatBox).css( "width", windowWidth-6 );
+			
+			
+			//Adjust window offset
+			offsetForFlowBox = 235-windowWidth;
+			
+			//CSS Adjusts
+			$("#chat_partial").css("margin-top",-3)
+      $("#chat_partial").css("margin-left",-3)
+			$(".dropdown dd ul").css("min-width",147) 
+			
+		}
+	}
+}
+
+
+function addContentToMainChatBox(content){
+	$(mainChatBox.parent()).find("#" + chatSlugId).html(content);
+}
+
+
+function modifyChatPartialIfMainBox(chatPartial){
+	if (mainChatBox != null) {
+		p = $(chatPartial)
+    
+		$(p).find(".header").remove();
+		$(p).find(".dropdown dd ul").css("min-width",147); 
+  }
+	
+	return $(p);
+}

data/app/assets/javascripts/xmpp_client_management.js.erb

@@ -1,7 +1,6 @@
 ////////////////////
 //Global constants
 ////////////////////
-var BOSH_SERVICE = '<%= SocialStream::Presence.bosh_service || root_url + "http-bind/" %>';
 var domain = '<%=SocialStream::Presence.domain%>';
 var sound_path = "/assets/audio/chat/onMessage";
 

data/app/views/chat/_contacts.html.erb

@@ -11,7 +11,7 @@
 				<div id="status" class="dropdown">
 			    <dt><a href=""><span><%=t('chat.status.choose')%></span></a></dt>
 			    <dd>
-			        <ul>
+			        <ul id="statusList">
 					      <li><a id="available" href="#" class="option"><img class="flag" src="assets/status/available.png" alt=""/> <%=t('chat.status.available')%> <span class="value">available</span></a></li>
 					      <li><a id="away" href="#" class="option"><img class="flag" src="assets/status/away.png" alt=""/> <%=t('chat.status.away')%> <span class="value">away</span></a></li>
 					      <li><a id="dnd" href="#" class="option"><img class="flag" src="assets/status/dnd.png" alt=""/> <%=t('chat.status.dnd')%> <span class="value">dnd</span></a></li>
@@ -41,7 +41,4 @@
 			
 	  </div>
  	
-		<div id="chat_divs">	
-	    <div id="chat_div">
-	    </div>
-		</div>
+		

data/app/views/chat/_index.html.erb

@@ -1,35 +1,52 @@
 <% if current_user and current_user.chat_enabled and current_subject.subject_type=="User" %>
 	
+<div id="chat_wrapper"> 
+  <div id="chat_partial">   
+    <%= render :partial => 'chat/connecting' %>
+  </div>
+	<div id="chat_divs">  
+	  <div id="chat_div"></div>
+	</div>
+</div>
 
-	<script type="text/javascript">
 
-    //Global variables
-		var cookie = "AuthenticationByCookie>>" + "<%=cookies[Rails.application.config.session_options[:key]]%>";
-		var user_name = '<%=current_user.name%>';
-		var user_slug = '<%=current_user.slug%>';
-		var user_jid = '<%=current_user.slug%>'+"@"+domain;
+<script type="text/javascript">
 
+  //Global variables
+  var cookie = "AuthenticationByCookie>>" + "<%=cookies[Rails.application.config.session_options[:key]]%>";
+	var BOSH_SERVICE = '<%= SocialStream::Presence.bosh_service || root_url + "http-bind/" %>';
+  var user_name = '<%=current_user.name%>';
+  var user_slug = '<%=current_user.slug%>';
+  var user_jid = '<%=current_user.slug%>'+"@"+domain;
 
-		$(document).ready(function () {
-			
-			  if(getRestoreUserChatStatus()!="offline"){
-					connectToChat(user_jid,cookie,null);
-					//connectToChat(user_jid,null,null); //To use auth by password.
-					
-					initialTimer = setTimeout("updateChatWindow()", 15000);
-				} else {
-					initialTimer = setTimeout("updateChatWindow()", 1);
-				}
-				
-	      initAudio();
-				initFocusListeners();
-		});
-		
-	</script>
+
+  $(document).ready(function () {
+    
+      if(getRestoreUserChatStatus()!="offline"){
+        connectToChat(user_jid,cookie,null);
+        //connectToChat(user_jid,null,null); //To use auth by password.
+        
+        initialTimer = setTimeout("updateChatWindow()", 15000);
+      } else {
+        initialTimer = setTimeout("updateChatWindow()", 1);
+      }
+      
+      initAudio();
+      initFocusListeners();
 			
+  });
+  
+</script>
+
+	<% if flow %>
+	  <script type="text/javascript">
+	  	 $(document).ready(function () {
+			 	createMainChatBox();
+				addContentToMainChatBox(modifyChatPartialIfMainBox($("#chat_partial")));
+				$("#chat_wrapper").find("#chat_partial").remove();
+			 });
+		</script>
+	<% end %>
+
 
-	<div id="chat_partial">		
-	  <%= render :partial => 'chat/connecting' %>
-	</div>
-	
 <% end %>

data/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  #match "/active_users" => "Xmpp#active_users"
+  match "/active_users" => "Xmpp#active_users"
   
   match '/xmpp/setConnection' => "Xmpp#setConnection"
   match '/xmpp/unsetConnection' => "Xmpp#unsetConecction"

data/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.5.2"
+    VERSION = "0.5.3"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Aldo Gordillo