social_stream 0.21.3 → 0.21.4

data/presence/app/assets/javascripts/chat_persistence.js

@@ -146,7 +146,7 @@ function restoreConversations() {
 			
 			
 			for (var i=0;i<storedSlugs.length;i++){
-		    restoreLog = sessionStorage.getItem("chat_log_" + storedSlugs[i]);
+		    var restoreLog = sessionStorage.getItem("chat_log_" + storedSlugs[i]);
 				
 				if (restoreLog != null){
 
@@ -179,10 +179,8 @@ function restoreConversations() {
 					
 					window[getChatVariableFromSlug(guest_slug)].html(restoreLog)
 					
-					//Mark as disconnect if user is offline.
-					if (typeof($('div.user_presence[slug=' + guest_slug + ']').attr('name')) == 'undefined') {
-            //No connectionBox for this user!
-            showChatNotificationForSlug(guest_slug,guest_name + " is offline");
+					if (! isSlugChatConnected(guest_slug)) {
+            showOfflineChatNotificationForSlug(guest_slug);
           }
 					
         }

data/presence/app/assets/javascripts/chat_utilities.js

@@ -241,6 +241,12 @@ function getNameFromSlug(slug){
 }
 
 
+////////////////////
+//Special slugs management
+////////////////////
+function isAdminSlug(slug){
+	return (slug == '<%=SocialStream::Presence.social_stream_presence_username%>');
+}
 
 
 

data/presence/app/assets/javascripts/chat_window_manager.js

@@ -70,6 +70,7 @@ function createChatBox(guest_slug,guest_name,guest_jid,user_name,user_jid){
 					}  
 					
 					window[getChatVariableFromSlug(guest_slug)].chatbox("option", "hidden", false);
+					window[getChatVariableFromSlug(guest_slug)].parent().toggle(true)
 			    return false;
 		}
 		
@@ -115,6 +116,10 @@ function closeChatBox(guest_slug){
 }
 
 
+/////////
+//Getters
+/////////
+
 function getChatVariableFromSlug(slug){
 	return "slug_" + slug;
 }
@@ -168,6 +173,7 @@ function getAllDisconnectedSlugsWithChatBoxes(){
 }
 
 
+
 ////////////////////
 //Box replacement
 ////////////////////
@@ -198,6 +204,7 @@ function rotatePriority(guest_slug){
 }
 
 
+
 ////////////////////
 //Video Window Manager functions
 ////////////////////
@@ -239,6 +246,7 @@ function getVideoEmbedForSlug(slug){
 }
 
 
+
 ///////////////////////////
 // Create Main Chat Box
 ///////////////////////////
@@ -331,7 +339,7 @@ function changeMainChatBoxHeaderTitle(title){
 function changeMainChatBoxHeight(height){
 	if (mainChatBox != null) {
 		
-		if(($("#search_chat_contact_flexselect").is(":focus"))&&(! (focusSearchContactsFlag))){
+		if(($("#chat_partial #search_chat_contact_flexselect").is(":focus"))&&(! (focusSearchContactsFlag))){
 			return;
 		} else {
 			focusSearchContactsFlag=false;

data/presence/{vendor/assets/javascripts/jquery.flexselect.js → app/assets/javascripts/jquery.flexselect.sstreampresence.js}

@@ -47,17 +47,24 @@
       this.wire();
     },
 
-    //preloadCache: function() {
-    //  this.cache = this.select.children("option").map(function() {
-    //    return { name: $.trim($(this).text()), value: $(this).val(), score: 0.0 };
-    //  });
-    //},
-		
-		preloadCache: function() {
+    preloadCache: function() {
       this.cache = this.select.children("option").map(function() {
-        return { name: ($(this).html()), value: $(this).val(), score: 0.0 };
+        return { name: $.trim($(this).text()), value: $(this).val(), score: 0.0 };
       });
     },
+		
+		//preloadCache: function() {
+    //  this.cache = this.select.children("option").map(function() {
+		//		var slug = $(this).val();
+				
+		//		if(slug!=""){
+		//			var code = $(getAvatarBoxFromSlug(slug)).html();
+		//			return { name: code, value: slug, score: 0.0 };
+		//		}
+
+        //return { name: ($(this).html()), value: $(this).val(), score: 0.0 };
+    //  });
+    //},
 
     renderControls: function() {
       var selected = this.select.children("option:selected");
@@ -119,6 +126,7 @@
           self.markSelected(rows.index($(event.target)));
         }
       });
+			
       this.dropdownList.mouseleave(function () {
         self.markSelected(-1);
       });

data/presence/app/assets/javascripts/social_stream-presence.js

@@ -1,7 +1,7 @@
 //= require jquery
 //= require strophe
 //= require jquery.tools.tooltip
-//= require jquery.ui.chatbox
-//= require jquery.flexselect
+//= require jquery.ui.chatbox.sstreampresence
+//= require jquery.flexselect.sstreampresence
 //= require liquidmetal
 //= require_tree .

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

@@ -223,8 +223,8 @@ function onConnect(status) {
     awayTimer = setInterval("awayTimerFunction()", awayTimerPeriod);
     timer = setInterval("timerFunction()", timerPeriod);
   }
-  
-  updateChatWindow();
+	 
+	 updateChatWindow();
 }
 
 function onReconnect(){
@@ -249,15 +249,6 @@ function onReconnect(){
 }
 
 
-function changeChatHeaderTitle(msg){
-	if(mainChatBox==null){
-		$("#chat_header_title").html(msg)
-	} else {
-		changeMainChatBoxHeaderTitle(msg);
-	}
-}
-
-
 function disconnectStrophe(){
   userStatus = "offline";
   setStatusWidgetTitle("offline");
@@ -328,14 +319,12 @@ function processAvailablePresenceStanza(presence){
   if (slug != user_slug) {
     if (getConnectionBoxFromSlug(slug)!=null){
       var status = $(presence).find('show').text(); 
-      setUserIconStatus(slug, status);
-      if (cacheConnectedUsers.indexOf(slug) != -1) {
-        showConnectionBoxFromSlug(slug);
-        hideChatNotificationForSlug(slug);
-				updateConnectedUsersOfMainChatBox();
-      } 
+      setUserIconStatus(slug,status);
+			updateInterfaceAfterPresenceStanza(slug,true);
     } else {
-      setTimeout("refreshChatWindow()", 3000);
+			if(! isAdminSlug(slug)){
+				setTimeout("refreshChatWindow()", 3000);
+			}
     }
   }   
 }
@@ -346,9 +335,7 @@ function processUnavailablePresenceStanza(presence){
   
   if (slug != user_slug) {
     if (getConnectionBoxFromSlug(slug)!=null){
-      hideConnectionBoxFromSlug(slug);
-			showOfflineChatNotificationForSlug(slug);
-			updateConnectedUsersOfMainChatBox();
+			updateInterfaceAfterPresenceStanza(slug,false)
     }
   }
 }

data/presence/app/assets/stylesheets/chat.css.scss

@@ -106,9 +106,9 @@ div.ui-chatbox-notify{
 }
 
 p.ui-chatbox-notify-text{
-	margin-top: 10px;
+	margin-top: 0px;
   text-align: center;
-	font-weight: bold;
+	/* font-weight: bold; */
 }
 
 
@@ -141,6 +141,18 @@ p.ui-chatbox-notify-text{
 
 /* Presence Partial */
 
+#chat_connecting{
+	display: none;
+}
+
+#chat_connection_off{
+	display: none;
+}
+
+#chat_widgets{
+  display: none;
+}
+
 div.user_presence {
 	float: left;
 	position: relative;
@@ -161,9 +173,9 @@ div.user_presence {
 
 .presence_status {
 	position: absolute;
-  bottom:0px;
-  right:0px;
-  border:none;
+  bottom: 0px;
+  left: 14px;
+  border: none;
 }
 
 .users_connected{
@@ -194,7 +206,6 @@ input.chat_password{
 	margin-bottom: 5px;
 }
 
-
 input.connectChatButton{
 	text-align: center;
 	width: 150px;
@@ -355,15 +366,8 @@ a.chatImageLink:link, a.chatImageLink:visited {
 }
 
 
-
-
 /* Search contacts stylesheet */
 
-div.allContacts {
-  width: 100px;
-  display: block;
-}
-
 #search_chat_contact_flexselect {
   background: url('btn/search_icon.png') 5px 50% no-repeat $secondary-color;
   padding: 0 0px 0 0px;

data/presence/app/controllers/xmpp_controller.rb

@@ -106,11 +106,8 @@ class XmppController < ApplicationController
   #OPEN METHODS
   
   def chatWindow 
-    if current_user and current_user.chat_enabled and (params[:userConnected]=="true")
+    if current_user and current_user.chat_enabled
       render :partial => 'chat/contacts'
-    elsif current_user and current_user.chat_enabled
-      #User not connected
-      render :partial => 'chat/off'
     else
       #User with chat disabled
       render :text => ''

data/presence/app/helpers/xmpp_helper.rb

@@ -1,22 +1,13 @@
 module XmppHelper
   
   def getChatContacts 
-     connected_users = []
-     all_users = []
+    #Get bidirectional contacts
+    contacts = current_user.contact_actors(:type=>:user)
      
-     #Get bidirectional contacts
-     contacts = current_user.contact_actors(:type=>:user)
+    #Apply filters
+    #...
      
-     #Apply filters
-     
-     contacts.each do |contact|
-       if contact.user.connected
-         connected_users << contact.user
-       end
-       all_users << contact.user 
-     end
-
-    return [connected_users,all_users]  
+    return contacts;
   end
-  
+ 
 end

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

@@ -1,65 +1,18 @@
-<div>
-	<div class="block">
-    <div class="header">
-      <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
-      <div class="header_text">
-        <%=t('chat.title')%>
-      </div>
-    </div>
-		
-		<div id="status" class="dropdown">
-	    <dt><a href=""><span><%=t('chat.status.choose')%></span></a></dt>
-	    <dd>
-	      <ul id="statusList">
-			    <li><a id="available" href="#" class="option"><img class="flag" src="<%=image_path("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="<%=image_path("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="<%=image_path("status/dnd.png")%>" alt=""/> <%=t('chat.status.dnd')%> <span class="value">dnd</span></a></li>
-				  <li><a id="offline" href="#" class="option"><img class="flag" src="<%=image_path("status/offline.png")%>" alt=""/> <%=t('chat.status.offline')%> <span class="value">offline</span></a></li>
-	      </ul>
-	    </dd>
-    </div>
-		
-  </div>
-	
-  <% @contacts = getChatContacts %>
-  <% @online_contacts = @contacts[0] %>
-	<% @all_contacts = @contacts[1] %>
-
-	<div class="allContacts">      
-    <select data-placeholder="Search Contact" id="search_chat_contact" class="flexselect">
-      <option value=""></option>
-      <% unless @all_contacts.empty? %>
-        <%@all_contacts.each do |contact| %>
-          <option value="<%=contact.slug%>">
-          	<%=contact.name%>
-							<a title='<%=contact.name%>' class="presence_user_link" width="28">
-	             <%=image_tag(contact.logo.url, :alt => contact.name , :size => "28x28")%>
-	             <% if contact.user.status %>
-	              <%=image_tag("status/" + contact.user.status + ".png", :class => "presence_status") %></a>
-	             <% end %>
-	           </a>
-					</option>
-        <% end %>
-      <% else %>
-			  <option value="ZERO_CONTACTS"> <%=t('chat.zerocontacts')%></option>
-			<% end %>
-    </select>
-  </div>
+<% @all_contacts =  getChatContacts %>
 
-	<div class="users_connected">
-	  <% if @online_contacts.empty? %>
-	    <p class="zero_users_connected"> <%=t('chat.zerousers')%> </p>
-	  <% else %>
-		  <%@online_contacts.each do |contact| %>
-			  <div class="user_presence" name='<%=contact.name%>' slug='<%=contact.slug%>'>
-				  <a title='<%=contact.name%>' class="presence_user_link" width="28">
-					  <%=image_tag(contact.logo.url, :alt => contact.name , :size => "28x28")%>
-					  <% if contact.user.status %>
-					    <%=image_tag("status/" + contact.user.status + ".png", :class => "presence_status") %></a>
-					  <% end %>
-					</a>
-        </div>
-		  <%end%>
+<div class="users_connected">
+  <%@all_contacts.each do |contact| %>
+		<% if contact.user.connected %>
+		  <div class="user_presence" name='<%=contact.name%>' slug='<%=contact.slug%>' connected='true'>
+		<% else %>
+		  <div class="user_presence" name='<%=contact.name%>' slug='<%=contact.slug%>' connected='false'>
 		<% end %>
-	</div>	
-</div>	
+        <a title='<%=contact.name%>' class="presence_user_link" width="28">
+          <%=image_tag(contact.logo.url, :alt => contact.name , :size => "28x28")%>
+          <% if contact.user.status %>
+            <%=image_tag("status/" + contact.user.status + ".png", :class => "presence_status") %>
+          <% end %>  
+        </a>
+      </div>
+  <%end%>
+</div>

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

@@ -1,12 +1,73 @@
 <% 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 id="chat_partial">    
   </div>
+	
 	<div id="chat_divs">  
 	  <div id="chat_div"></div>
 	</div>
+	
+	<div id="chat_connecting">
+	  <div class="block">
+      <div class="header">
+        <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
+        <div class="header_text">
+          <%=t('chat.connecting')%>
+        </div>
+      </div>
+    </div>
+	</div>
+	
+  <div id="chat_connection_off">
+    <div class="block">
+      <div class="header">
+        <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
+        <div class="header_text">
+          <p id="chat_header_title"><%=t('chat.disconnected')%></p>
+        </div>
+      </div>
+    </div>
+    <div class="chat_off">
+      <div id="passwordFormChat">
+        <label for="user_password" class="chatPasswordTitle"><%=t('chat.password')%></label>
+        <input id="user_password" class="chat_password" type="password"></input>
+      </div>
+      <input class="connectChatButton storePass" value="Connect">
+    </div>	
+	</div>
+	
+	<div id="chat_widgets">
+		<div class="block">
+      <div class="header">
+        <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
+        <div class="header_text">
+          <%=t('chat.title')%>
+        </div>
+      </div>
+    
+	    <div id="status" class="dropdown">
+	      <dt><a href=""><span><%=t('chat.status.choose')%></span></a></dt>
+	      <dd>
+	        <ul id="statusList">
+	          <li><a id="available" href="#" class="option"><img class="flag" src="<%=image_path("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="<%=image_path("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="<%=image_path("status/dnd.png")%>" alt=""/> <%=t('chat.status.dnd')%> <span class="value">dnd</span></a></li>
+	          <li><a id="offline" href="#" class="option"><img class="flag" src="<%=image_path("status/offline.png")%>" alt=""/> <%=t('chat.status.offline')%> <span class="value">offline</span></a></li>
+	        </ul>
+	      </dd>
+	    </div>
+						
+			<div class="searchChatContacts">
+			    <select id="search_chat_contact" class="flexselect">
+			      <option value="">""</option>
+			    </select>
+			</div>
+			
+    </div>
+	</div>
+	
 </div>
 
 
@@ -21,10 +82,17 @@
 
 
   $(document).ready(function () {
-    
+			
+			//Inicial field
+			$("#chat_partial").html($("#chat_connecting").html())
+		
       if(getRestoreUserChatStatus()!="offline"){
-        connectToChat(user_jid,cookie,null);
-        //connectToChat(user_jid,null,null); //To use auth by password.
+				if (authByCookie()){
+					connectToChat(user_jid,cookie,null);
+				} else {
+					//Auth by password
+					connectToChat(user_jid,null,null);
+				}
         
         initialTimer = setTimeout("updateChatWindow()", 15000);
       } else {
@@ -32,20 +100,20 @@
       }
       
       initAudio();
-      initFocusListeners();			
+      initFocusListeners();
   });
   
 </script>
 
-	<% if flow %>
-	  <script type="text/javascript">
-	  	 $(document).ready(function () {
-			 	createMainChatBox();
-				addContentToMainChatBox(modifyChatPartialIfMainBox($("#chat_partial")));
-				$("#chat_wrapper").find("#chat_partial").remove();
-			 });
-		</script>
-	<% end %>
+<% if flow %>
+  <script type="text/javascript">
+	  $(document).ready(function () {
+		  createMainChatBox();
+			addContentToMainChatBox(modifyChatPartialIfMainBox($("#chat_partial")));
+			$("#chat_wrapper").find("#chat_partial").remove();
+		});
+	</script>
+<% end %>
 
 
 <% end %>