Merge with dc5e0ea0093cafc547943219068fa8e54da422fa
authorveltr
Mon, 16 Apr 2012 19:14:15 +0200
changeset 865 dce4fd00855f
parent 862 71d80cda96de (diff)
parent 863 dc5e0ea0093c (current diff)
child 867 43f615b4dc48
Merge with dc5e0ea0093cafc547943219068fa8e54da422fa
--- a/src/css/LdtPlayer.css	Mon Apr 16 14:21:57 2012 +0200
+++ b/src/css/LdtPlayer.css	Mon Apr 16 19:14:15 2012 +0200
@@ -966,3 +966,12 @@
 .Ldt-TagCloud-actif {
     color: #c000c0;
 }
+
+/* SlideShare Widget css */ 
+.Ldt-SlideShare {
+    font-family: "Arial","Verdana","sans-serif";
+    font-size: 14px;
+}
+.Ldt-SlideShare .sync_links{
+    text-align: right;
+}
--- a/src/js/serializers/JSONSerializer.js	Mon Apr 16 14:21:57 2012 +0200
+++ b/src/js/serializers/JSONSerializer.js	Mon Apr 16 19:14:15 2012 +0200
@@ -440,4 +440,19 @@
     val = this.getId("Publ");
     
   return val;
+};
+
+/** return the id of the ligne de temps named "Slideshare" */
+IriSP.JSONSerializer.prototype.getSlideShareType = function() {
+  var val = this.getId("slideshare");
+  if (typeof(val) === "undefined")
+    val = this.getId("Slides");   
+  if (typeof(val) === "undefined")
+    val = this.getId("Slide");
+  if (typeof(val) === "undefined")
+    val = this.getId("slide-Share");
+  if (typeof(val) === "undefined")
+	val = this.getId("slide Share");
+    
+  return val;
 };
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/js/widgets/slideShareWidget.js	Mon Apr 16 19:14:15 2012 +0200
@@ -0,0 +1,132 @@
+
+/** A widget to display slide show from embed slide share */
+IriSP.SlideShareWidget = function(Popcorn, config, Serializer) {
+  IriSP.Widget.call(this, Popcorn, config, Serializer);
+};
+
+IriSP.SlideShareWidget.prototype = new IriSP.Widget();
+
+IriSP.SlideShareWidget.prototype.draw = function() {
+  var self = this;
+  
+  var templ = Mustache.to_html(IriSP.slideShareWidget_template);
+  this.selector.append(templ);
+  
+  // Synchro management
+  this._disableUpdate = false;
+  this.selector.find('.sync_on').click(function(event) { self.syncHandler.call(self, event); });
+  this.selector.find('.sync_off').click(function(event) { self.unSyncHandler.call(self, event); });
+  
+  // global variables used to keep the position and width of the zone.  
+  this.zoneLeft = 0;
+  this.zoneWidth = 0;
+  // global variable to save the last slide url
+  this.lastSlide = "";
+  this.containerDiv = this.selector.find('.SlideShareContainer');
+  
+  // Update the slide from timeupdate event
+  this._Popcorn.listen("timeupdate", IriSP.wrap(this, this.slideShareUpdater));
+  
+  this._Popcorn.listen("IriSP.SlideShareWidget.show", IriSP.wrap(this, this.show));
+  this._Popcorn.listen("IriSP.SlideShareWidget.hide", IriSP.wrap(this, this.hide));
+  
+  // Get data from "slideshare" cutting/annotation-type
+  var annotations = this._serializer._data.annotations;
+  var view_type = this._serializer.getSlideShareType();
+  if(typeof(view_type) === "undefined") {
+    return;  
+  }
+  var i = 0;
+  this.segments_slides = [];
+  var nb_annot = annotations.length;
+  for (i = 0; i < nb_annot; i++) {
+    var annotation = annotations[i];
+    /* filter the annotations whose type is not the one we want */
+    if (view_type != "" && typeof(annotation.meta) !== "undefined" && typeof(annotation.meta["id-ref"]) !== "undefined"
+          && annotation.meta["id-ref"] != view_type) {
+        continue;
+    }
+    this.segments_slides.push(annotation);
+  }
+};
+
+/* update the slider and the position marker as time passes */
+IriSP.SlideShareWidget.prototype.slideShareUpdater = function() {
+  // If it is asked not to synchronize, we do nothing
+  if(this._disableUpdate)
+    return;
+  
+  var self = this;
+  
+  // We search if a segments_slides is in the current timecode
+  var time = this._Popcorn.currentTime() * 1000;
+  var nb_slides = this.segments_slides.length;
+  var found = false;
+  for (i = 0; i < nb_slides; i++) {
+    var segment_slide = this.segments_slides[i];
+    if(segment_slide.begin<time && time<segment_slide.end){
+    	found = true;
+    	if(segment_slide.content.description!=this.lastSlide){
+			// The url is like http://stuf.com#X and X is the slide number. So we split and save it.
+    		this.lastSlide = segment_slide.content.description;
+    		var description_ar = this.lastSlide.split("#");
+    		console.log("description_ar = " + description_ar);
+    		var slideUrl = description_ar[0];
+    		var slideNb = description_ar[1];
+    		// We have the slideshare oembed url.
+    		var url = "http://www.slideshare.net/api/oembed/2?format=jsonp&url=" + slideUrl;
+    		
+    		IriSP.jQuery.ajax({
+				url: url,
+				dataType: "jsonp",
+				success: function(data) {
+					ss_id = data["slideshow_id"];
+					embed_code = data["html"];
+					// If slideNb exist, we hack the embed code to add ?startSlide=X
+					if(slideNb){
+						embed_code = embed_code.replace(new RegExp("embed_code/"+ss_id), "embed_code/" + ss_id + "?startSlide=" + slideNb);
+					}
+					self.containerDiv.html(embed_code);
+				},
+				error: function(jqXHR, textStatus, errorThrown){
+					self.containerDiv.html("Error while downloading the slideshow. jqXHR = " + jqXHR + ", textStatus = " + textStatus + ", errorThrown = " + errorThrown);
+				}
+    		});
+    		return;
+    	}
+    }
+  }
+  if(found==false){
+  	this.lastSlide = "";
+  	this.containerDiv.html("");
+  }
+
+};
+
+// Functions to stop or trigger sync between timeupdate event and slides        
+IriSP.SlideShareWidget.prototype.unSyncHandler = function(params) {
+	//console.log("slideShare NO SYNC !");
+	this._disableUpdate = true;
+};
+IriSP.SlideShareWidget.prototype.syncHandler = function(params) {
+	//console.log("slideShare SYNC PLEASE !");
+	this._disableUpdate = false;
+};
+
+
+/** responds to an "IriSP.SlideShareWidget.position" message
+    @param params an array with the first element being the left distance in
+           percents and the second element the width of the slice in pixels
+*/        
+IriSP.SlideShareWidget.prototype.positionSlideShareHandler = function(params) {
+  //console.log("positionSlideShareHandler");
+};
+
+
+IriSP.SlideShareWidget.prototype.show = function() {
+  this.selector.show();
+};
+
+IriSP.SlideShareWidget.prototype.hide = function() {
+  this.selector.hide();
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/templates/slideShareWidget.html	Mon Apr 16 19:14:15 2012 +0200
@@ -0,0 +1,2 @@
+{{! template for the slideShare widget of the other }}
+<div class='Ldt-SlideShare'><!-- >p class='sync_links'><a class='sync_on'>Synchronise</a> - <a class='sync_off'>Ne synchronise pas</a></p--><div class='SlideShareContainer'></div></div>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/integration/test-slideshare.htm	Mon Apr 16 19:14:15 2012 +0200
@@ -0,0 +1,102 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html dir="ltr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml" lang="fr">
+    <head>
+        <title>Metadataplayer - Polemic tweet integration test</title>
+    </head>
+    <body>
+        <div style="width:650px;">
+            <h1>MetaDataPlayer</h1>
+            Integration test - SLIDE SHARE
+        </div>
+        <!-- START Integration  ###################################### -->
+        <!-- SIMPLE PLAYER EXPERIMENTATION -->
+        <script type="text/javascript" src="/metadataplayer/build/LdtPlayer-release.js" type="text/javascript"></script>
+        <div id="video"></div>
+        <div id="LdtPlayer" style="float: left;"></div>
+        <div id="Sparkline"></div>
+        <script  type="text/javascript">
+            var json_url = 'http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/cljson/id/8a1a344a-7f34-11e1-9ee2-00145ea4a2be';
+            
+            IriSP.user = {
+                name : 'awesome_user_name',
+                avatar : 'allocine_dossier_independant/allocine_test/avatar.png'
+            };
+            IriSP.libFiles.defaultDir = "/metadataplayer/src/js/libs/";
+            IriSP.language = 'fr';
+            var config = {
+                gui : {
+                    width : 610,
+                    height : 900,
+                    container : 'LdtPlayer',
+                    css : '../../src/css/LdtPlayer.css',
+                    default_options : {
+                        width: 610,
+                        //cinecast_version: true,
+                        metadata : {
+                            format : 'cinelab',
+                            src : json_url,
+                            type : 'json'
+                        }
+                    },
+                    widgets : [{
+                        type : "AnnotationsListWidget",
+                        container : "MyListContainer", // div dans lequel sera affiché "Annotations Liées"
+                        ajax_mode : false, // nécessaire pour des raisons historiques
+                        refresh_interval : 15 * 60 * 1000 // 15 minutes
+                    }, {
+                        type : "SparklineWidget",
+                        height : 50,
+                        lineColor: "#ffffff",
+                        fillColor: "#999999"
+                    }, {
+                        type : "SliderWidget"
+                    }, {
+	                    type : "PlayerWidget",
+	                    mode: 'radio',
+                        height : 100
+	                }, {
+                        type : "SegmentsWidget",
+                        requires : [{
+                            type : "TooltipWidget",
+                            width : 180,
+                            height : 160,
+                        }]
+                    }, {
+                        type : "SlideShareWidget"
+                    }, {
+                        type : "createAnnotationWidget",
+                        polemic_mode : false,
+                        api_endpoint_template : "json_examples/return_after_post.json", //"endpoint/{{id}}.json",
+                        api_method : 'POST'
+                    }, /* {
+                        type: "TraceWidget",
+                     //   js_console : true,
+                        url: "http://traces.advene.org:5000/",
+                        requestmode: 'GET',
+                        syncmode: "sync"
+                    } */ ]
+                },
+                player : {
+                    type : 'jwplayer', // player type
+                    height : 300,
+                    width : 610,
+                    provider : 'rtmp',
+                    flashplayer : '../libs/player.swf'
+                },
+                modules : [{
+                    type : "MediaFragment",
+                    metadata : {
+                        format : 'cinelab',
+                        src : json_url,
+                        type : 'json'
+                    }
+                }]
+
+            };
+
+            IriSP.initPlayer(config, json_url);
+
+        </script>
+    <div id="MyListContainer" style="float: left; width: 400px;"></div>
+    </body>
+</html>