social_stream-presence 0.10.2 → 0.10.3

data/app/assets/javascripts/jquery.ui.chatbox.sstreampresence.js

@@ -190,8 +190,8 @@
       })
       .appendTo(uiChatboxTitlebar),
       uiChatboxTitlebarVideoText = $('<span></span>')
-      .addClass('ui-icon-circle-triangle-e ' +  'chat-thick ' + ' chat-videothick' )
-      .text('video')
+      .addClass('ui-icon-circle-triangle-e ' + 'chat-thick ' + ' chat-videothick' )
+      .text('     ')
       .appendTo(uiChatboxTitlebarVideo),
 			
 			

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

@@ -263,7 +263,9 @@ function onConnect(status) {
     disconnectionFlag = false;
     afterNewConnectionFlag = true;
 		
-		userStatus = getRestoreUserChatStatus();
+		if(! userStatus){
+			userStatus = getRestoreUserChatStatus();
+		}
 		if(userStatus=="offline"){
 			userStatus="chat";
 		}

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

@@ -1,5 +1,6 @@
 ////////////////////
 //Multiplayer Games Core based on XMPP
+//Version: 1.2
 ////////////////////
 
 PRESENCE.GAME = (function(P,$,undefined){
@@ -45,6 +46,10 @@ PRESENCE.GAME = (function(P,$,undefined){
 	
 
 	var requestUserToPlay = function (slug,game){
+		if(game==null){
+			return;
+		}
+		
 		if (slug in contactsInfo) {
       var gameStatus = contactsInfo[slug].gameStatus;
     } else {
@@ -102,13 +107,13 @@ PRESENCE.GAME = (function(P,$,undefined){
     }
   }
 
-	var sendAction = function(gameId,players,action){
-		$.each(players, function(index, value) {
+	var sendAction = function(game,action){
+		$.each(game.players, function(index, value) {
       var slug = value.id;
 			if(slug!=user_slug){
 				if(slug in contactsInfo){
 					var jid=slug+"@"+contactsInfo[slug].domain+"/"+contactsInfo[slug].resource;
-          P.GAME.COMUNICATION.sendIQStanzaWithAction(jid,gameId,action);
+          P.GAME.COMUNICATION.sendIQStanzaWithAction(jid,game.id,action);
 				}
 			}
     });
@@ -126,7 +131,7 @@ PRESENCE.GAME = (function(P,$,undefined){
     } else {
       contactsInfo[slug].gameStatus="pending";
     } 
-    P.GAME.INTERFACE.updateInterfaceAfterGameRequestReceived(slug)
+    P.GAME.INTERFACE.updateInterfaceAfterGameRequestReceived(slug,contactsInfo[slug].game)
   }
 
   var updateLogicAfterReceivedGameRequestResponse = function(slug,response){
@@ -135,7 +140,7 @@ PRESENCE.GAME = (function(P,$,undefined){
     }
     if(response=="yes"){
       contactsInfo[slug].gameStatus = "playing";
-      P.GAME.INTERFACE.updateInterfaceBeforeStartGame(slug)
+      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)}));
       contactsInfo[slug].gameStatus="disconnected";
@@ -267,6 +272,7 @@ PRESENCE.GAME = (function(P,$,undefined){
 	}
 	
 	var finishGame = function (slug){
+		var game = null;
 		if(slug in contactsInfo){
       var gameStatus = contactsInfo[slug].gameStatus;
       if(gameStatus=="playing"){
@@ -283,9 +289,10 @@ PRESENCE.GAME = (function(P,$,undefined){
         P.GAME.COMUNICATION.sendIQStanzaToResponseGameRequest(slug,"no");
       }
       contactsInfo[slug].gameStatus="disconnected";
+			game = contactsInfo[slug].game
     }
 		
-		PRESENCE.GAME.INTERFACE.updateInterfaceAfterFinishGame(slug)
+		PRESENCE.GAME.INTERFACE.updateInterfaceAfterFinishGame(slug,game)
 	}
 
   var userDisconnected = function(slug){

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

@@ -25,6 +25,7 @@ PRESENCE.GAME.COMUNICATION = (function(P,$,undefined){
 		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);
   };
 	
 	
@@ -196,29 +197,67 @@ PRESENCE.GAME.COMUNICATION = (function(P,$,undefined){
 	}
 	
 	var genetareIQStanzaWithObject = function(iq,object){
+
 		if(typeof object != "object"){
 			return iq;
 		}
+		
 		var childs=Object.keys(object).length;
     var childsCounter = 0;
 		
 		$.each(object, function(index, value) {
+
 		  if(value==null){
 			  return;
 			}
+			
       if((typeof value == "object")){
         //Complex object
-				iq.c(index, {})
+				var object_type = "object"
+				
+				if(value.constructor.toString().indexOf("Array")!=-1){
+					object_type = "array"
+				}
+				
+				iq.c(index, {type: object_type})
 				iq = genetareIQStanzaWithObject(iq,value)
+				
       } else {
-        //Simple object
-        if(typeof value == "number"){
-          value = value + "";
+				//Simple object
+				
+				var data_type = (typeof value)
+				var index_type = (typeof index)
+				
+        switch (data_type){
+				  case "number":
+				    value = value + "";
+				    break;
+				  case "boolean":
+						value = value.toString();
+				    break;
+				  case "string":
+            //do nothing
+            break;
+				  default: 
+					  break;
+				}
+				
+				switch (index_type){
+          case "number":
+					   //case: Array
+					   index = "item";
+            break;
+          case "string":
+            //do nothing
+            break;
+          default: 
+            break;
         }
+				
 				if(childsCounter==childs-1){
-					iq.c(index, {}).t(value).up().up()
+					iq.c(index, {type: data_type}).t(value).up().up()
 				} else {
-					iq.c(index, {}).t(value).up()
+					iq.c(index, {type: data_type}).t(value).up()
 				}
       }
       childsCounter++;
@@ -263,19 +302,47 @@ PRESENCE.GAME.COMUNICATION = (function(P,$,undefined){
     $.each($(childs).children(), function(index, value) {
        if ($(value).children().length>0) {
          //Complex object
-				 parent[value.tagName]= new Object();
+				 if ($(value).attr("type")=="array"){
+				 	  parent[value.tagName] = new Array()
+				 } else {
+				 	  parent[value.tagName] = new Object()
+				 }
 				 parent[value.tagName]= buildComplexObject(parent[value.tagName],$(value))
+				 
        } else {
         //Simple object
+				var myvalue = null
+				var stringValue = $(value).text()
 				
         //Check dataformat
-        if(! isNaN(+($(value).text()))){
-          //$(value).text() is a string which contains a number
-          var myvalue = +($(value).text());
-        } else {
-          var myvalue = $(value).text();
+				var data_type = $(value).attr("type")
+				
+        switch (data_type){
+          case "number":
+						if(! isNaN(+(stringValue))){
+	            //$(value).text() is a string which contains a number
+	            myvalue = +(stringValue)
+	          }
+            break;
+          case "boolean":
+					  if((stringValue=="true")||(stringValue=="false")){
+							myvalue = (stringValue === "true")
+						}
+            break;
+					case "string":
+            myvalue = stringValue
+            break;
+          default: 
+            break;
         }
-        parent[value.tagName]=myvalue
+				   
+         //Is parent an array element and value an array item?
+         if((parent.constructor.toString().indexOf("Array")!=-1)&&(value.tagName == "item")){
+            parent.push(myvalue)
+         } else {
+				 	  parent[value.tagName]=myvalue
+				 }
+        
        }
     });
 		return parent
@@ -311,3 +378,6 @@ PRESENCE.GAME.COMUNICATION = (function(P,$,undefined){
   };
 
 }) (PRESENCE, jQuery);
+
+
+

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

@@ -0,0 +1,47 @@
+////////////////////
+//Multiplayer Games Interface Manager
+////////////////////
+
+PRESENCE.GAME.FACTORY = (function(P,$,undefined){
+  
+  //////////////////////////
+  //        BUILDERS      //
+  //////////////////////////
+		
+	var getGame = function(slug,choice){
+		switch(choice){
+		case "Modern-TER":
+		  var options = new Array();
+      options['theme']="Modern";
+			return generateGame(slug,"TER",options)
+		case "Classic-TER":
+		  var options = new Array();
+      options['theme']="Classic";
+			return generateGame(slug,"TER",options)
+		default:
+		  return null
+		}
+	}
+	
+  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 players = [player1,player2]
+    var mygame = new PRESENCE.GAME.game(gameId,getGameName(gameId),players,options)
+    return mygame;
+  }
+
+  var getGameName = function(gameId){
+	  if (typeof PRESENCE.GAME[gameId].getName == "function") {
+			return PRESENCE.GAME[gameId].getName();
+	  } else {
+			return gameId;
+		}
+	}
+
+
+  return {
+		getGame: getGame
+  };
+
+}) (PRESENCE, jQuery);

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

@@ -3,31 +3,12 @@
 ////////////////////
 
 PRESENCE.GAME.INTERFACE = (function(P,$,undefined){
-  
-  //////////////////////////
-  //      TRIGGERS        //
-  //////////////////////////
-	
-  var pickGamesButton = function (uiElement){
-    var slug = $(uiElement.element).attr("id");
-    var videoBoxVisibility = toggleVideoBoxForSlug(slug);
-  
-    if (videoBoxVisibility) {
-      hideVideoChatButton(slug);
-			var mygame = generateDefaultGame(slug);
-      PRESENCE.GAME.requestUserToPlay(slug,mygame);
-    } else {
-      showVideoChatButton(slug);
-      PRESENCE.GAME.finishGame(slug);
-    }
-  }
-	
 	
 	////////////////////////////
   //       CALLBACKS        //
   ////////////////////////////
 	
-	updateInterfaceAfterGameRequestReceived = function(slug){
+	updateInterfaceAfterGameRequestReceived = function(slug,game){
     //gameStatus="pending";
 		
 	  //Show or create chatbox
@@ -35,7 +16,7 @@ PRESENCE.GAME.INTERFACE = (function(P,$,undefined){
 	  var chatBox = getChatBoxForSlug(slug);
 		
 	  //Show invitation message
-	  showGameInvitation(slug);
+	  showGameInvitation(slug,game);
 	  
 		//Hide hideVideoChatButton
     hideVideoChatButton(slug);
@@ -44,7 +25,7 @@ PRESENCE.GAME.INTERFACE = (function(P,$,undefined){
 	  toggleVideoBoxForSlug(slug,true);
 	}
 	
-	var updateInterfaceBeforeStartGame = function(slug){
+	var updateInterfaceBeforeStartGame = function(slug,game){
     var parentDiv = document.createElement('div');
     var divID = 'game_' + slug + contactsInfo[slug].game.id;
     parentDiv.setAttribute('id', divID);
@@ -55,7 +36,7 @@ PRESENCE.GAME.INTERFACE = (function(P,$,undefined){
     PRESENCE.GAME.startGame(slug,divID)
   }
   
-  var updateInterfaceAfterFinishGame = function(slug){
+  var updateInterfaceAfterFinishGame = function(slug,game){
     toggleVideoBoxForSlug(slug,false);
     showVideoChatButton(slug);
   }
@@ -66,12 +47,144 @@ PRESENCE.GAME.INTERFACE = (function(P,$,undefined){
 
 
 
+  //////////////////////////
+  //      TRIGGERS        //
+  //////////////////////////
+  
+  var pickGamesButton = function (uiElement){
+    var slug = $(uiElement.element).attr("id");
+    var videoBoxVisibility = toggleVideoBoxForSlug(slug);
+  
+    if (videoBoxVisibility) {
+      hideVideoChatButton(slug);
+      showGames(slug);
+    } else {
+      showVideoChatButton(slug);
+      PRESENCE.GAME.finishGame(slug);
+    }
+  }
+  
+  
+  ///////////////////////////
+  //      GAME LIST        //
+  ///////////////////////////
+  
+  function gameItem(name,choice,thumbnail) {
+    this.name = name;
+    this.choice = choice;
+    this.thumbnail = thumbnail;
+  }
+ 
+  var gameList = [];
+  gameList.push(new gameItem("Modern Tic Tac Toe","Modern-TER","/assets/games/ter/modern_thumbnail.png"))
+  gameList.push(new gameItem("Classic Tic Tac Toe","Classic-TER","/assets/games/ter/classic_thumbnail.png"))
+  //gameList.push(new gameItem("Street Fighter","SFIGTHER","/assets/games/sfighter/thumbnail.png"))
+  
+  var showGames = function(slug,gameItem){
+    if((typeof gameItem == 'undefined')||(gameItem==null)){
+      if (gameList.length > 0) {
+          gameItem = gameList[0]
+      } else {
+        gameItem = new gameItem("No games available","None","")
+      }
+    }
+    var template = generateGameSelectionTemplate(slug,gameItem)
+    setVideoBoxContent(slug,template);
+    setShowGamesButtonsFunction();
+  }
+	
+	var onGameSelected = function (slug,game){
+		  PRESENCE.GAME.requestUserToPlay(slug, game);
+  }
+
+
+
 	///////////////////////////////
   //  INTERFACE HELP METHODS   //
   ///////////////////////////////
 	
-	var showGameInvitation = function(slug){
-		var title = "<p class=\"game-info\">" + I18n.t("chat.game.call", {name: getNameFromSlug(slug)}) + " </p>";
+	var generateGameSelectionTemplate = function (slug,gameItem) {
+    var template = 
+    "<div class=\"game-choices\">" +
+    
+      "<div class=\"game-choice-buttonLeft\">" +
+        "<a class=\"game-choice-linkLeft\">" +
+          "<img class=\"game-button-img\" src=\"/assets/btn/group_left.png\" >" +
+        "</a>" +
+      "</div>" +
+      
+      "<div class=\"game-choice\">" +
+        "<a class=\"game-choice-link\" slug=" + slug + " choice=\"" + gameItem.choice + "\" >" +
+          "<img class=\"game-choice-img\" src=\"" + gameItem.thumbnail + "\" >" +
+          "<p class=\"game-name\">" + gameItem.name + " </p>" +
+        "</a>" +
+      "</div>" +
+      
+      "<div class=\"game-choice-buttonRight\">" +
+        "<a class=\"game-choice-linkRight\">" +
+          "<img class=\"game-button-img\" src=\"/assets/btn/group_right.png\" >" +
+        "</a>" +
+      "</div>" +
+      
+    "</div>"
+    return template;
+  }
+  
+  var setShowGamesButtonsFunction = function(){
+    $(".game-choice-link").click(function(event) {
+      var choice = $(this).attr("choice")
+      var slug = $(this).attr("slug")
+      var mygame = P.GAME.FACTORY.getGame(slug,choice);
+      onGameSelected(slug,mygame)
+    });
+
+	  $(".game-choice-linkLeft").click(function(event) {
+	    var gameChoice = $(event.target).parent().parent().parent().find(".game-choice-link")
+	    var slug = gameChoice.attr("slug")
+	    var choice = gameChoice.attr("choice")
+	    var newGameItem = getPreviousGameItem(choice)
+	    showGames(slug,newGameItem);
+	  });
+	  
+	  $(".game-choice-linkRight").click(function(event) {
+	    var gameChoice = $(event.target).parent().parent().parent().find(".game-choice-link")
+	    var slug = gameChoice.attr("slug")
+	    var choice = gameChoice.attr("choice")
+	    var newGameItem = getNextGameItem(choice)
+	    showGames(slug,newGameItem);
+	  });
+  }
+ 
+  var getNextGameItem = function(actualChoice){
+    var nextGameItem=null;
+    $.each(gameList, function(index, value) {
+      if(value.choice == actualChoice){
+        if(index==gameList.length-1){
+          nextGameItem = gameList[0]
+        } else {
+          nextGameItem = gameList[index+1];
+        }
+      }
+    });
+    return nextGameItem;
+  }
+ 
+  var getPreviousGameItem = function(actualChoice){
+    var nextGameItem=null;
+    $.each(gameList, function(index, value) {
+      if(value.choice == actualChoice){
+        if(index==0){
+          nextGameItem = gameList[gameList.length-1]
+        } else {
+          nextGameItem = gameList[index-1];
+        }
+      }
+    });
+    return nextGameItem;
+  }
+  
+	var showGameInvitation = function(slug,game){
+		var title = "<p class=\"game-info\">" + I18n.t("chat.game.call", {name: 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);
@@ -95,40 +208,17 @@ PRESENCE.GAME.INTERFACE = (function(P,$,undefined){
     $(getChatBoxButtonForSlug(slug,"video")).show();
   }
 	
-
-
-  //////////////////////
-  //  DEBUG METHODS   //
-  //////////////////////
-
-	var generateDefaultGame = function(guest_slug){
-		var player1 = new PRESENCE.GAME.player(user_slug,user_name)
-		var player2 = new PRESENCE.GAME.player(guest_slug,getNameFromSlug(guest_slug))
-		var localPlayers = [player1,player2]
-    var localOptions = new Array();
-    localOptions['theme']="Modern";
-    var mygame = new PRESENCE.GAME.game("TER","Tres en Raya",localPlayers,localOptions)
-		return mygame;
+	var play = function(){
+		$(".chat-gamesthick").css("display","block");
 	}
-
-
+	
   return {
 		pickGamesButton: pickGamesButton,
 		updateInterfaceAfterGameRequestReceived: updateInterfaceAfterGameRequestReceived,
 		updateInterfaceBeforeStartGame: updateInterfaceBeforeStartGame,
 		updateInterfaceAfterFinishGame: updateInterfaceAfterFinishGame,
 		updateInterfaceOnInformationMessage: updateInterfaceOnInformationMessage,
-		generateDefaultGame: generateDefaultGame
+		play: play
   };
 
-}) (PRESENCE, jQuery);
-
-
-
-////////////////////
-//Interface Events
-////////////////////
-
-function play(){
-	$(".chat-gamesthick").css("display","block");
-}
+}) (PRESENCE, jQuery);