social_stream-presence 0.13.1 → 0.13.2

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

@@ -2,73 +2,87 @@
 //Audio functions
 ////////////////////
 
-//Global audio variables
-var audio_path = '<%=image_path("chat")%>';
-var onMessageAudio;
-
-var html5_audiotypes=[
-  ["mp3","audio/mpeg"],
-  //["mp4","audio/mp4"],
-  //["ogg","audio/ogg"],
-  ["wav","audio/wav"]
-]
-
-function initAudio(){
-  //Init all audio files
-  initSound("onMessageAudio");
-}
-
-function initSound(sound){
+PRESENCE.AUDIO = (function(P,$,undefined){
+		
+	//Audio variables
+	var audio_path = '<%=image_path("chat")%>';
+	var onMessageAudio;
+	
+	var html5_audiotypes=[
+	  ["mp3","audio/mpeg"],
+	  //["mp4","audio/mp4"],
+	  //["ogg","audio/ogg"],
+	  ["wav","audio/wav"]
+	]
+	
+	
+	var init = function(){
+    //Init all audio files
+    initSound("onMessageAudio");
+  }
+	
+	
+	var initSound = function(sound){
   
-  //Check support for HTML5 audio
-  var html5audio=document.createElement('audio')
+    //Check support for HTML5 audio
+    var html5audio=document.createElement('audio')
   
-  if (html5audio.canPlayType){ 
-    path = audio_path + "/" + sound;
-    window[sound] = new Audio();
+    if (html5audio.canPlayType){ 
+      path = audio_path + "/" + sound;
+      window[sound] = new Audio();
 
-    for(i=0; i<html5_audiotypes.length; i++){
-      if (window[sound].canPlayType(html5_audiotypes[i][1])) {
-        var source= document.createElement('source');
-        source.type= html5_audiotypes[i][1];
-        source.src= path + '.' + html5_audiotypes[i][0];
-        window[sound].addEventListener('ended', endSoundListener);
-        window[sound].appendChild(source);
-      } 
-    }
-  } else {
+	    for(i=0; i<html5_audiotypes.length; i++){
+	      if (window[sound].canPlayType(html5_audiotypes[i][1])) {
+	        var source= document.createElement('source');
+	        source.type= html5_audiotypes[i][1];
+	        source.src= path + '.' + html5_audiotypes[i][0];
+	        window[sound].addEventListener('ended', endSoundListener);
+	        window[sound].appendChild(source);
+	      } 
+	    }
+    } else {
     //Browser doesn't support HTML5 audio
+    }
   }
-}
 
-function endSoundListener(){ }
 
-function playSound(sound){
-  if (window[sound]!=null){
-    window[sound].play();
-  } else {
-    //Fallback option: When browser doesn't support HTML5 audio
-    $('body').append('<embed src="' + audio_path + '/' + sound + '.mp3" autostart="true" hidden="true" loop="false">');
-  }
-}
+  function endSoundListener(){ }
 
-function initAndPlaySound(sound){
-    initSound(sound);
-    playSound(sound);
-}
 
+	function playSound(sound){
+	  if (window[sound]!=null){
+	    window[sound].play();
+	  } else {
+	    //Fallback option: When browser doesn't support HTML5 audio
+	    $('body').append('<embed src="' + audio_path + '/' + sound + '.mp3" autostart="true" hidden="true" loop="false">');
+	  }
+	}
 
-function mustPlaySoundForChatWindow(chatBox){
-  //Deny conditions
-  if(userStatus == "dnd"){
-    return false;
-  }
-  
-  //Accept conditions
-  if (!chatFocus){
-    return true;
-  }
-  
-  //Default action
-  return false
-}
+	function initAndPlaySound(sound){
+	    initSound(sound);
+	    playSound(sound);
+	}
+
+
+	function mustPlaySoundForChatWindow(chatBox){
+	  //Deny conditions
+	  if(PRESENCE.XMPPClient.getUserStatus() == "dnd"){
+	    return false;
+	  }
+	  
+	  //Accept conditions
+	  if (!PRESENCE.UTILITIES.getChatFocus()){
+	    return true;
+	  }
+	  
+	  //Default action
+	  return false
+	}
+	
+  return {
+    init                        : init,
+		mustPlaySoundForChatWindow  : mustPlaySoundForChatWindow,
+    playSound                   : playSound
+  };
+
+}) (PRESENCE, jQuery);

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

@@ -40,8 +40,12 @@ PRESENCE.GAME = (function(P,$,undefined){
 	//         CORE METHODS        //
 	/////////////////////////////////
 	
-  var init = function(myConnection){
-    P.GAME.COMUNICATION.init(myConnection);
+  var init = function(){
+		var enable = '<%=SocialStream::Presence.games%>';
+		if(enable=="true"){
+			P.GAME.INTERFACE.enableGameFeature(true);
+      P.GAME.COMUNICATION.init(PRESENCE.XMPPClient.getConnection());
+		}
   };
 	
 
@@ -56,7 +60,7 @@ PRESENCE.GAME = (function(P,$,undefined){
       var gameStatus = null;
     }
     
-    if(! isUserConnected()){
+    if(! PRESENCE.XMPPClient.isUserConnected()){
       P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug, I18n.t("chat.game.offline"));
       if(gameStatus!=null){
         contactsInfo[slug].gameStatus = "disconnected";
@@ -64,8 +68,8 @@ PRESENCE.GAME = (function(P,$,undefined){
       return;
     }
 
-    if(! isSlugChatConnected(slug)){
-      P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug, I18n.t("chat.game.guestOffline", {name: getNameFromSlug(slug)}));
+    if(! PRESENCE.UIMANAGER.isSlugChatConnected(slug)){
+      P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug, I18n.t("chat.game.guestOffline", {name: PRESENCE.XMPPClient.getNameFromSlug(slug)}));
       if(gameStatus!=null){
         contactsInfo[slug].gameStatus = "disconnected";
       }
@@ -142,13 +146,13 @@ PRESENCE.GAME = (function(P,$,undefined){
       contactsInfo[slug].gameStatus = "playing";
       P.GAME.INTERFACE.updateInterfaceBeforeStartGame(slug,contactsInfo[slug].game)
     } else if (response=="no"){
-      P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug,I18n.t("chat.game.rejected", {name: getNameFromSlug(slug)}));
+      P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug,I18n.t("chat.game.rejected", {name: PRESENCE.XMPPClient.getNameFromSlug(slug)}));
       contactsInfo[slug].gameStatus="disconnected";
     } else if (response=="busy"){
-      P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug,I18n.t("chat.game.rejectedBusy", {name: getNameFromSlug(slug)}));
+      P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug,I18n.t("chat.game.rejectedBusy", {name: PRESENCE.XMPPClient.getNameFromSlug(slug)}));
       contactsInfo[slug].gameStatus="disconnected";
     } else {
-			P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug,I18n.t("chat.game.unknown", {name: getNameFromSlug(slug)}));
+			P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug,I18n.t("chat.game.unknown", {name: PRESENCE.XMPPClient.getNameFromSlug(slug)}));
       contactsInfo[slug].gameStatus="disconnected";
 		}
   }
@@ -157,10 +161,10 @@ PRESENCE.GAME = (function(P,$,undefined){
     if(slug in contactsInfo){
       if (status == "finish") {
         if (contactsInfo[slug].gameStatus == "pending") {
-          P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug, I18n.t("chat.game.cancel", {name: getNameFromSlug(slug)}));
+          P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug, I18n.t("chat.game.cancel", {name: PRESENCE.XMPPClient.getNameFromSlug(slug)}));
           contactsInfo[slug].gameStatus = "disconnected";
         } else if (contactsInfo[slug].gameStatus == "playing") {
-          P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug, I18n.t("chat.game.finish", {name: getNameFromSlug(slug)}));
+          P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug, I18n.t("chat.game.finish", {name: PRESENCE.XMPPClient.getNameFromSlug(slug)}));
           contactsInfo[slug].gameStatus = "disconnected";
         } 
       }
@@ -168,6 +172,14 @@ PRESENCE.GAME = (function(P,$,undefined){
       finishGame(slug);
     }
   }
+	
+	var updateLogicAfterReceivedGameRequestError = function(slug){
+    if(contactsInfo[slug].gameStatus!="waiting"){
+      return true;
+    }
+    P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug,I18n.t("chat.game.clientIssue", {name: PRESENCE.XMPPClient.getNameFromSlug(slug)}));
+    contactsInfo[slug].gameStatus="disconnected";
+  }
 
   var getPlayerNameWithId = function(slug){
 		if(! slug in contactsInfo){
@@ -251,13 +263,13 @@ PRESENCE.GAME = (function(P,$,undefined){
 	      return;
       }
     } else {
-			log("Warning: Missed " + game.name + " validateParams method")
+			PRESENCE.UTILITIES.log("Warning: Missed " + game.name + " validateParams method")
 		}
 		
 		if(typeof PRESENCE.GAME[game.id].minimumRequirements == "function"){
       //Check requirements
     } else {
-      log("Warning: Missed " + game.name + " minRequirements method")
+      PRESENCE.UTILITIES.log("Warning: Missed " + game.name + " minRequirements method")
     }
 		
 		//Add handler and remove previous if exits
@@ -301,16 +313,17 @@ PRESENCE.GAME = (function(P,$,undefined){
 
   return {
     init: init,
-		game: game,
-		player: player,
-		startGame: startGame,
-		finishGame: finishGame,
-		createValidationResult: createValidationResult,
-		requestUserToPlay: requestUserToPlay,
-		responseUserToPlay: responseUserToPlay,
-		updateLogicAfterReceivedGameRequest: updateLogicAfterReceivedGameRequest,
-		updateLogicAfterReceivedGameRequestCancelation: updateLogicAfterReceivedGameRequestCancelation,
-		updateLogicAfterReceivedGameRequestResponse: updateLogicAfterReceivedGameRequestResponse,
+		game : game,
+		player : player,
+		startGame : startGame,
+		finishGame : finishGame,
+		createValidationResult : createValidationResult,
+		requestUserToPlay : requestUserToPlay,
+		responseUserToPlay : responseUserToPlay,
+		updateLogicAfterReceivedGameRequest : updateLogicAfterReceivedGameRequest,
+		updateLogicAfterReceivedGameRequestCancelation : updateLogicAfterReceivedGameRequestCancelation,
+		updateLogicAfterReceivedGameRequestResponse : updateLogicAfterReceivedGameRequestResponse,
+		updateLogicAfterReceivedGameRequestError : updateLogicAfterReceivedGameRequestError,
 		sendAction: sendAction,
 		userDisconnected: userDisconnected
   };

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

@@ -10,10 +10,14 @@ PRESENCE.GAME.COMUNICATION = (function(P,$,undefined){
   //////////////////////////////////////////////
 	 
   var connection = null;
+  var iqStanzaID = new Array();
 	iqStanzaID['gameRequest'] = "gameRequestID";
 	iqStanzaID['gameRequestFinish'] = "gameRequestFinishID";
 	iqStanzaID['gameAction'] = "gameActionID";
 
+  var getIQStanzaID = function(){
+		return iqStanzaID;
+	}
 	
 	/////////////////////////////////
 	//    COMUNICATION METHODS     //
@@ -22,10 +26,13 @@ PRESENCE.GAME.COMUNICATION = (function(P,$,undefined){
   var init = function(myConnection){
     connection = myConnection;
 		//addHandler:(callback, namespace to match, stanza name, stanza type, stanza id , stanza from, options)
-		connection.addHandler(handleRequestGameIQStanza,null, "iq", "get",iqStanzaID['gameRequest'], null);
-		connection.addHandler(handleIQResultFromGameRequest,null, "iq", "result",iqStanzaID['gameRequest'], null);
-		connection.addHandler(handleIQResultFromGameRequestFinish,null, "iq", "result", iqStanzaID['gameRequestFinish'], null);
-		connection.addHandler(handleActionIQStanza,null, "iq", "result", getIdForIqAction("gameId"), null);
+		if(connection){
+			connection.addHandler(handleRequestGameIQStanza,null, "iq", "get",iqStanzaID['gameRequest'], null);
+      connection.addHandler(handleIQResultFromGameRequest,null, "iq", "result",iqStanzaID['gameRequest'], null);
+			connection.addHandler(handleIQErrorFromGameRequest,null, "iq", "error",iqStanzaID['gameRequest'], null);
+      connection.addHandler(handleIQResultFromGameRequestFinish,null, "iq", "result", iqStanzaID['gameRequestFinish'], null);
+      connection.addHandler(handleActionIQStanza,null, "iq", "result", getIdForIqAction("gameId"), null);
+		}
   };
 	
 	
@@ -121,6 +128,7 @@ PRESENCE.GAME.COMUNICATION = (function(P,$,undefined){
 	
 	//RECEIVE GAME REQUEST RESPONSE
   var handleIQResultFromGameRequest = function(iq){
+		
     var from = iq.getAttribute("from");
     var slug = from.split("@")[0]; 
     var queryTag = iq.getElementsByTagName('query');
@@ -134,9 +142,17 @@ PRESENCE.GAME.COMUNICATION = (function(P,$,undefined){
         return true;
       }
     }
+		
     return true;
   }
   
+	//RECEIVE GAME REQUEST ERROR RESPONSE
+	var handleIQErrorFromGameRequest = function(iq){
+    var from = iq.getAttribute("from");
+    var slug = from.split("@")[0]; 
+    P.GAME.updateLogicAfterReceivedGameRequestError(slug)
+    return true;
+  }
 	
 	
 	/////////////////////
@@ -374,7 +390,8 @@ PRESENCE.GAME.COMUNICATION = (function(P,$,undefined){
 		sendIQStanzaWithAction: sendIQStanzaWithAction,
     handleActionIQStanza: handleActionIQStanza,
 		addHandler : addHandler,
-		removeHandler: removeHandler
+		removeHandler: removeHandler,
+		getIQStanzaID : getIQStanzaID
   };
 
 }) (PRESENCE, jQuery);

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

@@ -25,7 +25,7 @@ PRESENCE.GAME.FACTORY = (function(P,$,undefined){
 	
   var generateGame = function(guest_slug,gameId,options){
     var player1 = new PRESENCE.GAME.player(user_slug,user_name)
-    var player2 = new PRESENCE.GAME.player(guest_slug,getNameFromSlug(guest_slug))
+    var player2 = new PRESENCE.GAME.player(guest_slug,PRESENCE.XMPPClient.getNameFromSlug(guest_slug))
     var players = [player1,player2]
     var mygame = new PRESENCE.GAME.game(gameId,getGameName(gameId),players,options)
     return mygame;

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

@@ -12,8 +12,8 @@ PRESENCE.GAME.INTERFACE = (function(P,$,undefined){
     //gameStatus="pending";
 		
 	  //Show or create chatbox
-	  createBuddyChatBox(slug);
-	  var chatBox = getChatBoxForSlug(slug);
+	  PRESENCE.WINDOW.createBuddyChatBox(slug);
+	  var chatBox = PRESENCE.WINDOW.getChatBoxForSlug(slug);
 		
 	  //Show invitation message
 	  showGameInvitation(slug,game);
@@ -22,7 +22,7 @@ PRESENCE.GAME.INTERFACE = (function(P,$,undefined){
     hideVideoChatButton(slug);
 		
 	  //Show gamebox
-	  toggleVideoBoxForSlug(slug,true);
+	  PRESENCE.WINDOW.toggleVideoBoxForSlug(slug,true);
 	}
 	
 	var updateInterfaceBeforeStartGame = function(slug,game){
@@ -31,18 +31,18 @@ PRESENCE.GAME.INTERFACE = (function(P,$,undefined){
     parentDiv.setAttribute('id', divID);
     $(parentDiv).css('width', "100%");
     $(parentDiv).css('height', "100%");
-    setVideoBoxContent(slug,parentDiv);
+    PRESENCE.WINDOW.setVideoBoxContent(slug,parentDiv);
 
     PRESENCE.GAME.startGame(slug,divID)
   }
   
   var updateInterfaceAfterFinishGame = function(slug,game){
-    toggleVideoBoxForSlug(slug,false);
+    PRESENCE.WINDOW.toggleVideoBoxForSlug(slug,false);
     showVideoChatButton(slug);
   }
 	
 	var updateInterfaceOnInformationMessage = function(slug,msg){
-    setVideoBoxContent(slug,"<p class=\"game-info\"> " + msg +" </p>");
+    PRESENCE.WINDOW.setVideoBoxContent(slug,"<p class=\"game-info\"> " + msg +" </p>");
   }
 
 
@@ -53,7 +53,7 @@ PRESENCE.GAME.INTERFACE = (function(P,$,undefined){
   
   var pickGamesButton = function (uiElement){
     var slug = $(uiElement.element).attr("id");
-    var videoBoxVisibility = toggleVideoBoxForSlug(slug);
+    var videoBoxVisibility = PRESENCE.WINDOW.toggleVideoBoxForSlug(slug);
   
     if (videoBoxVisibility) {
       hideVideoChatButton(slug);
@@ -89,7 +89,7 @@ PRESENCE.GAME.INTERFACE = (function(P,$,undefined){
       }
     }
     var template = generateGameSelectionTemplate(slug,gameItem)
-    setVideoBoxContent(slug,template);
+    PRESENCE.WINDOW.setVideoBoxContent(slug,template);
     setShowGamesButtonsFunction();
   }
 	
@@ -184,10 +184,10 @@ PRESENCE.GAME.INTERFACE = (function(P,$,undefined){
   }
   
 	var showGameInvitation = function(slug,game){
-		var title = "<p class=\"game-info\">" + I18n.t("chat.game.call", {name: getNameFromSlug(slug), game: game.name}) + " </p>";
+		var title = "<p class=\"game-info\">" + I18n.t("chat.game.call", {name: PRESENCE.XMPPClient.getNameFromSlug(slug), game: game.name}) + " </p>";
     var msg = title + "<p class=\"game-request\"> <a class=\"gameButton\" slug=\""+slug+"\" value=\"yes\">" + I18n.t("chat.game.accept") + "</a> -" 
     + " <a class=\"gameButton\" slug=\""+slug+"\" value=\"no\">" + I18n.t("chat.game.deny") + "</a> </p>";
-    setVideoBoxContent(slug,msg);
+    PRESENCE.WINDOW.setVideoBoxContent(slug,msg);
     setGameRequestButtonsFunction();
 	}
 	
@@ -201,24 +201,44 @@ PRESENCE.GAME.INTERFACE = (function(P,$,undefined){
 	}
 	
 	var hideVideoChatButton = function(slug){
-		$(getChatBoxButtonForSlug(slug,"video")).hide();
+		$(PRESENCE.WINDOW.getChatBoxButtonForSlug(slug,"video")).hide();
 	}
 	
 	var showVideoChatButton = function(slug){
-    $(getChatBoxButtonForSlug(slug,"video")).show();
+    $(PRESENCE.WINDOW.getChatBoxButtonForSlug(slug,"video")).show();
   }
 	
 	var play = function(){
 		$(".chat-gamesthick").css("display","block");
 	}
 	
+	var enableGameFeature = function(enable){	  
+    //Changing chat-gamesthick CSS class by JQuery
+    var ss = document.styleSheets;
+    for (var i=0; i<ss.length; i++) {
+        var rules = ss[i].cssRules || ss[i].rules;
+        if (rules != undefined){
+          for (var j=0; j<rules.length; j++) {
+              if (rules[j].selectorText === ".chat-gamesthick") {
+								  if(enable){
+										rules[j].style.display = 'block'
+									} else {
+										rules[j].style.display = 'none'
+									}
+              }
+          }
+        }
+    }
+	}
+	
   return {
 		pickGamesButton: pickGamesButton,
 		updateInterfaceAfterGameRequestReceived: updateInterfaceAfterGameRequestReceived,
 		updateInterfaceBeforeStartGame: updateInterfaceBeforeStartGame,
 		updateInterfaceAfterFinishGame: updateInterfaceAfterFinishGame,
 		updateInterfaceOnInformationMessage: updateInterfaceOnInformationMessage,
-		play: play
+		play: play,
+		enableGameFeature : enableGameFeature
   };
 
 }) (PRESENCE, jQuery);