social_stream-presence 0.5.0 → 0.5.2

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

@@ -91,11 +91,7 @@ div.ui-chatbox-notify{
 	background: $fill-color;
 	background-color: $fill-color;
 	color: black;
-	z-index: 1;
-	position:absolute;
-	top: 0;
-	margin-top: 30px;
-	padding: 4px 0px 4px 0px;
+	height: 12px;
 	width: 236px;
 	text-align: center;
 	border-style:solid;
@@ -103,9 +99,12 @@ div.ui-chatbox-notify{
 	border-color: $fill-color;
 	opacity:0.95;
   filter:alpha(opacity=95); /* For IE8 and earlier */
+	padding: 5px 0px 5px 0px;
+	display: none;
 }
 
 p.ui-chatbox-notify-text{
+	margin-top: 10px;
   text-align: center;
 	font-weight: bold;
 }

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

@@ -12,7 +12,7 @@
 			    <dt><a href=""><span><%=t('chat.status.choose')%></span></a></dt>
 			    <dd>
 			        <ul>
-					      <li><a id="available" href="#" class="option"><img class="flag" src="assets/status/available.png" alt=""/> <%=t('chat.status.available')%> <span class="value">chat</span></a></li>
+					      <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>
 								<li><a id="offline" href="#" class="option"><img class="flag" src="assets/status/offline.png" alt=""/> <%=t('chat.status.offline')%> <span class="value">offline</span></a></li>

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

@@ -4,31 +4,25 @@
 	<script type="text/javascript">
 
     //Global variables
-		var BOSH_SERVICE = '<%= SocialStream::Presence.bosh_service || root_url + "http-bind/" %>';
 		var cookie = "AuthenticationByCookie>>" + "<%=cookies[Rails.application.config.session_options[:key]]%>";
-		var domain = '<%=SocialStream::Presence.domain%>';
 		var user_name = '<%=current_user.name%>';
 		var user_slug = '<%=current_user.slug%>';
 		var user_jid = '<%=current_user.slug%>'+"@"+domain;
-		var sound_path = "/assets/audio/chat/onMessage";
 
 
-		$(document).ready(function () {	
+		$(document).ready(function () {
 			
-			  if (authByCookie()){
-					if (connectToServerWithCookie()==false){
-	          refreshChatWindow();
-	        }
+			  if(getRestoreUserChatStatus()!="offline"){
+					connectToChat(user_jid,cookie,null);
+					//connectToChat(user_jid,null,null); //To use auth by password.
+					
+					initialTimer = setTimeout("updateChatWindow()", 15000);
 				} else {
-					if (connectToServerWithPassword(null)==false){
-	          refreshChatWindow();
-	        }
+					initialTimer = setTimeout("updateChatWindow()", 1);
 				}
 				
-				initialTimer = setTimeout("updateChatWindow()", 15000);
 	      initAudio();
 				initFocusListeners();
-				
 		});
 		
 	</script>

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

@@ -7,7 +7,7 @@
             $("#passwordFormChat").hide();
             $('.connectChatButton').bind('click', function () {
 							if (requestConnectToChat()){
-								connectToServerWithCookie();
+								connectToChat(user_jid,cookie,null);
 							}
             });
             
@@ -22,7 +22,7 @@
             
             $('.connectChatButton').bind('click', function () {
 							if (requestConnectToChat()) {
-								connectToServerWithPassword($('#user_password').val());
+								connectToChat(user_jid,null,$('#user_password').val());
 			        }
             });
           

data/lib/social_stream/presence/version.rb

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

data/vendor/assets/javascripts/jquery.ui.chatbox.js

@@ -196,6 +196,19 @@
 			 )
 		.appendTo(uiChatbox),
 		
+		
+		//Notification div
+    uiChatboxNotify = (self.uiChatboxNotify = $('<div></div>'))
+    .addClass('ui-widget-content ' + 
+       'ui-chatbox-notify'
+       )
+    .click(function(event) {
+        // anything?
+        self.uiChatboxNotify.fadeOut();
+    })
+    .appendTo(uiChatboxContent),
+		
+		
 		//VideoBox div
     uiVideobox = (self.uiVideobox = $('<div></div>'))
     .addClass('ui-widget-content ' + 
@@ -207,6 +220,7 @@
     })
     .appendTo(uiChatboxContent),
 		
+		
 		//ChatBoxLog
 	    uiChatboxLog = (self.uiChatboxLog = self.element)
 		//.show()
@@ -215,17 +229,6 @@
 			 )
 		.appendTo(uiChatboxContent),
 		
-		//Notification div
-		uiChatboxNotify = (self.uiChatboxNotify = $('<div></div>'))
-    .addClass('ui-widget-content ' + 
-       'ui-chatbox-notify'
-       )
-    .click(function(event) {
-        // anything?
-				self.uiChatboxNotify.fadeOut();
-    })
-    .appendTo(uiChatboxContent),
-		
 		
 	    uiChatboxInput = (self.uiChatboxInput = $('<div></div>'))
 		.addClass('ui-widget-content ' + 

metadata

@@ -1,79 +1,99 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: social_stream-presence
-version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 2
+  version: 0.5.2
 platform: ruby
-authors:
+authors: 
 - Aldo Gordillo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-02-03 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: social_stream-base
-  requirement: &85041730 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 14
+        - 0
         version: 0.14.0
   type: :runtime
-  prerelease: false
-  version_requirements: *85041730
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: xmpp4r
-  requirement: &85041520 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *85041520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: net-ssh
-  requirement: &85041290 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *85041290
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: net-sftp
-  requirement: &85041080 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *85041080
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: ruby-debug19
-  requirement: &85040870 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *85040870
-description: Social Stream is a Ruby on Rails engine providing your application with
-  social networking features and activity streams.
-email:
+  version_requirements: *id005
+description: Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.
+email: 
 - iamchrono@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - Rakefile
@@ -97,6 +117,7 @@ files:
 - app/assets/javascripts/chat_audio.js
 - app/assets/javascripts/chat_interface_manager.js.erb
 - app/assets/javascripts/chat_parser.js
+- app/assets/javascripts/chat_persistence.js
 - app/assets/javascripts/chat_utilities.js
 - app/assets/javascripts/chat_window_manager.js
 - app/assets/javascripts/social_stream-presence.js
@@ -206,30 +227,37 @@ files:
 - vendor/assets/javascripts/jquery.ui.chatbox.js
 - vendor/assets/javascripts/strophe.js
 - vendor/assets/stylesheets/jquery.ui.chatbox.css
+has_rdoc: true
 homepage: https://github.com/ging/social_stream-presence
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: social_stream-presence
-rubygems_version: 1.8.12
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Presence capabilities for Social Stream, the core for building social network
-  websites
+summary: Presence capabilities for Social Stream, the core for building social network websites
 test_files: []
-has_rdoc: 
+