social_stream-presence 0.7.0 → 0.7.1

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

@@ -12,7 +12,7 @@ function connectButtonTimerFunction(){
     connectButtonTimerCounter++;
     if (connectButtonTimerCounter > (periodBetweenAttempts-1)) {
       clearTimeout(connectButtonTimer);
-      $("#chat_header_title").html('<%=I18n.t('chat.disconnected')%>')
+			changeChatHeaderTitle(I18n.t('chat.disconnected'))
     }
 }
 
@@ -20,7 +20,7 @@ function requestConnectToChat(){
   if (connectButtonTimerCounter > (periodBetweenAttempts-1)) {
     connectButtonTimerCounter=0;
     connectButtonTimer = setInterval("connectButtonTimerFunction()", 1000) 
-    $("#chat_header_title").html('<%=I18n.t('chat.connecting')%>')
+		changeChatHeaderTitle(I18n.t('chat.connecting'))
     return true
   } else {
     return false
@@ -110,8 +110,11 @@ function setUserFunctions(){
 	//Search contacts enabling
 	///////////////
 	$("select.flexselect").flexselect({
-    allowMismatch: true
+    allowMismatch: true,
+		defaultmessage: I18n.t('chat.zerocontacts')
   });
+
+	$("#search_chat_contact_flexselect").Watermark(I18n.t('chat.search'),"#666");
 	
 	//Select contact function
 	//callback in changeSelectContactValue()
@@ -129,8 +132,9 @@ function setUserFunctions(){
 
 
 function changeSelectContactValue(name,value){
-	$("#search_chat_contact_flexselect").blur();
-	
+
+  $("#search_chat_contact_flexselect").blur();
+
 	if(value == "ZERO_CONTACTS"){
 		return;
 	}
@@ -209,7 +213,7 @@ function setStatusWidgetTitle(status){
   }
   
   if(status=="default"){
-    var defaultTitle = '<%=I18n.t('chat.status.choose')%>'
+    var defaultTitle = I18n.t('chat.status.choose')
     $(".dropdown dt a span").html(defaultTitle);
     return;
   }
@@ -329,7 +333,7 @@ function hideConnectionBoxFromSlug(slug){
 			if($(".users_connected p.zero_users_connected").length > 0){
 				$(".users_connected p.zero_users_connected").show();
 			} else {
-				var msg = '<%=I18n.t('chat.zerousers')%>';
+				var msg = I18n.t('chat.zerousers');
         $(".users_connected").append('<p class="zero_users_connected">' + msg + '</p>')
 			}
     }
@@ -447,7 +451,7 @@ function showOfflineChatNotificationForSlug(slug){
 	var slug_chat_box = getChatBoxForSlug(slug);
 	if(slug_chat_box!=null){
 		var name = slug_chat_box.attr("name")
-    var msg =  name + ' ' + '<%=I18n.t('chat.notify.guestOffline')%>';
+    var msg =  name + ' ' + I18n.t('chat.notify.guestOffline');
     showChatNotificationForSlug(slug,msg);
 	}
 }
@@ -464,7 +468,7 @@ function hideChatNotificationForSlug(slug){
 
 function notifyWhenUsersDisconnect(){
   var notification = $("div.ui-chatbox-notify");
-  var msg = '<%=I18n.t('chat.notify.offline')%>';
+  var msg = I18n.t('chat.notify.offline');
   showChatNotification(notification,msg);
 }
 
@@ -492,9 +496,17 @@ function updateAllNotifications(){
 
 function updateConnectedUsersOfMainChatBox(){
   if(mainChatBox!=null){
-    var connectedUsers = getAllConnectedSlugs().length;
-    changeMainChatBoxHeaderTitle( '<%=I18n.t('chat.title')%>' + " (" + connectedUsers + ")");
-    changeMainChatBoxHeight(getChatBoxHeightRequiredForConnectionBoxes());
+		if(isStropheConnected()){
+			var connectedUsers = getAllConnectedSlugs().length;
+      changeMainChatBoxHeaderTitle( I18n.t('chat.title') + " (" + connectedUsers + ")");
+      changeMainChatBoxHeight(getChatBoxHeightRequiredForConnectionBoxes());
+		} else {
+			if(afterFirstConnectionFlag){
+				changeChatHeaderTitle(I18n.t('chat.connecting'))
+			} else {
+				changeChatHeaderTitle(I18n.t('chat.disconnected'))
+			}	
+		}
   }
 }
 

data/app/assets/javascripts/chat_window_manager.js

@@ -266,12 +266,16 @@ function createMainChatBox(){
 			//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();
+			//Margin for minusthick
+			(mainChatBox.parent().parent()).find(".ui-chatbox-titlebar").find(".chat-minusthick").parent().css("margin-right","5px")
 			//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();
+			//Background
+			$(mainChatBox).css("background-color",$(mainChatBox.parent().parent()).find(".ui-chatbox-titlebar").css("background-color"));
 			
 			//Set height
 			changeMainChatBoxHeight(getChatBoxHeightRequiredForConnectionBoxes());

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

@@ -207,6 +207,8 @@ function onConnect(status) {
     //addHandler:(callback, namespace to match, stanza name, stanza type, stanza id , stanza from, options)
     connection.addHandler(onMessage, null, 'message', null, null,  null);
     connection.addHandler(onPresence, null, 'presence', null, null,  null); 
+		connection.addHandler(onIQStanza,null, "iq", null, null);
+
 		
     disconnectionFlag = false;
     afterNewConnectionFlag = true;
@@ -232,20 +234,30 @@ function onReconnect(){
     if (reconnectAttempts>0) {
       reconnectAttempts--;
       
-      $("#chat_header_title").html('<%=I18n.t('chat.reconnecting')%>')
+			changeChatHeaderTitle(I18n.t('chat.reconnecting'))
 			
 			connectToChat(user_jid,cookie,null);
 			
       reconnectTimer = setTimeout ("onReconnect()", 9000);
 			
     } else {
-      $("#chat_header_title").html('<%=I18n.t('chat.unableconnect')%>')
+			changeChatHeaderTitle(I18n.t('chat.unableconnect'))
       //Notify issue to Rails App Server?
     }
     
   }
 }
 
+
+function changeChatHeaderTitle(msg){
+	if(mainChatBox==null){
+		$("#chat_header_title").html(msg)
+	} else {
+		changeMainChatBoxHeaderTitle(msg);
+	}
+}
+
+
 function disconnectStrophe(){
   userStatus = "offline";
   setStatusWidgetTitle("offline");
@@ -256,6 +268,7 @@ function disconnectStrophe(){
   } 
 }
 
+
 ////////
 //Manage Message stanzas
 ///////
@@ -287,7 +300,7 @@ function onPresence(presence) {
 		log(presence)
 		
     //Check presence stanza type
-    ptype = $(presence).attr('type');
+    var ptype = $(presence).attr('type');
         
     switch (ptype){
       case undefined:
@@ -309,12 +322,12 @@ function onPresence(presence) {
 
 
 function processAvailablePresenceStanza(presence){
-  from = $(presence).attr('from');
-  slug = from.split("@")[0];
+  var from = $(presence).attr('from');
+  var slug = from.split("@")[0];
   
   if (slug != user_slug) {
     if (getConnectionBoxFromSlug(slug)!=null){
-      status = $(presence).find('show').text(); 
+      var status = $(presence).find('show').text(); 
       setUserIconStatus(slug, status);
       if (cacheConnectedUsers.indexOf(slug) != -1) {
         showConnectionBoxFromSlug(slug);
@@ -328,8 +341,8 @@ function processAvailablePresenceStanza(presence){
 }
 
 function processUnavailablePresenceStanza(presence){
-  from = $(presence).attr('from');
-  slug = from.split("@")[0];
+  var from = $(presence).attr('from');
+  var slug = from.split("@")[0];
   
   if (slug != user_slug) {
     if (getConnectionBoxFromSlug(slug)!=null){
@@ -340,6 +353,65 @@ function processUnavailablePresenceStanza(presence){
   }
 }
 
+
+////////
+//Manage IQ stanzas
+///////
+function onIQStanza(iq){
+  
+	var from = iq.getAttribute("from");
+	var slug = from.split("@")[0];
+	
+	if (slug == user_slug) {
+		return;
+  }
+	
+	var queryElements = iq.getElementsByTagName('query');
+
+  if (queryElements.length > 0) {
+    var query = queryElements[0];
+		var type = query.getAttribute("xmlns");
+		
+		if( type == "jabber:iq:version"){
+			var iqID = iq.getAttribute("id");
+			
+			//Response to client info request.
+			sendIQStanzaWithClientInfo(from,iqID);
+		}
+	}
+
+	return true;
+}
+
+
+function sendIQStanzaWithClientInfo(jid,iqID){
+	var client = "Social Stream XMPP Client"
+	var version = '<%=Socialstream::Presence::VERSION%>';
+	var iq = $iq({to: jid, type: "result", id: iqID})
+  .c("query", {xmlns: "jabber:iq:version"}).c("name").t(client).up().c("version").t(version);
+	connection.sendIQ(iq);
+}
+
+
+var iqIDNumber = 1000;
+function sendIQStanzaForRequestClientInfo(jid){
+  //var client = "Social Stream XMPP Client"
+  //var version = '<%=Socialstream::Presence::VERSION%>';
+  //var iq = $iq({to: jid, type: "result", id: iqID})
+  //.c("query", {xmlns: "jabber:iq:version"}).c("name").t(client).up().c("version").t(version);
+  //connection.sendIQ(iq);
+}
+
+
+function iqSuccess(){
+	log("iq sucess")
+}
+
+function iqFail(){
+	log("iq fail")
+}
+
+
 ////////
 //Send Message stanzas
 ///////

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

@@ -357,7 +357,7 @@ a.chatImageLink:link, a.chatImageLink:visited {
 
 
 
-/* Chosen stylesheet */
+/* Search contacts stylesheet */
 
 div.allContacts {
   width: 100px;
@@ -388,5 +388,4 @@ div.allContacts {
 
 #search_chat_contact_flexselect_dropdown li:hover {
 	background: $separation-color;
-}
-
+}

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

@@ -30,7 +30,15 @@
       <option value=""></option>
       <% unless @all_contacts.empty? %>
         <%@all_contacts.each do |contact| %>
-          <option value="<%=contact.slug%>"><%=contact.name%></option>
+          <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>

data/config/locales/en.yml

@@ -7,6 +7,7 @@ en:
     title: "Chat"
     password: "Password"
     zerousers: "No users connected"
+    search: "Search contacts"
     zerocontacts: "No contacts found"
     status: 
       choose: "Choose status"

data/config/locales/es.yml

@@ -7,6 +7,7 @@ es:
     title: "Chat"
     password: "Contraseña"
     zerousers: "No hay contactos conectados"
+    search: "Buscar contactos"
     zerocontacts: "No se encontró ningún contacto"
     status:
       choose: "Establecer estado"

data/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.7.0"
+    VERSION = "0.7.1"
   end
 end

data/social_stream-presence.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.16.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.16.1')
   
   s.add_runtime_dependency "xmpp4r"
 

data/vendor/assets/javascripts/jquery.flexselect.js

@@ -21,6 +21,7 @@
       allowMismatch: false,
       selectedClass: "flexselect_selected",
       dropdownClass: "flexselect_dropdown",
+			defaultmessage: "No results",
       inputIdTransform:    function(id)   { return id + "_flexselect"; },
       inputNameTransform:  function(name) { return; },
       dropdownIdTransform: function(id)   { return id + "_flexselect_dropdown"; }
@@ -46,9 +47,15 @@
       this.wire();
     },
 
-    preloadCache: function() {
+    //preloadCache: function() {
+    //  this.cache = this.select.children("option").map(function() {
+    //    return { name: $.trim($(this).text()), value: $(this).val(), score: 0.0 };
+    //  });
+    //},
+		
+		preloadCache: function() {
       this.cache = this.select.children("option").map(function() {
-        return { name: $.trim($(this).text()), value: $(this).val(), score: 0.0 };
+        return { name: ($(this).html()), value: $(this).val(), score: 0.0 };
       });
     },
 
@@ -65,6 +72,7 @@
         name: this.settings.inputNameTransform(this.select.attr("name")),
         accesskey: this.select.attr("accesskey"),
         tabindex: this.select.attr("tabindex"),
+				placeholder: this.select.attr("placeholder"),
         style: this.select.attr("style")
       }).addClass(this.select.attr("class")).val($.trim(selected.text()));
 
@@ -84,6 +92,7 @@
       this.input.click(function() {
         self.lastAbbreviation = null;
         self.focus();
+				if (!self.picked) self.filterResults();
       });
 
       this.input.mouseup(function(event) {
@@ -94,7 +103,7 @@
       this.input.focus(function() {
         self.abbreviationBeforeFocus = self.input.val();
         self.input.select();
-        if (!self.picked) self.filterResults();
+        //if (!self.picked) self.filterResults();
       });
 
       this.input.blur(function() {
@@ -185,8 +194,13 @@
         this.score = LiquidMetal.score(this.name, abbreviation);
         if (this.score > 0.0) results.push(this);
       });
+			
+			if (results.length==0){
+				var defaultOption = { name: this.settings.defaultmessage, value: "ZERO_CONTACTS", score: 9.9 };
+				results.push(defaultOption);
+			}
+			
       this.results = results;
-
       this.sortResults();
       this.renderDropdown();
       this.markFirst();
@@ -208,10 +222,13 @@
       });
 
       var list = this.dropdownList.html("");
-      $.each(this.results, function() {
-        // list.append($("<li/>").html(this.name + " <small>[" + Math.round(this.score*100)/100 + "]</small>"));
-        list.append($("<li/>").html(this.name));
-      });
+
+      if (this.results.length > 0) {
+				$.each(this.results, function() {
+	        list.append($("<li/>").html(this.name));
+	      });
+			}
+			
       this.dropdown.show();
     },
 
@@ -230,16 +247,16 @@
       if (selected) {
         //this.input.val(selected.name);
         //this.picked = true;
+				this.hidden.val(selected.value);
+        this.input.val("");
 				if(typeof changeSelectContactValue == "function"){
-          changeSelectContactValue(selected.name,selected.value);
+          return changeSelectContactValue(selected.name,selected.value);
         } 
-				this.hidden.val(selected.value);
       } else if (this.settings.allowMismatch) {
         this.hidden.val("");
       } else {
         this.reset();
       }
-			this.input.val("");
     },
 
     hide: function() {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-presence
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,18 +13,18 @@ date: 2012-02-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &80653400 !ruby/object:Gem::Requirement
+  requirement: &85013850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.16.1
   type: :runtime
   prerelease: false
-  version_requirements: *80653400
+  version_requirements: *85013850
 - !ruby/object:Gem::Dependency
   name: xmpp4r
-  requirement: &80653190 !ruby/object:Gem::Requirement
+  requirement: &85013460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80653190
+  version_requirements: *85013460
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &80652960 !ruby/object:Gem::Requirement
+  requirement: &85013170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80652960
+  version_requirements: *85013170
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &80652750 !ruby/object:Gem::Requirement
+  requirement: &85012890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80652750
+  version_requirements: *85012890
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &80652540 !ruby/object:Gem::Requirement
+  requirement: &85012460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80652540
+  version_requirements: *85012460
 description: Social Stream is a Ruby on Rails engine providing your application with
   social networking features and activity streams.
 email: