# HG changeset patch
# User hamidouk
# Date 1321630352 -3600
# Node ID 3da58bd31096340ad260b6c4a8f1932979d83fad
# Parent ff20c80c684508785b0209a859e3ff1c94fc6b4d# Parent 2c65775623cbc641ebf6629b3743de1604fe84da
Merge with popcorn-port
diff -r 2c65775623cb -r 3da58bd31096 src/css/LdtPlayer.css
--- a/src/css/LdtPlayer.css Fri Nov 18 16:26:52 2011 +0100
+++ b/src/css/LdtPlayer.css Fri Nov 18 16:32:32 2011 +0100
@@ -234,4 +234,23 @@
height: 20px;
background-color: white;
}
+
+ .Ldt-tweetWidget {
+ font-size: 62.5%;
+ font-family: "Trebuchet MS", "Helvetica", "Arial", "Verdana", "sans-serif";
+ background-color:#eeeeee;
+ padding:5px;
+ overflow: auto;
+ }
+
+ .Ldt-tweetAvatar {
+ float: left;
+ }
+
+ .Ldt-tweetContents {
+
+ }
+ .Ldt-tweetWidgetMinimize {
+ float: right;
+ }
\ No newline at end of file
diff -r 2c65775623cb -r 3da58bd31096 src/js/site.js
--- a/src/js/site.js Fri Nov 18 16:26:52 2011 +0100
+++ b/src/js/site.js Fri Nov 18 16:32:32 2011 +0100
@@ -20,6 +20,9 @@
IriSP.widgetsDefaults = {
"PlayerWidget" : {},
- "AnnotationsWidget": {}
+ "AnnotationsWidget": {},
+ "TweetsWidget" : {
+ default_profile_picture : "https://twimg0-a.akamaihd.net/sticky/default_profile_images/default_profile_3_bigger.png"
+ }
};
diff -r 2c65775623cb -r 3da58bd31096 src/js/widgets/tweetsWidget.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/js/widgets/tweetsWidget.js Fri Nov 18 16:32:32 2011 +0100
@@ -0,0 +1,88 @@
+/* a widget that displays tweet - used in conjunction with the polemicWidget */
+
+IriSP.TweetsWidget = function(Popcorn, config, Serializer) {
+ IriSP.Widget.call(this, Popcorn, config, Serializer);
+
+ this._displayingTweet = false;
+ this._timeoutId = undefined;
+};
+
+
+IriSP.TweetsWidget.prototype = new IriSP.Widget();
+
+
+IriSP.TweetsWidget.prototype.drawTweet = function(annotation) {
+
+ var title = annotation.content.title;
+ var img = annotation.content.img.src;
+ if (typeof(img) === "undefined" || img === "" || img === "None") {
+ img = IriSP.widgetsDefaults.TweetsWidget.default_profile_picture;
+ }
+
+ var imageMarkup = Mustache.to_html("",
+ {src : img});
+
+ this.selector.find(".Ldt-tweetContents").text(title);
+ this.selector.find(".Ldt-tweetAvatar").html(imageMarkup);
+ this.selector.show("blind", 250);
+};
+
+IriSP.TweetsWidget.prototype.displayTweet = function(annotation) {
+ if (this._displayingTweet === false) {
+ this._displayingTweet = true;
+ } else {
+ window.clearTimeout(this._timeoutId);
+ }
+
+ this.drawTweet(annotation);
+
+ var time = this._Popcorn.currentTime();
+ this._timeoutId = window.setTimeout(IriSP.wrap(this, this.clearPanel), 10000);
+};
+
+
+IriSP.TweetsWidget.prototype.clearPanel = function() {
+ this._displayingTweet = false;
+ this._timeoutId = undefined;
+ this.closePanel();
+
+};
+
+IriSP.TweetsWidget.prototype.closePanel = function() {
+ if (this._timeoutId != undefined) {
+ /* we're called from the "close window" link */
+ /* cancel the timeout */
+ window.clearTimeout(this._timeoutId);
+ }
+
+ this.selector.hide("blind", 400);
+
+};
+
+IriSP.TweetsWidget.prototype.draw = function() {
+ var _this = this;
+
+ var tweetMarkup = Mustache.to_html(IriSP.tweetWidget_template, {"share_template" : IriSP.share_template});
+ this.selector.append(tweetMarkup);
+ this.selector.hide();
+ this.selector.find(".Ldt-tweetWidgetMinimize").click(IriSP.wrap(this, this.closePanel));
+
+ this._Popcorn.listen("IriSP.PolemicTweet.click", IriSP.wrap(this, this.PolemicTweetClickHandler));
+};
+
+IriSP.TweetsWidget.prototype.PolemicTweetClickHandler = function(tweet_id) {
+ var index, annotation;
+ for (index in this._serializer._data.annotations) {
+ annotation = this._serializer._data.annotations[index];
+
+ if (annotation.id === tweet_id)
+ break;
+ }
+
+ if (annotation.id !== tweet_id)
+ /* we haven't found it */
+ return;
+
+ this.displayTweet(annotation);
+ return;
+};
\ No newline at end of file
diff -r 2c65775623cb -r 3da58bd31096 src/templates/tweetWidget.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/templates/tweetWidget.html Fri Nov 18 16:32:32 2011 +0100
@@ -0,0 +1,10 @@
+{{! template for the tweet widget }}
+