[Globalstore-code] [Global-Store Repo] Global Store branch, master, updated. e12108e85c4812bb85cbf00a7bf5a789bd8e04c5

[Eduardo G. <my4...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Global Store".

The branch, master has been updated
       via  e12108e85c4812bb85cbf00a7bf5a789bd8e04c5 (commit)
       via  07e07e0373bc7048974ed0e18aaa3e690be9322b (commit)
      from  5cb5948809c51f3686fd6c570e1c489dae2b2593 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e12108e85c4812bb85cbf00a7bf5a789bd8e04c5
Merge: 07e07e0 5cb5948
Author: Eduardo <epp...@gm...>
Date:   Sat Jan 10 06:47:39 2015 -0430

    Merge branch 'master' of ssh://git.code.sf.net/p/globalstore/code


commit 07e07e0373bc7048974ed0e18aaa3e690be9322b
Author: Eduardo <epp...@gm...>
Date:   Sat Jan 10 06:46:46 2015 -0430

    Item-info

diff --git a/src/www/js/Item-info.js b/src/www/js/Item-info.js
index 9b5a83f..26e0a07 100644
--- a/src/www/js/Item-info.js
+++ b/src/www/js/Item-info.js
@@ -1,5 +1,6 @@
 //Contenido HTML
 
+var player=false;
 
 $.urlParam = function(name){
     var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
@@ -37,8 +38,9 @@ function gs_p_item_info(){
 		<label id="c-price"></label>\
 		<button id="b-comprar" class="pure-control-group pure-button pure-button-primary">Comprar</button>\
 	</div>\
+	<div id="fantasma"><div id=fantasma-interno></div></div>\
 		');
-		
+	$("#fantasma").hide();		
 	$("#Main_Galey").show();
 	$("#content_center").empty();
 	$("#content_center").append('\
@@ -77,6 +79,18 @@ function gs_p_item_info(){
 	</div>\
 	');
 	
+	$("#fantasma").click(function(){
+		if(player){
+			player.stopVideo();
+			player.clearVideo();
+			player=false;
+		}
+		$("fantasma-interno").empty();
+		$(this).fadeOut(500);
+	});
+	
+	
+	
 	$("#b-comprar").click(function (event) {
 		event.preventDefault();
 		var id;
@@ -499,9 +513,41 @@ function get_info(item, tipo){
 	});		
 	
 }
+
+
+
+function showSBig(res){
+	$("#fantasma-interno").empty();
+	$("#fantasma-interno").append('<img style="height:500px" src="'+res+'"/>');
+	$("#fantasma").fadeIn(500);
+}
+function showVideo(res){
+	$("#fantasma-interno").empty();
+	$("#fantasma-interno").append('<div id="yt-video"></div>');
+	player = new YT.Player("yt-video", {
+		height: '390',
+		width: '640',
+		videoId: res
+		/*events: {
+			'onReady': onPlayerReady,
+			'onStateChange': onPlayerStateChange
+		}*/
+	});	
+	$("#fantasma").fadeIn(500);
+}
+
+
+
+
+
+
 /*----------------------------------ACCION DOCUMENT -----------------------------------------*/
 
 $( document ).ready(function() {
+	var tag = document.createElement('script');
+	tag.src = "https://www.youtube.com/iframe_api";
+	var firstScriptTag = document.getElementsByTagName('script')[0];
+	firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
 	var i=0;
 	check_user();
 	gs_p_item_info();

-----------------------------------------------------------------------

Summary of changes:
 src/www/js/Item-info.js |   48 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 47 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Global Store